elasticsearch: query interval override fix

pkg/tsdb/elasticsearch/client/client.go

@@ -104,7 +104,7 @@ func (c *baseClientImpl) GetTimeField() string {
 }
 }
 
 
 func (c *baseClientImpl) GetMinInterval(queryInterval string) (time.Duration, error) {
 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,
 		"interval": queryInterval,
 	}), 5*time.Second)
 	}), 5*time.Second)
 }
 }

pkg/tsdb/elasticsearch/time_series_query.go

@@ -258,7 +258,7 @@ func (p *timeSeriesQueryParser) parse(tsdbQuery *tsdb.TsdbQuery) ([]*Query, erro
 			return nil, err
 			return nil, err
 		}
 		}
 		alias := model.Get("alias").MustString("")
 		alias := model.Get("alias").MustString("")
-		interval := model.Get("interval").MustString()
+		interval := strconv.FormatInt(q.IntervalMs, 10) + "ms"
 
 
 		queries = append(queries, &Query{
 		queries = append(queries, &Query{
 			TimeField:  timeField,
 			TimeField:  timeField,