tempo-mixin: add metrics-generator to Tempo / Resources and Operation…

…al (#1313) * tempo-mixin: add metrics-generator to Tempo / Resources * tempo-mixin: add metrics-generator to Tempo / Operational
grafana · Feb 28, 2022 · 00198ac · 00198ac
1 parent 642f15f
commit 00198ac
Show file tree

Hide file tree

Showing 5 changed files with 346 additions and 14 deletions.
diff --git a/operations/tempo-mixin/config.libsonnet b/operations/tempo-mixin/config.libsonnet
@@ -10,6 +10,7 @@
       query_frontend: 'query-frontend',
       querier: 'querier',
       ingester: 'ingester',
+      metrics_generator: 'metrics-generator',
       distributor: 'distributor',
       compactor: 'compactor',
     },

diff --git a/operations/tempo-mixin/dashboards/tempo-operational.json b/operations/tempo-mixin/dashboards/tempo-operational.json
@@ -5438,7 +5438,7 @@
           "value": "tempo-ops"
         },
         "datasource": "$ds",
-        "definition": "label_values(kube_pod_container_info{image=~\".*tempo.*\", cluster=\"$cluster\"}, namespace)",
+        "definition": "label_values(tempo_build_info, namespace)",
         "description": null,
         "error": null,
         "hide": 0,
@@ -5448,7 +5448,7 @@
         "name": "namespace",
         "options": [],
         "query": {
-          "query": "label_values(kube_pod_container_info{image=~\".*tempo.*\", cluster=\"$cluster\"}, namespace)",
+          "query": "label_values(tempo_build_info, namespace)",
           "refId": "ops-cortex-namespace-Variable-Query"
         },
         "refresh": 1,
@@ -5495,6 +5495,16 @@
             "text": "ingester",
             "value": "ingester"
           },
+          {
+            "selected": false,
+            "text": "metrics-generator",
+            "value": "metrics-generator"
+          },
+          {
+            "selected": false,
+            "text": "query-frontend",
+            "value": "query-frontend"
+          },
           {
             "selected": false,
             "text": "querier",
@@ -5506,7 +5516,7 @@
             "value": "cortex-gw"
           }
         ],
-        "query": "compactor,distributor,ingester,querier,cortex-gw",
+        "query": "compactor,distributor,ingester,metrics-generator,query-frontend,querier,cortex-gw",
         "queryValue": "",
         "skipUrlSync": false,
         "type": "custom"

diff --git a/operations/tempo-mixin/dashboards/tempo-resources.libsonnet b/operations/tempo-mixin/dashboards/tempo-resources.libsonnet
@@ -42,6 +42,18 @@ dashboard_utils {
           $.goHeapInUsePanel('Memory (go heap inuse)', $.jobMatcher($._config.jobs.ingester)),
         )
       )
+      .addRow(
+        g.row('Metrics-generator')
+        .addPanel(
+          $.containerCPUUsagePanel('CPU', $._config.jobs.metrics_generator),
+        )
+        .addPanel(
+          $.containerMemoryWorkingSetPanel('Memory (workingset)', $._config.jobs.metrics_generator),
+        )
+        .addPanel(
+          $.goHeapInUsePanel('Memory (go heap inuse)', $.jobMatcher($._config.jobs.metrics_generator)),
+        )
+      )
       .addRow(
         g.row('Query Frontend')
         .addPanel(

diff --git a/operations/tempo-mixin/yamls/tempo-operational.json b/operations/tempo-mixin/yamls/tempo-operational.json
@@ -6040,7 +6040,7 @@
      "value": "tempo-ops"
     },
     "datasource": "$ds",
-    "definition": "label_values(kube_pod_container_info{image=~\".*tempo.*\", cluster=\"$cluster\"}, namespace)",
+    "definition": "label_values(tempo_build_info, namespace)",
     "description": null,
     "error": null,
     "hide": 0,
@@ -6052,7 +6052,7 @@
 
     ],
     "query": {
-     "query": "label_values(kube_pod_container_info{image=~\".*tempo.*\", cluster=\"$cluster\"}, namespace)",
+     "query": "label_values(tempo_build_info, namespace)",
      "refId": "ops-cortex-namespace-Variable-Query"
     },
     "refresh": 1,
@@ -6099,6 +6099,16 @@
       "text": "ingester",
       "value": "ingester"
      },
+     {
+      "selected": false,
+      "text": "metrics-generator",
+      "value": "metrics-generator"
+     },
+     {
+      "selected": false,
+      "text": "query-frontend",
+      "value": "query-frontend"
+     },
      {
       "selected": false,
       "text": "querier",
@@ -6110,7 +6120,7 @@
       "value": "cortex-gw"
      }
     ],
-    "query": "compactor,distributor,ingester,querier,cortex-gw",
+    "query": "compactor,distributor,ingester,metrics-generator,query-frontend,querier,cortex-gw",
     "queryValue": "",
     "skipUrlSync": false,
     "type": "custom"