diff --git a/operations/alloy-mixin/config.libsonnet b/operations/alloy-mixin/config.libsonnet index 221aee45d9..2e5cadf835 100644 --- a/operations/alloy-mixin/config.libsonnet +++ b/operations/alloy-mixin/config.libsonnet @@ -5,7 +5,7 @@ enableLokiLogs: true, filterSelector: '', #use it to filter specific metric label values, ie: job=~"integrations/alloy" k8sClusterSelector: 'cluster=~"$cluster", namespace=~"$namespace"', - groupSelector: if self.enableK8sCluster then self.k8sClusterSelector + ', job="$job"' else 'job="$job"', + groupSelector: if self.enableK8sCluster then self.k8sClusterSelector + ', job=~"$job"' else 'job=~"$job"', instanceSelector: self.groupSelector + ', instance=~"$instance"', logsFilterSelector: '', #use to filter logs originated from alloy, and avoid picking up other platform logs, ie: service_name="alloy" dashboardTag: 'alloy-mixin', diff --git a/operations/alloy-mixin/dashboards/cluster-overview.libsonnet b/operations/alloy-mixin/dashboards/cluster-overview.libsonnet index 6364a6c2c8..9b07ec8d4f 100644 --- a/operations/alloy-mixin/dashboards/cluster-overview.libsonnet +++ b/operations/alloy-mixin/dashboards/cluster-overview.libsonnet @@ -33,7 +33,7 @@ local cluster_node_filename = 'alloy-cluster-node.json'; panel.withQueries([ panel.newInstantQuery( expr= ||| - 'count(cluster_node_info{%(groupSelector)s})' + count(cluster_node_info{%(groupSelector)s}) ||| % $._config ), ]) @@ -48,7 +48,7 @@ local cluster_node_filename = 'alloy-cluster-node.json'; panel.withQueries([ panel.newInstantQuery( expr= ||| - 'cluster_node_info{%(groupSelector)s}' + cluster_node_info{%(groupSelector)s} ||| % $._config, format='table', ),