Merge pull request #118 from grafana/fix_dashboards

Fix dashboards a bit more
This commit is contained in:
Michel Hollands
2024-05-13 17:04:45 +01:00
committed by GitHub
2 changed files with 6 additions and 1 deletions

View File

@@ -3481,7 +3481,7 @@
"steppedLine": false, "steppedLine": false,
"targets": [ "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, "intervalFactor": 3,
"legendFormat": "{{pod}}", "legendFormat": "{{pod}}",
"refId": "A" "refId": "A"

View File

@@ -135,6 +135,11 @@ data:
} }
prometheus.relabel "filter" { prometheus.relabel "filter" {
rule {
target_label = "cluster"
replacement = "{{- .Values.clusterLabelValue -}}"
}
rule { rule {
source_labels = ["__name__"] source_labels = ["__name__"]
regex = "({{ include "agent.all_metrics" . }})" regex = "({{ include "agent.all_metrics" . }})"