Adding "logs" into regex since enterprise-logs might be in use (#4438)

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
grafana · Oct 8, 2021 · 1b0e3f8 · 1b0e3f8
1 parent d265e1d
commit 1b0e3f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/production/loki-mixin/dashboards/dashboard-loki-operational.json b/production/loki-mixin/dashboards/dashboard-loki-operational.json
@@ -6588,14 +6588,14 @@
       {
         "allValue": null,
         "datasource": "$datasource",
-        "definition": "label_values(kube_pod_container_info{image=~\".*loki.*\", container!=\"loki-canary\"}, cluster)",
+        "definition": "label_values(kube_pod_container_info{image=~\".*(loki|logs).*\", container!=\"loki-canary\"}, cluster)",
         "hide": 0,
         "includeAll": false,
         "label": null,
         "multi": false,
         "name": "cluster",
         "options": [],
-        "query": "label_values(kube_pod_container_info{image=~\".*loki.*\", container!=\"loki-canary\"}, cluster)",
+        "query": "label_values(kube_pod_container_info{image=~\".*(loki|logs).*\", container!=\"loki-canary\"}, cluster)",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
@@ -6609,14 +6609,14 @@
       {
         "allValue": null,
         "datasource": "$datasource",
-        "definition": "label_values(kube_pod_container_info{image=~\".*loki.*\", cluster=\"$cluster\", container!=\"loki-canary\"}, namespace)",
+        "definition": "label_values(kube_pod_container_info{image=~\".*(loki|logs).*\", cluster=\"$cluster\", container!=\"loki-canary\"}, namespace)",
         "hide": 0,
         "includeAll": false,
         "label": null,
         "multi": false,
         "name": "namespace",
         "options": [],
-        "query": "label_values(kube_pod_container_info{image=~\".*loki.*\", cluster=\"$cluster\", container!=\"loki-canary\"}, namespace)",
+        "query": "label_values(kube_pod_container_info{image=~\".*(loki|logs).*\", cluster=\"$cluster\", container!=\"loki-canary\"}, namespace)",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,

diff --git a/production/loki-mixin/dashboards/loki-operational.libsonnet b/production/loki-mixin/dashboards/loki-operational.libsonnet
@@ -16,7 +16,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
       namespaceType:: 'query',
       namespaceQuery::
         if cfg.showMultiCluster then
-          'kube_pod_container_info{cluster="$cluster", image=~".*loki.*", container!="loki-canary"}'
+          'kube_pod_container_info{cluster="$cluster", image=~".*(loki|logs).*", container!="loki-canary"}'
         else
           'kube_pod_container_info',
 
@@ -45,7 +45,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
           {
             variable:: 'cluster',
             label:: cfg.clusterLabel,
-            query:: 'kube_pod_container_info{image=~".*loki.*", container!="loki-canary"}',
+            query:: 'kube_pod_container_info{image=~".*(loki|logs).*", container!="loki-canary"}',
             datasource:: '$datasource',
             type:: 'query',
           },