mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-27 14:39:40 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #1066 from prometheus/fix-bool

Browse source 
Fix bool modifier in recording rules and printing.
This commit is contained in:
Julius Volz 2015-09-10 12:03:11 +02:00
parent 9a70ee752e 6d3e054692
commit 6e393807c3
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
promql/printer.go
View file

@ -146,6 +146,11 @@ func (node *AggregateExpr) String() string {
} }
func (node *BinaryExpr) String() string { func (node *BinaryExpr) String() string {
returnBool := ""
if node.ReturnBool {
returnBool = " BOOL"
}
matching := "" matching := ""
vm := node.VectorMatching vm := node.VectorMatching
if vm != nil && len(vm.On) > 0 { if vm != nil && len(vm.On) > 0 {
@ -157,7 +162,7 @@ func (node *BinaryExpr) String() string {
matching += fmt.Sprintf(" GROUP_RIGHT(%s)", vm.Include) matching += fmt.Sprintf(" GROUP_RIGHT(%s)", vm.Include)
} }
} }
return fmt.Sprintf("%s %s%s %s", node.LHS, node.Op, matching, node.RHS) return fmt.Sprintf("%s %s%s%s %s", node.LHS, node.Op, returnBool, matching, node.RHS)
} }
func (node *Call) String() string { func (node *Call) String() string {

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: `up > BOOL 0`,
},
} }
for _, test := range inputs { for _, test := range inputs {