Fixup rebase

grafana · Nov 27, 2024 · 5fc49a9 · 5fc49a9
1 parent 212d217
commit 5fc49a9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/production/loki-mixin/dashboards/loki-operational.libsonnet b/production/loki-mixin/dashboards/loki-operational.libsonnet
@@ -54,7 +54,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
                                  else [utils.selector.re('pod', '%s' % (if $._config.ssd.enabled then '%s-write.*' % $._config.ssd.pod_prefix_matcher else '%sdistributor.*' % $._config.pod_prefix_matcher))],
                                  ingester: if $._config.meta_monitoring.enabled
                                  then [utils.selector.re('pod', '(partition-ingester.*|%singester|%s-write|loki-single-binary)' % [$._config.pod_prefix_matcher, $._config.ssd.pod_prefix_matcher])]
-                                 else [utils.selector.re('pod', '%s' % (if $._config.ssd.enabled then '%s-write.*' % $._config.ssd.pod_prefix_matcher else '%singester.*|partition-ingester.*' % $._config.pod_prefix_matcher))],
+                                 else [utils.selector.re('pod', '%s' % (if $._config.ssd.enabled then '%s-write.*' % $._config.ssd.pod_prefix_matcher else '(%singester.*|partition-ingester.*)' % $._config.pod_prefix_matcher))],
                                  querier: if $._config.meta_monitoring.enabled
                                  then [utils.selector.re('pod', '(%squerier|%s-read|loki-single-binary)' % [$._config.pod_prefix_matcher, $._config.ssd.pod_prefix_matcher])]
                                  else [utils.selector.re('pod', '%s' % (if $._config.ssd.enabled then '%s-read.*' % $._config.ssd.pod_prefix_matcher else '%squerier.*' % $._config.pod_prefix_matcher))],

diff --git a/production/loki-mixin/dashboards/loki-reads-resources.libsonnet b/production/loki-mixin/dashboards/loki-reads-resources.libsonnet
@@ -8,7 +8,7 @@
 
   local ingester_pod_matcher = if $._config.meta_monitoring.enabled
   then 'container=~"loki|ingester|partition-ingester", pod=~"(%singester.*|partition-ingester.*|loki-single-binary)"' % $._config.pod_prefix_matcher
-  else 'container="ingester|partition-ingester"',
+  else 'container=~"ingester|partition-ingester"',
   local ingester_job_matcher = if $._config.meta_monitoring.enabled
   then '(ingester.*|partition-ingester.*|loki-single-binary)'
   else '(ingester|partition-ingester).*',

diff --git a/production/loki-mixin/dashboards/loki-writes-resources.libsonnet b/production/loki-mixin/dashboards/loki-writes-resources.libsonnet
@@ -1,7 +1,7 @@
 (import 'dashboard-utils.libsonnet') {
   local ingester_pod_matcher = if $._config.meta_monitoring.enabled
   then 'container=~"loki|ingester|partition-ingester", pod=~"(%singester.*|partition-ingester.*|loki-single-binary)"' % $._config.pod_prefix_matcher
-  else 'container="ingester"',
+  else 'container=~"ingester|partition-ingester"',
   local ingester_job_matcher = if $._config.meta_monitoring.enabled
   then '(ingester.*|partition-ingester.*|loki-single-binary)'
   else '(ingester.*|partition-ingester.*)',