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

GoogleCloudMonitoring: Refactor query type definition (#58512)

Browse Source
This commit is contained in:
Andres Martinez Gotor
2022-11-10 09:30:47 +01:00
committed by GitHub
parent 70dac35348
commit 1201170724
8 changed files with 107 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudmonitoring/cloudmonitoring_test.go
+45 -1
View File
@@ -52,7 +52,11 @@ func TestCloudMonitoring(t *testing.T) {
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) {
qes, err := service.buildQueryExecutors(slog, baseReq())
req := baseReq()
err := migrateRequest(req)
require.NoError(t, err)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
queries := getCloudMonitoringQueriesFromInterface(t, qes)
@@ -92,6 +96,8 @@ func TestCloudMonitoring(t *testing.T) {
"metricType": "a/metric/type",
"filters": ["key", "=", "value", "AND", "key2", "=", "value2", "AND", "resource.type", "=", "another/resource/type"]
}`)
err := migrateRequest(query)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, query)
require.NoError(t, err)
@@ -124,6 +130,8 @@ func TestCloudMonitoring(t *testing.T) {
"alignmentPeriod": "grafana-auto",
"filters": ["key", "=", "value", "AND", "key2", "=", "value2"]
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -152,6 +160,8 @@ func TestCloudMonitoring(t *testing.T) {
"alignmentPeriod": "grafana-auto",
"filters": ["key", "=", "value", "AND", "key2", "=", "value2"]
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -186,6 +196,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "cloud-monitoring-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -201,6 +213,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "cloud-monitoring-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -216,6 +230,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "cloud-monitoring-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -231,6 +247,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "cloud-monitoring-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -250,6 +268,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "stackdriver-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -280,6 +300,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "stackdriver-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -310,6 +332,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "stackdriver-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -340,6 +364,8 @@ func TestCloudMonitoring(t *testing.T) {
"target": "target",
"alignmentPeriod": "stackdriver-auto"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -370,6 +396,8 @@ func TestCloudMonitoring(t *testing.T) {
req.Queries[0].JSON = json.RawMessage(`{
"alignmentPeriod": "+600s"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -400,6 +428,8 @@ func TestCloudMonitoring(t *testing.T) {
"crossSeriesReducer": "REDUCE_SUM",
"view": "FULL"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -444,6 +474,8 @@ func TestCloudMonitoring(t *testing.T) {
"groupBys": ["metric.label.group1", "metric.label.group2"],
"view": "FULL"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -738,6 +770,8 @@ func TestCloudMonitoring(t *testing.T) {
"groupBys": ["labelname"],
"view": "FULL"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -766,6 +800,8 @@ func TestCloudMonitoring(t *testing.T) {
"view": "FULL",
"preprocessor": "none"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -794,6 +830,8 @@ func TestCloudMonitoring(t *testing.T) {
"view": "FULL",
"preprocessor": "rate"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -820,6 +858,8 @@ func TestCloudMonitoring(t *testing.T) {
"view": "FULL",
"preprocessor": "rate"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -848,6 +888,8 @@ func TestCloudMonitoring(t *testing.T) {
"view": "FULL",
"preprocessor": "delta"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)
@@ -874,6 +916,8 @@ func TestCloudMonitoring(t *testing.T) {
"view": "FULL",
"preprocessor": "delta"
}`)
err := migrateRequest(req)
require.NoError(t, err)
qes, err := service.buildQueryExecutors(slog, req)
require.NoError(t, err)