diff --git a/charts/meta-monitoring/templates/ruler/ruler.yaml b/charts/meta-monitoring/templates/ruler/ruler.yaml index d22ee52..c3af965 100644 --- a/charts/meta-monitoring/templates/ruler/ruler.yaml +++ b/charts/meta-monitoring/templates/ruler/ruler.yaml @@ -1,5 +1,5 @@ -{{- if .Values.local.metrics.enabled }} -{{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }} +{{- if .Values.local.grafana.enabled }} +{{- if and .Values.local.grafana.enabled (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled .Values.dashboards.traces.enabled) }} apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml index 2d4f76f..7fd75e1 100644 --- a/charts/meta-monitoring/values.yaml +++ b/charts/meta-monitoring/values.yaml @@ -112,6 +112,7 @@ metrics: - loki_boltdb_shipper_retention_sweeper_chunk_deleted_duration_seconds_sum - loki_boltdb_shipper_retention_sweeper_marker_files_current - loki_boltdb_shipper_retention_sweeper_marker_file_processing_current_time + - loki_build_info - loki_chunk_store_index_entries_per_chunk_count - loki_chunk_store_index_entries_per_chunk_sum - loki_compactor_delete_requests_processed_total