added filtration by from and to time ranges for raw query mode (#48)

HadesArchitect · Dec 5, 2020 · 1b70c39 · 1b70c39
1 parent 3a1663d
commit 1b70c39
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/backend/datasource.go b/backend/datasource.go
@@ -99,7 +99,7 @@ func (ds *CassandraDatasource) MetricQuery(tsdbReq *datasource.DatasourceRequest
 		var preparedQuery string
 
 		if queryData.Get("rawQuery").MustBool() {
-			preparedQuery = queryData.Get("target").MustString()
+			preparedQuery = ds.builder.RawMetricQuery(queryData, tsdbReq.TimeRange.FromRaw, tsdbReq.TimeRange.ToRaw)
 		} else {
 			preparedQuery = ds.builder.MetricQuery(queryData, tsdbReq.TimeRange.FromRaw, tsdbReq.TimeRange.ToRaw)
 		}

diff --git a/backend/query_builder.go b/backend/query_builder.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"strings"
 
 	simplejson "github.com/bitly/go-simplejson"
 )
@@ -31,3 +32,15 @@ func (qb *QueryBuilder) MetricQuery(queryData *simplejson.Json, timeRangeFrom st
 
 	return preparedQuery
 }
+
+func (qb *QueryBuilder) RawMetricQuery(queryData *simplejson.Json, timeRangeFrom string, timeRangeTo string) string {
+	if !queryData.Get("rawQuery").MustBool() {
+		return qb.MetricQuery(queryData, timeRangeFrom, timeRangeTo)
+	}
+
+	timeRangeReplacer := strings.NewReplacer("$__timeFrom", timeRangeFrom, "$__timeTo", timeRangeTo)
+
+	preparedQuery := queryData.Get("target").MustString()
+
+	return timeRangeReplacer.Replace(preparedQuery)
+}