1 files changed, 4 insertions(+), 4 deletions(-)

M monitoring/grafana/kubernetes-containers.yaml

@@ 5,8 5,8 @@ metadata:
 spec:
   jsonnet: |
     local grafana = import 'grafonnet/grafana.libsonnet';
-    local matchers = 'container!="POD", container!="", namespace!~"gitlab-ci-.*", namespace=~"$namespace"';
-    local podMatchers = 'container="POD", namespace!~"gitlab-ci-.*", namespace=~"$namespace"';
+    local matchers = 'job="kubelet-cadvisor", container!="POD", container!="", namespace!~"gitlab-ci-.*", namespace=~"$namespace"';
+    local podMatchers = 'job="kubelet-cadvisor", container="POD", namespace!~"gitlab-ci-.*", namespace=~"$namespace"';
 
     grafana.dashboard.new('Kubernetes Containers', refresh='30s')
       .addTemplate(grafana.template.datasource(


@@ 27,8 27,8 @@ spec:
           datasource='$DS_PROMETHEUS',
         ).addTarget(
           grafana.prometheus.target(
-            'label_replace(sum by (namespace, pod, container, instance) (rate(container_cpu_usage_seconds_total{' + matchers + '}[$__rate_interval])), "host", "$1", "instance", "([^.]*).*:10250")',
-            legendFormat='{{pod}}/{{container}}@{{host}}',
+            'sum by (namespace, pod, container, instance) (rate(container_cpu_usage_seconds_total{' + matchers + '}[$__rate_interval]))',
+            legendFormat='{{pod}}/{{container}}@{{instance}}',
           )
         ),
         gridPos={ x: 0, y: 0, w: 12, h: 8 },