From 8ef3aebc29e2ae41200312761924612c41bc8f66 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Wed, 27 Feb 2019 00:20:29 -0800 Subject: [PATCH 1/2] Fixed alias in Cloudwatch Expressions --- pkg/tsdb/cloudwatch/cloudwatch.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go index 278025db75a..bfd9f85dbf9 100644 --- a/pkg/tsdb/cloudwatch/cloudwatch.go +++ b/pkg/tsdb/cloudwatch/cloudwatch.go @@ -496,9 +496,9 @@ func parseQuery(model *simplejson.Json) (*CloudWatchQuery, error) { } alias := model.Get("alias").MustString() - if alias == "" { + /*if alias == "" { alias = "{{metric}}_{{stat}}" - } + }*/ returnData := model.Get("returnData").MustBool(false) highResolution := model.Get("highResolution").MustBool(false) @@ -521,7 +521,11 @@ func parseQuery(model *simplejson.Json) (*CloudWatchQuery, error) { func formatAlias(query *CloudWatchQuery, stat string, dimensions map[string]string) string { if len(query.Id) > 0 && len(query.Expression) > 0 { - return query.Id + if len(query.Alias) > 0 { + return query.Alias + } else { + return query.Id + } } data := map[string]string{} From 37033080b7790bc09e749ee922a49f04d5093dd0 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Wed, 27 Feb 2019 00:33:40 -0800 Subject: [PATCH 2/2] Removed commented code --- pkg/tsdb/cloudwatch/cloudwatch.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go index bfd9f85dbf9..6d68e6902e5 100644 --- a/pkg/tsdb/cloudwatch/cloudwatch.go +++ b/pkg/tsdb/cloudwatch/cloudwatch.go @@ -496,9 +496,6 @@ func parseQuery(model *simplejson.Json) (*CloudWatchQuery, error) { } alias := model.Get("alias").MustString() - /*if alias == "" { - alias = "{{metric}}_{{stat}}" - }*/ returnData := model.Get("returnData").MustBool(false) highResolution := model.Get("highResolution").MustBool(false)