RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

promql: fix promql query log step unit 

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
This commit is contained in:
Julien Pivotto 2020-02-08 16:26:26 +01:00
parent 22a04239c9
commit 881dde505a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/prometheus/query_log_test.go
View File

@ -105,7 +105,7 @@ func (p *queryLogTest) query(t *testing.T) {
switch p.origin { switch p.origin {
case apiOrigin: case apiOrigin:
r, err := http.Get(fmt.Sprintf( r, err := http.Get(fmt.Sprintf(
"http://%s:%d%s/api/v1/query?query=%s", "http://%s:%d%s/api/v1/query_range?step=5&start=0&end=3600&query=%s",
p.host, p.host,
p.port, p.port,
p.prefix, p.prefix,
@ -148,7 +148,13 @@ func (p *queryLogTest) queryString() string {
func (p *queryLogTest) validateLastQuery(t *testing.T, ql []queryLogLine) { func (p *queryLogTest) validateLastQuery(t *testing.T, ql []queryLogLine) {
q := ql[len(ql)-1] q := ql[len(ql)-1]
testutil.Equals(t, p.queryString(), q.Params.Query) testutil.Equals(t, p.queryString(), q.Params.Query)
testutil.Equals(t, 0, q.Params.Step)
switch p.origin {
case apiOrigin:
testutil.Equals(t, 5, q.Params.Step)
default:
testutil.Equals(t, 0, q.Params.Step)
}
if p.origin != ruleOrigin { if p.origin != ruleOrigin {
host := p.host host := p.host
@ -160,7 +166,7 @@ func (p *queryLogTest) validateLastQuery(t *testing.T, ql []queryLogLine) {
switch p.origin { switch p.origin {
case apiOrigin: case apiOrigin:
testutil.Equals(t, p.prefix+"/api/v1/query", q.Request.Path) testutil.Equals(t, p.prefix+"/api/v1/query_range", q.Request.Path)
case consoleOrigin: case consoleOrigin:
testutil.Equals(t, p.prefix+"/consoles/test.html", q.Request.Path) testutil.Equals(t, p.prefix+"/consoles/test.html", q.Request.Path)
case ruleOrigin: case ruleOrigin:

3
promql/engine.go
View File

@ -437,7 +437,8 @@ func (ng *Engine) exec(ctx context.Context, q *query) (v Value, w storage.Warnin
if eq, ok := q.Statement().(*EvalStmt); ok { if eq, ok := q.Statement().(*EvalStmt); ok {
params["start"] = formatDate(eq.Start) params["start"] = formatDate(eq.Start)
params["end"] = formatDate(eq.End) params["end"] = formatDate(eq.End)
params["step"] = eq.Interval // The step provided by the user is in seconds.
params["step"] = durationMilliseconds(eq.Interval) / 1000
} }
f := []interface{}{"params", params} f := []interface{}{"params", params}
if err != nil { if err != nil {