From 72f25865c4ecf60790fe2f00327a3953d1b05412 Mon Sep 17 00:00:00 2001 From: Thomas Jackson Date: Wed, 11 Mar 2020 09:44:46 -0700 Subject: [PATCH] Correct passing of Grouping/Without to `count_values` Previously `count_values` was dropping all Grouping labels in its aggregation. Fixes #283 --- pkg/proxystorage/proxy.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/proxystorage/proxy.go b/pkg/proxystorage/proxy.go index b2e961c4d..92e23fd29 100644 --- a/pkg/proxystorage/proxy.go +++ b/pkg/proxystorage/proxy.go @@ -415,7 +415,8 @@ func (p *ProxyStorage) NodeReplacer(ctx context.Context, s *promql.EvalStmt, nod return &promql.AggregateExpr{ Op: promql.ItemSum, Expr: ret, - Grouping: []string{n.Param.(*promql.StringLiteral).Val}, + Grouping: append(n.Grouping, n.Param.(*promql.StringLiteral).Val), + Without: n.Without, }, nil case promql.ItemQuantile: