Merge branch 'master' into aa_643_changedetect

CHANGELOG.md

@@ -4,9 +4,11 @@
 
 ### Features
 
+
 - [#1844](https://github.com/influxdata/kapacitor/pull/1844): Added a new kapacitor node changeDetect that emits a value
     for each time a series field changes.
-
+- [#1828](https://github.com/influxdata/kapacitor/pull/1828): Add recoverable field to JSON alert response to indicate whether the
+alert will auto-recover.
 - [#1823](https://github.com/influxdata/kapacitor/pull/1823): Update OpsGenie integration to use the v2 API.
     To upgrade to using the new API simply update your config and TICKscripts to use opsgenie2 instead of opsgenie.
     If your `opsgenie` config uses the `recovery_url` option, for `opsgenie2` you will need to change it to the `recovery_action` option.

alert.go

@@ -725,12 +725,13 @@ func (n *AlertNode) event(
 			Level:    level,
 		},
 		Data: alert.EventData{
-			Name:     name,
-			TaskName: n.et.Task.ID,
-			Group:    string(group),
-			Tags:     tags,
-			Fields:   fields,
-			Result:   result,
+			Name:        name,
+			TaskName:    n.et.Task.ID,
+			Group:       string(group),
+			Tags:        tags,
+			Fields:      fields,
+			Result:      result,
+			Recoverable: !n.a.NoRecoveriesFlag,
 		},
 	}
 	return event, nil

alert/types.go

@@ -27,6 +27,7 @@ func (e Event) AlertData() Data {
 		Level:         e.State.Level,
 		Data:          e.Data.Result,
 		PreviousLevel: e.previousState.Level,
+		Recoverable:   e.Data.Recoverable,
 	}
 }
 
@@ -80,6 +81,8 @@ type EventData struct {
 	// Fields of alerting data point.
 	Fields map[string]interface{}
 
+	Recoverable bool
+
 	Result models.Result
 }
 
@@ -179,4 +182,5 @@ type Data struct {
 	Level         Level         `json:"level"`
 	Data          models.Result `json:"data"`
 	PreviousLevel Level         `json:"previousLevel"`
+	Recoverable   bool          `json:"recoverable"`
 }

integrations/batcher_test.go

@@ -1507,6 +1507,7 @@ func TestBatch_AlertStateChangesOnly(t *testing.T) {
 				Time:          time.Date(1971, 1, 1, 0, 0, 0, 0, time.UTC),
 				Level:         alert.Critical,
 				PreviousLevel: alert.OK,
+				Recoverable:   true,
 			}
 			ad.Data = models.Result{}
 			if eq, msg := compareAlertData(expAd, ad); !eq {
@@ -1520,6 +1521,7 @@ func TestBatch_AlertStateChangesOnly(t *testing.T) {
 				Duration:      38 * time.Second,
 				Level:         alert.OK,
 				PreviousLevel: alert.Critical,
+				Recoverable:   true,
 			}
 			ad.Data = models.Result{}
 			if eq, msg := compareAlertData(expAd, ad); !eq {
@@ -1580,6 +1582,7 @@ func TestBatch_AlertStateChangesOnlyExpired(t *testing.T) {
 				Duration:      time.Duration(rc-1) * 20 * time.Second,
 				Level:         alert.Critical,
 				PreviousLevel: alert.OK,
+				Recoverable:   true,
 			}
 		case 2:
 			expAd = alert.Data{
@@ -1589,6 +1592,7 @@ func TestBatch_AlertStateChangesOnlyExpired(t *testing.T) {
 				Duration:      time.Duration(rc-1) * 20 * time.Second,
 				Level:         alert.Critical,
 				PreviousLevel: alert.Critical,
+				Recoverable:   true,
 			}
 		case 3:
 			expAd = alert.Data{
@@ -1598,6 +1602,7 @@ func TestBatch_AlertStateChangesOnlyExpired(t *testing.T) {
 				Duration:      38 * time.Second,
 				Level:         alert.OK,
 				PreviousLevel: alert.Critical,
+				Recoverable:   true,
 			}
 		}
 		if eq, msg := compareAlertData(expAd, ad); !eq {