fix(alerting): fixed issue with using nested queries in graphite query used in alerting rule, fixes #5996

2016-10-11 12:50:11 +02:00
parent 446bde2421
commit f1905a8485
2 changed files with 31 additions and 4 deletions
@@ -57,7 +57,11 @@ func (e *GraphiteExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice,
 	}

 	for _, query := range queries {
-		formData["target"] = []string{query.Model.Get("target").MustString()}
+		if fullTarget, err := query.Model.Get("targetFull").String(); err == nil {
+			formData["target"] = []string{fullTarget}
+		} else {
+			formData["target"] = []string{query.Model.Get("target").MustString()}
+		}
 	}

 	if setting.Env == setting.DEV {