diff --git a/CHANGELOG.md b/CHANGELOG.md
index d43d06b0a..eecd41769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 ### Features
+- [#1408](https://github.com/influxdata/kapacitor/issues/1408): Add Previous state
 
 - [#1413](https://github.com/influxdata/kapacitor/issues/1413): Add subscriptions modes to InfluxDB subscriptions.
 - [#1436](https://github.com/influxdata/kapacitor/issues/1436): Add linear fill support for QueryNode.
diff --git a/alert/types.go b/alert/types.go
index 4fb131120..f0d4dab8a 100644
--- a/alert/types.go
+++ b/alert/types.go
@@ -19,13 +19,14 @@ type Event struct {
 
 func (e Event) AlertData() Data {
 	return Data{
-		ID:       e.State.ID,
-		Message:  e.State.Message,
-		Details:  e.State.Details,
-		Time:     e.State.Time,
-		Duration: e.State.Duration,
-		Level:    e.State.Level,
-		Data:     e.Data.Result,
+		ID:            e.State.ID,
+		Message:       e.State.Message,
+		Details:       e.State.Details,
+		Time:          e.State.Time,
+		Duration:      e.State.Duration,
+		Level:         e.State.Level,
+		Data:          e.Data.Result,
+		PreviousLevel: e.previousState.Level,
 	}
 }
 
@@ -170,11 +171,12 @@ type TopicState struct {
 // Data is a structure that contains relevant data about an alert event.
 // The structure is intended to be JSON encoded, providing a consistent data format.
 type Data struct {
-	ID       string        `json:"id"`
-	Message  string        `json:"message"`
-	Details  string        `json:"details"`
-	Time     time.Time     `json:"time"`
-	Duration time.Duration `json:"duration"`
-	Level    Level         `json:"level"`
-	Data     models.Result `json:"data"`
+	ID            string        `json:"id"`
+	Message       string        `json:"message"`
+	Details       string        `json:"details"`
+	Time          time.Time     `json:"time"`
+	Duration      time.Duration `json:"duration"`
+	Level         Level         `json:"level"`
+	Data          models.Result `json:"data"`
+	PreviousLevel Level         `json:"previousLevel"`
 }
diff --git a/integrations/batcher_test.go b/integrations/batcher_test.go
index 946cac428..912deeb49 100644
--- a/integrations/batcher_test.go
+++ b/integrations/batcher_test.go
@@ -1449,10 +1449,11 @@ func TestBatch_AlertStateChangesOnly(t *testing.T) {
 		atomic.AddInt32(&requestCount, 1)
 		if rc := atomic.LoadInt32(&requestCount); rc == 1 {
 			expAd := alert.Data{
-				ID:      "cpu_usage_idle:cpu=cpu-total",
-				Message: "cpu_usage_idle:cpu=cpu-total is CRITICAL",
-				Time:    time.Date(1971, 1, 1, 0, 0, 0, 0, time.UTC),
-				Level:   alert.Critical,
+				ID:            "cpu_usage_idle:cpu=cpu-total",
+				Message:       "cpu_usage_idle:cpu=cpu-total is CRITICAL",
+				Time:          time.Date(1971, 1, 1, 0, 0, 0, 0, time.UTC),
+				Level:         alert.Critical,
+				PreviousLevel: alert.OK,
 			}
 			ad.Data = models.Result{}
 			if eq, msg := compareAlertData(expAd, ad); !eq {
@@ -1460,11 +1461,12 @@ func TestBatch_AlertStateChangesOnly(t *testing.T) {
 			}
 		} else {
 			expAd := alert.Data{
-				ID:       "cpu_usage_idle:cpu=cpu-total",
-				Message:  "cpu_usage_idle:cpu=cpu-total is OK",
-				Time:     time.Date(1971, 1, 1, 0, 0, 38, 0, time.UTC),
-				Duration: 38 * time.Second,
-				Level:    alert.OK,
+				ID:            "cpu_usage_idle:cpu=cpu-total",
+				Message:       "cpu_usage_idle:cpu=cpu-total is OK",
+				Time:          time.Date(1971, 1, 1, 0, 0, 38, 0, time.UTC),
+				Duration:      38 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Critical,
 			}
 			ad.Data = models.Result{}
 			if eq, msg := compareAlertData(expAd, ad); !eq {
@@ -1516,21 +1518,33 @@ func TestBatch_AlertStateChangesOnlyExpired(t *testing.T) {
 		var expAd alert.Data
 		atomic.AddInt32(&requestCount, 1)
 		rc := atomic.LoadInt32(&requestCount)
-		if rc < 3 {
+		switch rc {
+		case 1:
 			expAd = alert.Data{
-				ID:       "cpu_usage_idle:cpu=cpu-total",
-				Message:  "cpu_usage_idle:cpu=cpu-total is CRITICAL",
-				Time:     time.Date(1971, 1, 1, 0, 0, int(rc-1)*20, 0, time.UTC),
-				Duration: time.Duration(rc-1) * 20 * time.Second,
-				Level:    alert.Critical,
+				ID:            "cpu_usage_idle:cpu=cpu-total",
+				Message:       "cpu_usage_idle:cpu=cpu-total is CRITICAL",
+				Time:          time.Date(1971, 1, 1, 0, 0, int(rc-1)*20, 0, time.UTC),
+				Duration:      time.Duration(rc-1) * 20 * time.Second,
+				Level:         alert.Critical,
+				PreviousLevel: alert.OK,
 			}
-		} else {
+		case 2:
+			expAd = alert.Data{
+				ID:            "cpu_usage_idle:cpu=cpu-total",
+				Message:       "cpu_usage_idle:cpu=cpu-total is CRITICAL",
+				Time:          time.Date(1971, 1, 1, 0, 0, int(rc-1)*20, 0, time.UTC),
+				Duration:      time.Duration(rc-1) * 20 * time.Second,
+				Level:         alert.Critical,
+				PreviousLevel: alert.Critical,
+			}
+		case 3:
 			expAd = alert.Data{
-				ID:       "cpu_usage_idle:cpu=cpu-total",
-				Message:  "cpu_usage_idle:cpu=cpu-total is OK",
-				Time:     time.Date(1971, 1, 1, 0, 0, 38, 0, time.UTC),
-				Duration: 38 * time.Second,
-				Level:    alert.OK,
+				ID:            "cpu_usage_idle:cpu=cpu-total",
+				Message:       "cpu_usage_idle:cpu=cpu-total is OK",
+				Time:          time.Date(1971, 1, 1, 0, 0, 38, 0, time.UTC),
+				Duration:      38 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Critical,
 			}
 		}
 		if eq, msg := compareAlertData(expAd, ad); !eq {
diff --git a/integrations/streamer_test.go b/integrations/streamer_test.go
index 53f874c25..52eeee539 100644
--- a/integrations/streamer_test.go
+++ b/integrations/streamer_test.go
@@ -6374,11 +6374,12 @@ func TestStream_Alert_NoRecoveries(t *testing.T) {
 			}
 		case 2:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Time:     time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
-				Duration: 0,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Time:          time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
+				Duration:      0,
+				Level:         alert.Info,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6395,11 +6396,12 @@ func TestStream_Alert_NoRecoveries(t *testing.T) {
 			}
 		case 3:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Time:     time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
-				Duration: time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Time:          time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
+				Duration:      time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6416,11 +6418,12 @@ func TestStream_Alert_NoRecoveries(t *testing.T) {
 			}
 		case 4:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Time:     time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Time:          time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6437,11 +6440,12 @@ func TestStream_Alert_NoRecoveries(t *testing.T) {
 			}
 		case 5:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is CRITICAL",
-				Time:     time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.Critical,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is CRITICAL",
+				Time:          time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.Critical,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6458,11 +6462,12 @@ func TestStream_Alert_NoRecoveries(t *testing.T) {
 			}
 		case 6:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Time:     time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
-				Duration: 0,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Time:          time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
+				Duration:      0,
+				Level:         alert.Info,
+				PreviousLevel: alert.Critical,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6561,12 +6566,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 2:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 1, 0, time.UTC),
-				Duration: time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 1, 0, time.UTC),
+				Duration:      time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6583,12 +6589,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 3:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6605,12 +6612,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 4:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6627,12 +6635,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 5:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
-				Duration: 0 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
+				Duration:      0 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.OK,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6649,12 +6658,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 6:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
-				Duration: 1 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
+				Duration:      1 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6671,12 +6681,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 7:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 6, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 6, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6693,12 +6704,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 8:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6715,12 +6727,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 9:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
-				Duration: 0 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
+				Duration:      0 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.OK,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6737,12 +6750,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 10:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 9, 0, time.UTC),
-				Duration: 1 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 9, 0, time.UTC),
+				Duration:      1 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6759,12 +6773,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 11:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is CRITICAL",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Critical,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is CRITICAL",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Critical,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6781,12 +6796,13 @@ func TestStream_Alert_WithReset_0(t *testing.T) {
 			}
 		case 12:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 11, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 11, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Critical,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6899,12 +6915,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 2:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 1, 0, time.UTC),
-				Duration: time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 1, 0, time.UTC),
+				Duration:      time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6921,12 +6938,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 3:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6943,12 +6961,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 4:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6965,12 +6984,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 5:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
-				Duration: 0 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
+				Duration:      0 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.OK,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -6987,12 +7007,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 6:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
-				Duration: 1 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
+				Duration:      1 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7009,12 +7030,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 7:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 6, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 6, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7031,12 +7053,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 8:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7053,12 +7076,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 9:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
-				Duration: 0 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
+				Duration:      0 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.OK,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7075,12 +7099,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 10:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 9, 0, time.UTC),
-				Duration: 1 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 9, 0, time.UTC),
+				Duration:      1 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7097,12 +7122,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 11:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is CRITICAL",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Critical,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is CRITICAL",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Critical,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7119,12 +7145,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 12:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 11, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 11, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Critical,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7141,12 +7168,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 13:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 12, 0, time.UTC),
-				Duration: 4 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 12, 0, time.UTC),
+				Duration:      4 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7163,12 +7191,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 14:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is INFO",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 13, 0, time.UTC),
-				Duration: 5 * time.Second,
-				Level:    alert.Info,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is INFO",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 13, 0, time.UTC),
+				Duration:      5 * time.Second,
+				Level:         alert.Info,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7185,12 +7214,13 @@ func TestStream_Alert_WithReset_1(t *testing.T) {
 			}
 		case 15:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 14, 0, time.UTC),
-				Duration: 6 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 14, 0, time.UTC),
+				Duration:      6 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7304,12 +7334,13 @@ func TestStream_AlertDuration(t *testing.T) {
 			}
 		case 2:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
-				Duration: 2 * time.Second,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
+				Duration:      2 * time.Second,
+				Level:         alert.Warning,
+				PreviousLevel: alert.Critical,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7326,12 +7357,13 @@ func TestStream_AlertDuration(t *testing.T) {
 			}
 		case 3:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
-				Duration: 4 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
+				Duration:      4 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7348,12 +7380,13 @@ func TestStream_AlertDuration(t *testing.T) {
 			}
 		case 4:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is WARNING",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
-				Duration: 0,
-				Level:    alert.Warning,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is WARNING",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
+				Duration:      0,
+				Level:         alert.Warning,
+				PreviousLevel: alert.OK,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -7370,12 +7403,13 @@ func TestStream_AlertDuration(t *testing.T) {
 			}
 		case 5:
 			expAd = alert.Data{
-				ID:       "kapacitor/cpu/serverA",
-				Message:  "kapacitor/cpu/serverA is OK",
-				Details:  "details",
-				Time:     time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
-				Duration: 3 * time.Second,
-				Level:    alert.OK,
+				ID:            "kapacitor/cpu/serverA",
+				Message:       "kapacitor/cpu/serverA is OK",
+				Details:       "details",
+				Time:          time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
+				Duration:      3 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Warning,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -8822,12 +8856,13 @@ func TestStream_AlertSigma(t *testing.T) {
 			}
 		} else {
 			expAd = alert.Data{
-				ID:       "cpu:nil",
-				Message:  "cpu:nil is OK",
-				Details:  "cpu:nil is OK",
-				Time:     time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
-				Duration: time.Second,
-				Level:    alert.OK,
+				ID:            "cpu:nil",
+				Message:       "cpu:nil is OK",
+				Details:       "cpu:nil is OK",
+				Time:          time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
+				Duration:      time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Info,
 				Data: models.Result{
 					Series: models.Rows{
 						{
@@ -8967,21 +9002,32 @@ func TestStream_AlertStateChangesOnlyExpired(t *testing.T) {
 		var expAd alert.Data
 		atomic.AddInt32(&requestCount, 1)
 		rc := atomic.LoadInt32(&requestCount)
-		if rc < 6 {
+		if rc == 1 {
 			expAd = alert.Data{
-				ID:       "cpu:nil",
-				Message:  "cpu:nil is CRITICAL",
-				Time:     time.Date(1971, 1, 1, 0, 0, int(rc)*2-1, 0, time.UTC),
-				Duration: time.Duration(rc-1) * 2 * time.Second,
-				Level:    alert.Critical,
+				ID:            "cpu:nil",
+				Message:       "cpu:nil is CRITICAL",
+				Time:          time.Date(1971, 1, 1, 0, 0, int(rc)*2-1, 0, time.UTC),
+				Duration:      time.Duration(rc-1) * 2 * time.Second,
+				Level:         alert.Critical,
+				PreviousLevel: alert.OK,
+			}
+		} else if rc < 6 {
+			expAd = alert.Data{
+				ID:            "cpu:nil",
+				Message:       "cpu:nil is CRITICAL",
+				Time:          time.Date(1971, 1, 1, 0, 0, int(rc)*2-1, 0, time.UTC),
+				Duration:      time.Duration(rc-1) * 2 * time.Second,
+				Level:         alert.Critical,
+				PreviousLevel: alert.Critical,
 			}
 		} else {
 			expAd = alert.Data{
-				ID:       "cpu:nil",
-				Message:  "cpu:nil is OK",
-				Time:     time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
-				Duration: 9 * time.Second,
-				Level:    alert.OK,
+				ID:            "cpu:nil",
+				Message:       "cpu:nil is OK",
+				Time:          time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
+				Duration:      9 * time.Second,
+				Level:         alert.OK,
+				PreviousLevel: alert.Critical,
 			}
 		}
 		if eq, msg := compareAlertData(expAd, ad); !eq {
diff --git a/server/server_test.go b/server/server_test.go
index 80c0349d2..734da161b 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -4851,11 +4851,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 	defer f.Close()
 	exp := []alert.Data{
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 1, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 0 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 1, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.OK,
+			Duration:      0 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -4872,11 +4873,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 1 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 2, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      1 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -4893,11 +4895,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 2 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 3, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      2 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -4916,11 +4919,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 3 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 4, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      3 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -4939,11 +4943,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 4 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 5, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      4 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -4962,11 +4967,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 6, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 5 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 6, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      5 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -4984,11 +4990,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 6 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 7, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      6 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -5006,11 +5013,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 7 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 8, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      7 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -5028,11 +5036,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 9, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 8 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 9, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      8 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -5050,11 +5059,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 9 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 10, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      9 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{
@@ -5071,11 +5081,12 @@ func TestServer_RecordReplayQuery_Missing(t *testing.T) {
 			},
 		},
 		{
-			ID:       "test-stream-query",
-			Message:  "test-stream-query is CRITICAL",
-			Time:     time.Date(1971, 1, 1, 0, 0, 11, 0, time.UTC),
-			Level:    alert.Critical,
-			Duration: 10 * time.Second,
+			ID:            "test-stream-query",
+			Message:       "test-stream-query is CRITICAL",
+			Time:          time.Date(1971, 1, 1, 0, 0, 11, 0, time.UTC),
+			Level:         alert.Critical,
+			PreviousLevel: alert.Critical,
+			Duration:      10 * time.Second,
 			Data: models.Result{
 				Series: models.Rows{
 					{