From d7063da3d4087331666437357b9b58c5ef9ebfe5 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Wed, 10 Apr 2024 11:49:49 +0100 Subject: [PATCH 1/2] Do not create ruler for dashboards when Grafana is not enabled Signed-off-by: Michel Hollands --- charts/meta-monitoring/templates/ruler/ruler.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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: From 8fa5b63db723e9e4c6e4f66e27513b46c671ef4f Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Wed, 10 Apr 2024 12:06:46 +0100 Subject: [PATCH 2/2] Also store loki_build_info as it's used in dashboards Signed-off-by: Michel Hollands --- charts/meta-monitoring/values.yaml | 1 + 1 file changed, 1 insertion(+) 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