Skip to content

N
nexpie-grafana-theme
Commit 1d265e05 by Mitsuhiro Tanda
Options

fix conflict

parent fe3d3bc3
Showing with 1 additions and 3 deletions
pkg/tsdb/cloudwatch/metric_find_query.go
...@@ -249,9 +249,7 @@ func (e *CloudWatchExecutor) handleGetNamespaces(ctx context.Context, parameters ...@@ -249,9 +249,7 @@ func (e *CloudWatchExecutor) handleGetNamespaces(ctx context.Context, parameters
customNamespaces := e.DataSource.JsonData.Get("customMetricsNamespaces").MustString() customNamespaces := e.DataSource.JsonData.Get("customMetricsNamespaces").MustString()
if customNamespaces != "" { if customNamespaces != "" {
for _, key := range strings.Split(customNamespaces, ",") { keys = append(keys, strings.Split(customNamespaces, ",")...)
keys = append(keys, key)
}
} }
sort.Sort(sort.StringSlice(keys)) sort.Sort(sort.StringSlice(keys))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment