Merge branch 'master' into develop

2017-10-22 11:51:14 +02:00
parent a56287c2dc 4aa227dd84
commit fff0fa2aee
85 changed files with 4206 additions and 3294 deletions
@@ -112,7 +112,7 @@ func (this *SensuNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}

 	if evalContext.Rule.Message != "" {
-		bodyJSON.Set("message", evalContext.Rule.Message)
+		bodyJSON.Set("output", evalContext.Rule.Message)
 	}

 	body, _ := bodyJSON.MarshalJSON()