From 4dbeec02c8d36864e5bc54db2618e8c1bb012e07 Mon Sep 17 00:00:00 2001 From: ashokhein Date: Wed, 5 Oct 2022 12:16:57 +0000 Subject: [PATCH] Include cluster name in all alerts Signed-off-by: ashokhein --- pkg/controller/events.go | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkg/controller/events.go b/pkg/controller/events.go index 59b992665..874c186d9 100644 --- a/pkg/controller/events.go +++ b/pkg/controller/events.go @@ -73,8 +73,18 @@ func (c *Controller) sendEventToWebhook(r *flaggerv1.Canary, eventType, template func (c *Controller) alert(canary *flaggerv1.Canary, message string, metadata bool, severity flaggerv1.AlertSeverity) { var fields []notifier.Field + + if c.clusterName != "" { + fields = append(fields, + notifier.Field{ + Name: "Cluster", + Value: c.clusterName, + }, + ) + } + if metadata { - fields = alertMetadata(canary, c.clusterName) + fields = alertMetadata(canary) } // send alert with the global notifier @@ -173,18 +183,9 @@ func (c *Controller) alert(canary *flaggerv1.Canary, message string, metadata bo } } -func alertMetadata(canary *flaggerv1.Canary, cluster string) []notifier.Field { +func alertMetadata(canary *flaggerv1.Canary) []notifier.Field { var fields []notifier.Field - if cluster != "" { - fields = append(fields, - notifier.Field{ - Name: "Cluster", - Value: cluster, - }, - ) - } - fields = append(fields, notifier.Field{ Name: "Target",