fix: Changes after review

moira-alert · May 27, 2020 · d3be627 · d3be627
1 parent 7caac9b
commit d3be627
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 214 deletions.
diff --git a/api/controller/trigger.go b/api/controller/trigger.go
@@ -36,7 +36,7 @@ func saveTrigger(dataBase moira.Database, trigger *moira.Trigger, triggerID stri
 	if err != database.ErrNil {
 		for metric := range lastCheck.Metrics {
 			if _, ok := timeSeriesNames[metric]; !ok {
-				delete(lastCheck.Metrics, metric)
+				lastCheck.RemoveMetricState(metric)
 			}
 		}
 	} else {

diff --git a/database/redis/compatibility26.go b/database/redis/compatibility26.go
diff --git a/database/redis/compatibility26_test.go b/database/redis/compatibility26_test.go
diff --git a/datatypes.go b/datatypes.go
@@ -289,18 +289,20 @@ type MaintenanceCheck interface {
 
 // CheckData represents last trigger check data
 type CheckData struct {
-	Metrics                      map[string]MetricState `json:"metrics"`
-	MetricsToTargetRelation      map[string]string      `json:"metrics_to_target_relation"`
-	Score                        int64                  `json:"score"`
-	State                        State                  `json:"state"`
-	Maintenance                  int64                  `json:"maintenance,omitempty"`
-	MaintenanceInfo              MaintenanceInfo        `json:"maintenance_info"`
-	Timestamp                    int64                  `json:"timestamp,omitempty"`
-	EventTimestamp               int64                  `json:"event_timestamp,omitempty"`
-	LastSuccessfulCheckTimestamp int64                  `json:"last_successful_check_timestamp"`
-	Suppressed                   bool                   `json:"suppressed,omitempty"`
-	SuppressedState              State                  `json:"suppressed_state,omitempty"`
-	Message                      string                 `json:"msg,omitempty"`
+	Metrics map[string]MetricState `json:"metrics"`
+	// MetricsToTargetRelation is a map that holds relation between metric names that was alone during last
+	// check and targets that fetched this metric
+	MetricsToTargetRelation      map[string]string `json:"metrics_to_target_relation"`
+	Score                        int64             `json:"score"`
+	State                        State             `json:"state"`
+	Maintenance                  int64             `json:"maintenance,omitempty"`
+	MaintenanceInfo              MaintenanceInfo   `json:"maintenance_info"`
+	Timestamp                    int64             `json:"timestamp,omitempty"`
+	EventTimestamp               int64             `json:"event_timestamp,omitempty"`
+	LastSuccessfulCheckTimestamp int64             `json:"last_successful_check_timestamp"`
+	Suppressed                   bool              `json:"suppressed,omitempty"`
+	SuppressedState              State             `json:"suppressed_state,omitempty"`
+	Message                      string            `json:"msg,omitempty"`
 }
 
 // RemoveMetricState is a function that removes MetricState from map of states.

diff --git a/senders/webhook/payload.go b/senders/webhook/payload.go
@@ -10,6 +10,7 @@ type payload struct {
 	Trigger   triggerData `json:"trigger"`
 	Events    []eventData `json:"events"`
 	Contact   contactData `json:"contact"`
+	Plot      string      `json:"plot"` // Compatibility with Moira < 2.6.0
 	Plots     []string    `json:"plots"`
 	Throttled bool        `json:"throttled"`
 }

diff --git a/senders/webhook/request.go b/senders/webhook/request.go
@@ -34,9 +34,14 @@ func (sender *Sender) buildRequest(events moira.NotificationEvents, contact moir
 }
 
 func buildRequestBody(events moira.NotificationEvents, contact moira.ContactData, trigger moira.TriggerData, plots [][]byte, throttled bool) ([]byte, error) {
+	encodedFirstPlot := ""
 	encodedPlots := make([]string, 0, len(plots))
-	for _, plot := range plots {
-		encodedPlots = append(encodedPlots, bytesToBase64(plot))
+	for i, plot := range plots {
+		encodedPlot := bytesToBase64(plot)
+		encodedPlots = append(encodedPlots, encodedPlot)
+		if i == 0 {
+			encodedFirstPlot = encodedPlot
+		}
 	}
 	requestPayload := payload{
 		Trigger: toTriggerData(trigger),
@@ -47,6 +52,7 @@ func buildRequestBody(events moira.NotificationEvents, contact moira.ContactData
 			ID:    contact.ID,
 			User:  contact.User,
 		},
+		Plot:      encodedFirstPlot,
 		Plots:     encodedPlots,
 		Throttled: throttled,
 	}

diff --git a/senders/webhook/request_test.go b/senders/webhook/request_test.go
@@ -97,7 +97,8 @@ const expectedStateChangePayload = `
     "value": "contactValue",
     "id": "contactID",
     "user": "contactUser"
-  },
+	},
+	"plot": "",
   "plots": [],
   "throttled": false
 }
@@ -117,7 +118,8 @@ const expectedEmptyPayload = `
         "value": "",
         "id": "",
         "user": ""
-    },
+		},
+		"plot": "",
     "plots": [],
     "throttled": false
 }