From 4436b8da12c092df4f0cc583a3b8c9e36de6023d Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 23 May 2018 22:07:52 +0200 Subject: [PATCH] elasticsearch: query interval override fix --- pkg/tsdb/elasticsearch/client/client.go | 2 +- pkg/tsdb/elasticsearch/time_series_query.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/tsdb/elasticsearch/client/client.go b/pkg/tsdb/elasticsearch/client/client.go index e3583070d38..4fe5c40b127 100644 --- a/pkg/tsdb/elasticsearch/client/client.go +++ b/pkg/tsdb/elasticsearch/client/client.go @@ -104,7 +104,7 @@ func (c *baseClientImpl) GetTimeField() string { } func (c *baseClientImpl) GetMinInterval(queryInterval string) (time.Duration, error) { - return tsdb.GetIntervalFrom(c.ds, simplejson.NewFromAny(map[string]string{ + return tsdb.GetIntervalFrom(c.ds, simplejson.NewFromAny(map[string]interface{}{ "interval": queryInterval, }), 5*time.Second) } diff --git a/pkg/tsdb/elasticsearch/time_series_query.go b/pkg/tsdb/elasticsearch/time_series_query.go index ae4af7704fb..ef59c62c1dc 100644 --- a/pkg/tsdb/elasticsearch/time_series_query.go +++ b/pkg/tsdb/elasticsearch/time_series_query.go @@ -258,7 +258,7 @@ func (p *timeSeriesQueryParser) parse(tsdbQuery *tsdb.TsdbQuery) ([]*Query, erro return nil, err } alias := model.Get("alias").MustString("") - interval := model.Get("interval").MustString() + interval := strconv.FormatInt(q.IntervalMs, 10) + "ms" queries = append(queries, &Query{ TimeField: timeField,