From 333ba3a3fd2354a4e86337b90687c112463bc470 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Mon, 13 May 2024 16:58:07 +0100 Subject: [PATCH 1/2] Add cluster to kube state metrics Signed-off-by: Michel Hollands --- charts/meta-monitoring/templates/agent/config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/charts/meta-monitoring/templates/agent/config.yaml b/charts/meta-monitoring/templates/agent/config.yaml index 5e84e97..36c111d 100644 --- a/charts/meta-monitoring/templates/agent/config.yaml +++ b/charts/meta-monitoring/templates/agent/config.yaml @@ -135,6 +135,11 @@ data: } prometheus.relabel "filter" { + rule { + target_label = "cluster" + replacement = "{{- .Values.clusterLabelValue -}}" + } + rule { source_labels = ["__name__"] regex = "({{ include "agent.all_metrics" . }})" From 81d63a43834e9c267e467ab48a9aa541d27b0e51 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Mon, 13 May 2024 16:59:05 +0100 Subject: [PATCH 2/2] Fix CPU usage of ssd querier Signed-off-by: Michel Hollands --- charts/meta-monitoring/src/dashboards/loki-operational.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/meta-monitoring/src/dashboards/loki-operational.json b/charts/meta-monitoring/src/dashboards/loki-operational.json index af09fe1..e0490b1 100644 --- a/charts/meta-monitoring/src/dashboards/loki-operational.json +++ b/charts/meta-monitoring/src/dashboards/loki-operational.json @@ -3481,7 +3481,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by(pod) (rate(container_cpu_usage_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"(.*querier.*|(loki|enterprise-logs)-read|loki-single-binary|$namespace-[0-9]+)\"}[$__rate_interval]))", + "expr": "sum by(pod) (rate(container_cpu_usage_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"(.*querier.*|(loki|enterprise-logs)-read.*|loki-single-binary|$namespace-[0-9]+)\"}[$__rate_interval]))", "intervalFactor": 3, "legendFormat": "{{pod}}", "refId": "A"