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

surround CloudWatch dimension names with double quotes (#22222)

Browse Source
This commit is contained in:
Erik Sundell
2020-03-05 14:15:45 +01:00
committed by GitHub
parent d227353321
commit 0f8cfca4e6
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudwatch/metric_data_query_builder.go
+1 -1
View File
@@ -91,7 +91,7 @@ func buildSearchExpression(query *cloudWatchQuery, stat string) string {
schema := query.Namespace schema := query.Namespace
if len(dimensionNames) > 0 { if len(dimensionNames) > 0 {
sort.Strings(dimensionNames) sort.Strings(dimensionNames)
schema += fmt.Sprintf(",%s", join(dimensionNames, ",", "", "")) schema += fmt.Sprintf(",%s", join(dimensionNames, ",", `"`, `"`))
} }
return fmt.Sprintf("REMOVE_EMPTY(SEARCH('{%s} %s', '%s', %s))", schema, searchTerm, stat, strconv.Itoa(query.Period)) return fmt.Sprintf("REMOVE_EMPTY(SEARCH('{%s} %s', '%s', %s))", schema, searchTerm, stat, strconv.Itoa(query.Period))
pkg/tsdb/cloudwatch/metric_data_query_builder_test.go
+20 -4
View File
@@ -24,7 +24,7 @@ func TestMetricDataQueryBuilder(t *testing.T) {
} }
res := buildSearchExpression(query, "Average") res := buildSearchExpression(query, "Average")
So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,LoadBalancer} MetricName="CPUUtilization" "LoadBalancer"=("lb1" OR "lb2" OR "lb3")', 'Average', 300))`) So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,"LoadBalancer"} MetricName="CPUUtilization" "LoadBalancer"=("lb1" OR "lb2" OR "lb3")', 'Average', 300))`)
}) })
Convey("and query has three dimension values for two given dimension keys", func() { Convey("and query has three dimension values for two given dimension keys", func() {
@@ -42,7 +42,7 @@ func TestMetricDataQueryBuilder(t *testing.T) {
} }
res := buildSearchExpression(query, "Average") res := buildSearchExpression(query, "Average")
So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,InstanceId,LoadBalancer} MetricName="CPUUtilization" "InstanceId"=("i-123" OR "i-456" OR "i-789") "LoadBalancer"=("lb1" OR "lb2" OR "lb3")', 'Average', 300))`) So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,"InstanceId","LoadBalancer"} MetricName="CPUUtilization" "InstanceId"=("i-123" OR "i-456" OR "i-789") "LoadBalancer"=("lb1" OR "lb2" OR "lb3")', 'Average', 300))`)
}) })
Convey("and no OR operator was added if a star was used for dimension value", func() { Convey("and no OR operator was added if a star was used for dimension value", func() {
@@ -74,7 +74,7 @@ func TestMetricDataQueryBuilder(t *testing.T) {
} }
res := buildSearchExpression(query, "Average") res := buildSearchExpression(query, "Average")
So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,LoadBalancer} MetricName="CPUUtilization"', 'Average', 300))`) So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,"LoadBalancer"} MetricName="CPUUtilization"', 'Average', 300))`)
}) })
Convey("and query has three dimension values for two given dimension keys, and one value is a star", func() { Convey("and query has three dimension values for two given dimension keys, and one value is a star", func() {
@@ -91,7 +91,23 @@ func TestMetricDataQueryBuilder(t *testing.T) {
} }
res := buildSearchExpression(query, "Average") res := buildSearchExpression(query, "Average")
So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,InstanceId,LoadBalancer} MetricName="CPUUtilization" "LoadBalancer"=("lb1" OR "lb2" OR "lb3")', 'Average', 300))`) So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/EC2,"InstanceId","LoadBalancer"} MetricName="CPUUtilization" "LoadBalancer"=("lb1" OR "lb2" OR "lb3")', 'Average', 300))`)
})
Convey("and query has a dimension key with a space", func() {
query := &cloudWatchQuery{
Namespace: "AWS/Kafka",
MetricName: "CpuUser",
Dimensions: map[string][]string{
"Cluster Name": {"dev-cluster"},
},
Period: 300,
Expression: "",
MatchExact: matchExact,
}
res := buildSearchExpression(query, "Average")
So(res, ShouldEqual, `REMOVE_EMPTY(SEARCH('{AWS/Kafka,"Cluster Name"} MetricName="CpuUser" "Cluster Name"="dev-cluster"', 'Average', 300))`)
}) })
}) })