mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-21 03:16:00 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1560 from prometheus/fix-keep-common-printing

Browse source 
Fix missing printed keep_common without grouping.
This commit is contained in:
Brian Brazil 2016-04-15 18:54:03 +01:00
parent 23d383a743 6ac39700ea
commit 78e43ff758
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
promql/printer.go
View file

@ -143,10 +143,10 @@ func (node *AggregateExpr) String() string {
} else { } else {
format = "%s BY (%s)" format = "%s BY (%s)"
} }
if node.KeepExtraLabels { aggrString = fmt.Sprintf(format, aggrString, node.Grouping)
format += " KEEP_COMMON" }
} if node.KeepExtraLabels {
return fmt.Sprintf(format, aggrString, node.Grouping) aggrString += " KEEP_COMMON"
} }
return aggrString return aggrString
} }

3
promql/printer_test.go
View file

@ -30,6 +30,9 @@ func TestExprString(t *testing.T) {
{ {
in: `sum(task:errors:rate10s{job="s"}) BY (code) KEEP_COMMON`, in: `sum(task:errors:rate10s{job="s"}) BY (code) KEEP_COMMON`,
}, },
{
in: `sum(task:errors:rate10s{job="s"}) KEEP_COMMON`,
},
{ {
in: `sum(task:errors:rate10s{job="s"}) WITHOUT (instance)`, in: `sum(task:errors:rate10s{job="s"}) WITHOUT (instance)`,
}, },