mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1224 from prometheus/offset-print

Browse source 
Print offsets in promql.
This commit is contained in:
Brian Brazil 2015-11-15 16:26:57 +00:00
parent 7a6a0630d1 a287264989
commit 489921fe3b
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
promql/printer.go
View file

@ -17,6 +17,7 @@ import (
"fmt"
"sort"
"strings"
"time"
"github.com/prometheus/common/model"
@ -174,7 +175,11 @@ func (node *MatrixSelector) String() string {
Name: node.Name,
LabelMatchers: node.LabelMatchers,
}
return fmt.Sprintf("%s[%s]", vecSelector.String(), strutil.DurationToString(node.Range))
offset := ""
if node.Offset != time.Duration(0) {
offset = fmt.Sprintf(" OFFSET %s", strutil.DurationToString(node.Offset))
}
return fmt.Sprintf("%s[%s]%s", vecSelector.String(), strutil.DurationToString(node.Range), offset)
}
func (node *NumberLiteral) String() string {
@ -202,10 +207,14 @@ func (node *VectorSelector) String() string {
}
labelStrings = append(labelStrings, matcher.String())
}
offset := ""
if node.Offset != time.Duration(0) {
offset = fmt.Sprintf(" OFFSET %s", strutil.DurationToString(node.Offset))
}
if len(labelStrings) == 0 {
return node.Name
return fmt.Sprintf("%s%s", node.Name, offset)
}
sort.Strings(labelStrings)
return fmt.Sprintf("%s{%s}", node.Name, strings.Join(labelStrings, ","))
return fmt.Sprintf("%s{%s}%s", node.Name, strings.Join(labelStrings, ","), offset)
}

9
promql/printer_test.go
View file

@ -33,6 +33,15 @@ func TestExprString(t *testing.T) {
{
in: `up > BOOL 0`,
},
{
in: `a OFFSET 1m`,
},
{
in: `a{c="d"}[5m] OFFSET 1m`,
},
{
in: `a[5m] OFFSET 1m`,
},
}
for _, test := range inputs {