public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GoogleCloudMonitoring: Refactor metricType input (#59369)

Browse Source 
* GoogleCloudMonitoring: Refactor metricType input

* Remove preprocessor in favor of secondary inputs (#59384)
This commit is contained in:
Andres Martinez Gotor
2022-11-29 12:39:45 +01:00
committed by GitHub
parent 5011b259c7
commit 6127409ab3
3 changed files with 138 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudmonitoring/cloudmonitoring_test.go
+37 -9
View File
@@ -80,6 +80,34 @@ func TestCloudMonitoring(t *testing.T) {
assert.Equal(t, "testalias", queries[0].aliasBy)
})
t.Run("parses a time series list with secondary inputs", func(t *testing.T) {
req := baseTimeSeriesList()
req.Queries[0].JSON = json.RawMessage(`{
"timeSeriesList": {
"filters": ["metric.type=\"a/metric/type\""],
"view": "FULL",
"secondaryAlignmentPeriod": "60s",
"secondaryCrossSeriesReducer": "REDUCE_NONE",
"secondaryPerSeriesAligner": "ALIGN_MEAN",
"secondaryGroupBys": ["metric.label.group"]
},
"aliasBy": "testalias"
}`)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
queries := getCloudMonitoringListFromInterface(t, qes)
require.Len(t, queries, 1)
assert.Equal(t, "A", queries[0].refID)
assert.Equal(t, "+60s", queries[0].params["secondaryAggregation.alignmentPeriod"][0])
assert.Equal(t, "REDUCE_NONE", queries[0].params["secondaryAggregation.crossSeriesReducer"][0])
assert.Equal(t, "ALIGN_MEAN", queries[0].params["secondaryAggregation.perSeriesAligner"][0])
assert.Equal(t, "metric.label.group", queries[0].params["secondaryAggregation.groupByFields"][0])
assert.Equal(t, "FULL", queries[0].params["view"][0])
assert.Equal(t, "testalias", queries[0].aliasBy)
})
t.Run("Parse migrated queries from frontend and build Google Cloud Monitoring API queries", func(t *testing.T) {
t.Run("and query has no aggregation set", func(t *testing.T) {
req := deprecatedReq()
@@ -132,7 +160,7 @@ func TestCloudMonitoring(t *testing.T) {
require.NoError(t, err)
queries := getCloudMonitoringListFromInterface(t, qes)
assert.Equal(t, 1, len(queries))
assert.Equal(t, `metric.type="a/metric/type" key="value" key2="value2" resource.type="another/resource/type"`, queries[0].params["filter"][0])
assert.Equal(t, `key="value" key2="value2" resource.type="another/resource/type" metric.type="a/metric/type"`, queries[0].params["filter"][0])
// assign a resource type to query parameters
// in the actual workflow this information comes from the response of the Monitoring API
@@ -146,7 +174,7 @@ func TestCloudMonitoring(t *testing.T) {
"end": "2018-03-15T13:34:00Z",
}
expectedTimeSeriesFilter := map[string]interface{}{
"filter": `metric.type="a/metric/type" key="value" key2="value2" resource.type="another/resource/type"`,
"filter": `key="value" key2="value2" resource.type="another/resource/type" metric.type="a/metric/type"`,
}
verifyDeepLink(t, dl, expectedTimeSelection, expectedTimeSeriesFilter)
})
@@ -773,21 +801,21 @@ func TestCloudMonitoring(t *testing.T) {
t.Run("when building filter string", func(t *testing.T) {
t.Run("and there's no regex operator", func(t *testing.T) {
t.Run("and there are wildcards in a filter value", func(t *testing.T) {
filterParts := []string{"zone", "=", "*-central1*"}
value := buildFilterString("somemetrictype", filterParts)
filterParts := []string{"metric.type", "=", "somemetrictype", "AND", "zone", "=", "*-central1*"}
value := buildFilterString(filterParts)
assert.Equal(t, `metric.type="somemetrictype" zone=has_substring("-central1")`, value)
})
t.Run("and there are no wildcards in any filter value", func(t *testing.T) {
filterParts := []string{"zone", "!=", "us-central1-a"}
value := buildFilterString("somemetrictype", filterParts)
filterParts := []string{"metric.type", "=", "somemetrictype", "AND", "zone", "!=", "us-central1-a"}
value := buildFilterString(filterParts)
assert.Equal(t, `metric.type="somemetrictype" zone!="us-central1-a"`, value)
})
})
t.Run("and there is a regex operator", func(t *testing.T) {
filterParts := []string{"zone", "=~", "us-central1-a~"}
value := buildFilterString("somemetrictype", filterParts)
filterParts := []string{"metric.type", "=", "somemetrictype", "AND", "zone", "=~", "us-central1-a~"}
value := buildFilterString(filterParts)
assert.NotContains(t, value, `=~`)
assert.Contains(t, value, `zone=`)
@@ -1091,7 +1119,7 @@ func baseTimeSeriesList() *backend.QueryDataRequest {
QueryType: "metrics",
JSON: json.RawMessage(`{
"timeSeriesList": {
"metricType": "a/metric/type",
"filters": ["metric.type=\"a/metric/type\""],
"view": "FULL"
},
"aliasBy": "testalias"