fixes the cpu usage graphs (#2044)

Signed-off-by: Ed Welch <edward.welch@grafana.com>
grafana · May 5, 2020 · 2629e9a · 2629e9a
1 parent 69c1d1c
commit 2629e9a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/production/loki-mixin/dashboard-loki-operational.json b/production/loki-mixin/dashboard-loki-operational.json
@@ -1933,9 +1933,9 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "namespace_pod_name_container_name:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"distributor.*\"}",
+              "expr": "node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"distributor.*\"}",
               "intervalFactor": 3,
-              "legendFormat": "{{pod_name}}-{{container_name}}",
+              "legendFormat": "{{pod}}-{{container}}",
               "refId": "A"
             }
           ],
@@ -2597,9 +2597,9 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "namespace_pod_name_container_name:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"ingester.*\"}",
+              "expr": "node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"ingester.*\"}",
               "intervalFactor": 3,
-              "legendFormat": "{{pod_name}}-{{container_name}}",
+              "legendFormat": "{{pod}}-{{container}}",
               "refId": "A"
             }
           ],
@@ -3543,9 +3543,9 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "namespace_pod_name_container_name:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"querier.*\"}",
+              "expr": "node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"querier.*\"}",
               "intervalFactor": 3,
-              "legendFormat": "{{pod_name}}-{{container_name}}",
+              "legendFormat": "{{pod}}-{{container}}",
               "refId": "A"
             }
           ],
@@ -6461,4 +6461,4 @@
   "title": "Loki Operational",
   "uid": "f6fe30815b172c9da7e813c15ddfe607",
   "version": 1
-}
+}