IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed alias in Cloudwatch Expressions

Browse Source
This commit is contained in:
utkarshcmu 2019-02-27 00:20:29 -08:00
parent 1478f38dd9
commit 8ef3aebc29
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/tsdb/cloudwatch/cloudwatch.go
View File

@ -496,9 +496,9 @@ func parseQuery(model *simplejson.Json) (*CloudWatchQuery, error) {
} }
alias := model.Get("alias").MustString() alias := model.Get("alias").MustString()
if alias == "" { /*if alias == "" {
alias = "{{metric}}_{{stat}}" alias = "{{metric}}_{{stat}}"
} }*/
returnData := model.Get("returnData").MustBool(false) returnData := model.Get("returnData").MustBool(false)
highResolution := model.Get("highResolution").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 { func formatAlias(query *CloudWatchQuery, stat string, dimensions map[string]string) string {
if len(query.Id) > 0 && len(query.Expression) > 0 { 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{} data := map[string]string{}