MAtcher nå på ressurs-navn, ikke team-label

Dette vil være bakoverkompatibelt, da gamle routes/matches kun blir endret når de applyer nå konfig. Endringen går heller ikke i beina til Naisd-alerts, da de fortsatt bruker team-label, mens nye alerts ikke bruker team-label i det hele tatt.
nais · May 6, 2019 · 19b0dfe · 19b0dfe
1 parent 2c20282
commit 19b0dfe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/api/fixtures/fixtures.go b/api/fixtures/fixtures.go
@@ -10,7 +10,7 @@ var AlertResource = &v1alpha1.Alert{
 	ObjectMeta: metav1.ObjectMeta{
 		Name: "aura",
 		Labels: map[string]string{
-			"team": "aura",
+			"alert": "aura",
 		},
 	},
 	Spec: v1alpha1.AlertSpec{
@@ -42,7 +42,7 @@ var MinimalAlertResource = &v1alpha1.Alert{
 	ObjectMeta: metav1.ObjectMeta{
 		Name: "aura",
 		Labels: map[string]string{
-			"team": "aura",
+			"alert": "aura",
 		},
 	},
 	Spec: v1alpha1.AlertSpec{
@@ -101,11 +101,11 @@ route:
     - receiver: aura
       continue: true
       match:
-        team: aura
+        alert: aura
     - receiver: testmann
       continue: true
       match:
-        team: testmann`,
+        alert: testmann`,
 	},
 }
 
@@ -141,7 +141,7 @@ route:
   - receiver: testmann
     continue: true
     match:
-      team: testmann
+      alert: testmann
 templates:
 - /etc/config/alert.tmpl
 `,
@@ -181,7 +181,7 @@ route:
   - receiver: testmann
     continue: true
     match:
-      team: testmann
+      alert: testmann
 templates:
 - /etc/config/alert.tmpl`,
 	},
@@ -230,11 +230,11 @@ route:
   - receiver: testmann
     continue: true
     match:
-      team: testmann
+      alert: testmann
   - receiver: aura
     continue: true
     match:
-      team: aura
+      alert: aura
 templates:
 - /etc/config/alert.tmpl
 `,
@@ -261,7 +261,7 @@ var ExpectedConfigMapAfterAlerts = &v1.ConfigMap{
       severity: '#eeeeee'
       sla: we need to fix this ASAP
     labels:
-      team: aura
+      alert: aura
 `,
 	},
 }
diff --git a/api/updater/alerts.go b/api/updater/alerts.go
@@ -33,7 +33,7 @@ func createAlertRules(alert *v1alpha1.Alert) (alertRules []AlertRule) {
 			Expr:  rule.Expr,
 			For:   rule.For,
 			Labels: map[string]string{
-				"team": alert.GetTeamName(),
+				"alert": alert.Name,
 			},
 			Annotations: map[string]string{
 				"action":        rule.Action,

diff --git a/api/updater/alerts_test.go b/api/updater/alerts_test.go
@@ -13,7 +13,7 @@ func TestAlerts(t *testing.T) {
 		assert.Len(t, alertRules, 1)
 
 		alertRule := alertRules[0]
-		assert.Equal(t, fixtures.AlertResource.GetTeamName(), alertRule.Labels["team"])
+		assert.Equal(t, fixtures.AlertResource.Name, alertRule.Labels["alert"])
 
 		alert := fixtures.AlertResource.Spec.Alerts[0]
 		assert.Equal(t, alert.For, alertRule.For)

diff --git a/api/updater/routes.go b/api/updater/routes.go
@@ -9,7 +9,7 @@ import (
 )
 
 type matchConfig struct {
-	Team string `mapstructure:"team" yaml:"team"`
+	Alert string `mapstructure:"alert" yaml:"alert"`
 }
 
 type routeConfig struct {
@@ -60,7 +60,7 @@ func AddOrUpdateRoutes(alert *v1alpha1.Alert, alertManager map[interface{}]inter
 			Receiver: alert.Name,
 			Continue: true,
 			Match: matchConfig{
-				Team: alert.GetTeamName(),
+				Alert: alert.Name,
 			},
 		}
 		route.Routes = append(route.Routes, routes)

diff --git a/pkg/apis/alerterator/v1alpha1/types.go b/pkg/apis/alerterator/v1alpha1/types.go
@@ -62,10 +62,6 @@ type AlertSpec struct {
 	Alerts    []Rule    `json:"alerts"`
 }
 
-func (in *Alert) GetTeamName() string {
-	return in.Labels["team"]
-}
-
 func (in *Alert) CreateEvent(reason, message, typeStr string) *corev1.Event {
 	return &corev1.Event{
 		ObjectMeta: metav1.ObjectMeta{