mixin: improve ingest storage queries

Signed-off-by: Vladimir Varankin <[email protected]>
grafana · Sep 2, 2024 · a7dc32a · a7dc32a
1 parent 673cbe2
commit a7dc32a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/operations/mimir-mixin/dashboards/dashboard-queries.libsonnet b/operations/mimir-mixin/dashboards/dashboard-queries.libsonnet
@@ -297,7 +297,10 @@ local utils = import 'mixin-utils/utils.libsonnet';
 
       ingestOrClassicDeduplicatedQuery(perIngesterQuery, groupByLabels=''):: |||
         ( # Classic storage
-          sum by (%(groupByCluster)s, %(groupByLabels)s) (%(perIngesterQuery)s)
+          sum by (%(groupByCluster)s, %(groupByLabels)s) (
+            %(perIngesterQuery)s unless on (job)
+            cortex_partition_ring_partitions{%(ingester)s}
+          )
           / on (%(groupByCluster)s) group_left()
           max by (%(groupByCluster)s) (cortex_distributor_replication_factor{%(distributor)s})
         )
@@ -318,6 +321,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
         groupByLabels: groupByLabels,
         groupByCluster: $._config.group_by_cluster,
         distributor: variables.distributorMatcher,
+        ingester: variables.ingesterMatcher,
       },
     },