Correct passing of Grouping/Without to count_values

Previously `count_values` was dropping all Grouping labels in its aggregation. Fixes #283
jacksontj · Mar 11, 2020 · 72f2586 · 72f2586
1 parent 396483a
commit 72f2586
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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: