Support multiple receivers for each notification (#85)

config-syncer · Aug 1, 2017 · e37ffb1 · e37ffb1
1 parent e981ff7
commit e37ffb1
Show file tree

Hide file tree

Showing 13 changed files with 137 additions and 120 deletions.
diff --git a/docs/examples/event-forwarder/config.yaml b/docs/examples/event-forwarder/config.yaml
@@ -9,8 +9,8 @@ eventForwarder:
     handle: true
     namespaces:
     - kube-system
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
 notifierSecretName: notifier-config
diff --git a/docs/examples/recycle-bin/config.yaml b/docs/examples/recycle-bin/config.yaml
@@ -2,8 +2,8 @@ notifierSecretName: notifier-config
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
   ttl: 168h
diff --git a/docs/install.md b/docs/install.md
@@ -18,8 +18,8 @@ eventForwarder:
     handle: true
   nodeAdded:
     handle: true
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
   storageAdded:
@@ -42,8 +42,8 @@ notifierSecretName: notifier-config
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
   ttl: 168h0m0s

diff --git a/docs/tutorials/event-forwarder.md b/docs/tutorials/event-forwarder.md
@@ -25,8 +25,8 @@ eventForwarder:
     handle: true
     namespaces:
     - kube-system
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
 notifierSecretName: notifier-config
@@ -181,8 +181,8 @@ eventForwarder:
     handle: true
     namespaces:
     - kube-system
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
 notifierSecretName: notifier-config

diff --git a/docs/tutorials/notifiers.md b/docs/tutorials/notifiers.md
@@ -39,8 +39,8 @@ Now, to receiver notifications via Hipchat, configure receiver as below:
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: hipchat
+  receivers:
+  - notifier: hipchat
     to:
     - ops-alerts
   ttl: 168h
@@ -96,8 +96,8 @@ Now, to receiver notifications via Mailgun, configure receiver as below:
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops-alerts@example.com
   ttl: 168h
@@ -152,8 +152,8 @@ Now, to receiver notifications via SMTP, configure receiver as below:
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: smtp
+  receivers:
+  - notifier: smtp
     to:
     - ops-alerts@example.com
   ttl: 168h
@@ -205,8 +205,8 @@ Now, to receiver notifications via SMTP, configure receiver as below:
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: twilio
+  receivers:
+  - notifier: twilio
     to:
     - +1-999-888-1234
   ttl: 168h
@@ -250,8 +250,8 @@ Now, to receiver notifications via Hipchat, configure receiver as below:
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: slack
+  receivers:
+  - notifier: slack
     to:
     - #ops-alerts
   ttl: 168h
@@ -303,8 +303,8 @@ Now, to receiver notifications via SMTP, configure receiver as below:
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: plivo
+  receivers:
+  - notifier: plivo
     to:
     - +1-999-888-1234
   ttl: 168h
@@ -338,22 +338,27 @@ eventForwarder:
     handle: true
     namespaces:
     - kube-system
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
+  - notifier: slack
+    to:
+    - #ops-alerts
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: slack
+  receivers:
+  - notifier: mailgun
+    to:
+    - ops@example.com
+  - notifier: slack
     to:
     - #ops-alerts
   ttl: 168h
 notifierSecretName: notifier-config
 ```
 
-
 ## Next Steps
  - Learn how to use Kubed to take periodic snapshots of a Kubernetes cluster [here](/docs/tutorials/cluster-snapshot.md).
  - To setup a recycle bin for deleted and/or updated Kubernetes objects, please visit [here](/docs/tutorials/recycle-bin.md).

diff --git a/docs/tutorials/recycle-bin.md b/docs/tutorials/recycle-bin.md
@@ -19,8 +19,8 @@ recycleBin:
   path: /tmp/kubed/trash
   ttl: 168h
   handleUpdates: false
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
 ```

diff --git a/hack/config/main.go b/hack/config/main.go
@@ -67,10 +67,11 @@ func CreateClusterConfig() config.ClusterConfig {
 			Path:          "/tmp/kubed/trash",
 			TTL:           metav1.Duration{Duration: 7 * 24 * time.Hour},
 			HandleUpdates: false,
-			Receiver: &config.Receiver{
+			Receivers: []config.Receiver{{
 				To:       []string{"ops@example.com"},
 				Notifier: mailgun.UID,
 			},
+			},
 		},
 		EnableConfigSyncer: true,
 		EventForwarder: &config.EventForwarderSpec{
@@ -87,11 +88,13 @@ func CreateClusterConfig() config.ClusterConfig {
 				Handle: true,
 				Namespaces: []string{
 					"kube-system",
-				}},
-			Receiver: config.Receiver{
+				},
+			},
+			Receivers: []config.Receiver{{
 				To:       []string{"ops@example.com"},
 				Notifier: mailgun.UID,
 			},
+			},
 		},
 		Janitors: []config.JanitorSpec{
 			{

diff --git a/hack/deploy/config.yaml b/hack/deploy/config.yaml
@@ -8,8 +8,8 @@ eventForwarder:
     handle: true
   nodeAdded:
     handle: true
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
   storageAdded:
@@ -32,8 +32,8 @@ notifierSecretName: notifier-config
 recycleBin:
   handleUpdates: false
   path: /tmp/kubed/trash
-  receiver:
-    notifier: mailgun
+  receivers:
+  - notifier: mailgun
     to:
     - ops@example.com
   ttl: 168h0m0s

diff --git a/hack/deploy/kubed-config.yaml b/hack/deploy/kubed-config.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  config.yaml: YXBpU2VydmVyOgogIGFkZHJlc3M6IDo4MDgwCiAgZW5hYmxlUmV2ZXJzZUluZGV4OiB0cnVlCiAgZW5hYmxlU2VhcmNoSW5kZXg6IHRydWUKZW5hYmxlQ29uZmlnU3luY2VyOiB0cnVlCmV2ZW50Rm9yd2FyZGVyOgogIGluZ3Jlc3NBZGRlZDoKICAgIGhhbmRsZTogdHJ1ZQogIG5vZGVBZGRlZDoKICAgIGhhbmRsZTogdHJ1ZQogIHJlY2VpdmVyOgogICAgbm90aWZpZXI6IG1haWxndW4KICAgIHRvOgogICAgLSBvcHNAZXhhbXBsZS5jb20KICBzdG9yYWdlQWRkZWQ6CiAgICBoYW5kbGU6IHRydWUKICB3YXJuaW5nRXZlbnRzOgogICAgaGFuZGxlOiB0cnVlCiAgICBuYW1lc3BhY2VzOgogICAgLSBrdWJlLXN5c3RlbQpqYW5pdG9yczoKLSBlbGFzdGljc2VhcmNoOgogICAgZW5kcG9pbnQ6IGh0dHA6Ly9lbGFzdGljc2VhcmNoLWxvZ2dpbmcua3ViZS1zeXN0ZW06OTIwMAogICAgbG9nSW5kZXhQcmVmaXg6IGxvZ3N0YXNoLQogIGtpbmQ6IEVsYXN0aWNzZWFyY2gKICB0dGw6IDIxNjBoMG0wcwotIGluZmx1eGRiOgogICAgZW5kcG9pbnQ6IGh0dHBzOi8vbW9uaXRvcmluZy1pbmZsdXhkYi5rdWJlLXN5c3RlbTo4MDg2CiAga2luZDogSW5mbHV4REIKICB0dGw6IDIxNjBoMG0wcwpub3RpZmllclNlY3JldE5hbWU6IG5vdGlmaWVyLWNvbmZpZwpyZWN5Y2xlQmluOgogIGhhbmRsZVVwZGF0ZXM6IGZhbHNlCiAgcGF0aDogL3RtcC9rdWJlZC90cmFzaAogIHJlY2VpdmVyOgogICAgbm90aWZpZXI6IG1haWxndW4KICAgIHRvOgogICAgLSBvcHNAZXhhbXBsZS5jb20KICB0dGw6IDE2OGgwbTBzCnNuYXBzaG90dGVyOgogIGdjczoKICAgIGJ1Y2tldDogcmVzdGljCiAgICBwcmVmaXg6IG1pbmlrdWJlCiAgc2FuaXRpemU6IHRydWUKICBzY2hlZHVsZTogJ0BldmVyeSA2aCcKICBzdG9yYWdlU2VjcmV0TmFtZTogc25hcC1zZWNyZXQK
+  config.yaml: YXBpU2VydmVyOgogIGFkZHJlc3M6IDo4MDgwCiAgZW5hYmxlUmV2ZXJzZUluZGV4OiB0cnVlCiAgZW5hYmxlU2VhcmNoSW5kZXg6IHRydWUKZW5hYmxlQ29uZmlnU3luY2VyOiB0cnVlCmV2ZW50Rm9yd2FyZGVyOgogIGluZ3Jlc3NBZGRlZDoKICAgIGhhbmRsZTogdHJ1ZQogIG5vZGVBZGRlZDoKICAgIGhhbmRsZTogdHJ1ZQogIHJlY2VpdmVyczoKICAtIG5vdGlmaWVyOiBtYWlsZ3VuCiAgICB0bzoKICAgIC0gb3BzQGV4YW1wbGUuY29tCiAgc3RvcmFnZUFkZGVkOgogICAgaGFuZGxlOiB0cnVlCiAgd2FybmluZ0V2ZW50czoKICAgIGhhbmRsZTogdHJ1ZQogICAgbmFtZXNwYWNlczoKICAgIC0ga3ViZS1zeXN0ZW0KamFuaXRvcnM6Ci0gZWxhc3RpY3NlYXJjaDoKICAgIGVuZHBvaW50OiBodHRwOi8vZWxhc3RpY3NlYXJjaC1sb2dnaW5nLmt1YmUtc3lzdGVtOjkyMDAKICAgIGxvZ0luZGV4UHJlZml4OiBsb2dzdGFzaC0KICBraW5kOiBFbGFzdGljc2VhcmNoCiAgdHRsOiAyMTYwaDBtMHMKLSBpbmZsdXhkYjoKICAgIGVuZHBvaW50OiBodHRwczovL21vbml0b3JpbmctaW5mbHV4ZGIua3ViZS1zeXN0ZW06ODA4NgogIGtpbmQ6IEluZmx1eERCCiAgdHRsOiAyMTYwaDBtMHMKbm90aWZpZXJTZWNyZXROYW1lOiBub3RpZmllci1jb25maWcKcmVjeWNsZUJpbjoKICBoYW5kbGVVcGRhdGVzOiBmYWxzZQogIHBhdGg6IC90bXAva3ViZWQvdHJhc2gKICByZWNlaXZlcnM6CiAgLSBub3RpZmllcjogbWFpbGd1bgogICAgdG86CiAgICAtIG9wc0BleGFtcGxlLmNvbQogIHR0bDogMTY4aDBtMHMKc25hcHNob3R0ZXI6CiAgZ2NzOgogICAgYnVja2V0OiByZXN0aWMKICAgIHByZWZpeDogbWluaWt1YmUKICBzYW5pdGl6ZTogdHJ1ZQogIHNjaGVkdWxlOiAnQGV2ZXJ5IDZoJwogIHN0b3JhZ2VTZWNyZXROYW1lOiBzbmFwLXNlY3JldAo=
 kind: ConfigMap
 metadata:
   creationTimestamp: null

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -51,15 +51,15 @@ type RecycleBinSpec struct {
 	Path          string          `json:"path,omitempty"`
 	TTL           metav1.Duration `json:"ttl,omitempty"`
 	HandleUpdates bool            `json:"handleUpdates"`
-	Receiver      *Receiver       `json:"receiver,omitempty"`
+	Receivers     []Receiver      `json:"receivers,omitempty"`
 }
 
 type EventForwarderSpec struct {
 	NodeAdded     ForwarderSpec `json:"nodeAdded,omitempty"`
 	StorageAdded  ForwarderSpec `json:"storageAdded,omitempty"`
 	IngressAdded  ForwarderSpec `json:"ingressAdded,omitempty"`
 	WarningEvents ForwarderSpec `json:"warningEvents,omitempty"`
-	Receiver      Receiver      `json:"receiver,omitempty"`
+	Receivers     []Receiver    `json:"receivers,omitempty"`
 }
 
 type NoNamespacedForwarderSpec struct {

diff --git a/pkg/eventer/forwarder.go b/pkg/eventer/forwarder.go
@@ -14,34 +14,36 @@ import (
 )
 
 type EventForwarder struct {
-	Receiver config.Receiver
-	Loader   envconfig.LoaderFunc
+	Receivers []config.Receiver
+	Loader    envconfig.LoaderFunc
 }
 
 func (f *EventForwarder) ForwardEvent(e *apiv1.Event) error {
 	if e.Type == apiv1.EventTypeWarning {
-		if len(f.Receiver.To) > 0 {
-			sub := fmt.Sprintf("%s %s/%s: %s", e.InvolvedObject.Kind, e.InvolvedObject.Namespace, e.InvolvedObject.Name, e.Reason)
-			if notifier, err := unified.LoadVia(strings.ToLower(f.Receiver.Notifier), f.Loader); err == nil {
-				switch n := notifier.(type) {
-				case notify.ByEmail:
-					bytes, err := yaml.Marshal(e)
-					if err != nil {
-						return err
+		for _, receiver := range f.Receivers {
+			if len(receiver.To) > 0 {
+				sub := fmt.Sprintf("%s %s/%s: %s", e.InvolvedObject.Kind, e.InvolvedObject.Namespace, e.InvolvedObject.Name, e.Reason)
+				if notifier, err := unified.LoadVia(strings.ToLower(receiver.Notifier), f.Loader); err == nil {
+					switch n := notifier.(type) {
+					case notify.ByEmail:
+						bytes, err := yaml.Marshal(e)
+						if err != nil {
+							return err
+						}
+						n.To(receiver.To[0], receiver.To[1:]...).
+							WithSubject(sub).
+							WithBody(string(bytes)).
+							WithNoTracking().
+							Send()
+					case notify.BySMS:
+						n.To(receiver.To[0], receiver.To[1:]...).
+							WithBody(sub).
+							Send()
+					case notify.ByChat:
+						n.To(receiver.To[0], receiver.To[1:]...).
+							WithBody(sub).
+							Send()
 					}
-					n.To(f.Receiver.To[0], f.Receiver.To[1:]...).
-						WithSubject(sub).
-						WithBody(string(bytes)).
-						WithNoTracking().
-						Send()
-				case notify.BySMS:
-					n.To(f.Receiver.To[0], f.Receiver.To[1:]...).
-						WithBody(sub).
-						Send()
-				case notify.ByChat:
-					n.To(f.Receiver.To[0], f.Receiver.To[1:]...).
-						WithBody(sub).
-						Send()
 				}
 			}
 		}
@@ -54,24 +56,26 @@ func (f *EventForwarder) Forward(t metav1.TypeMeta, meta metav1.ObjectMeta, v in
 	if err != nil {
 		return err
 	}
-	if len(f.Receiver.To) > 0 {
-		sub := fmt.Sprintf("%s %s %s/%s added", t.APIVersion, t.Kind, meta.Namespace, meta.Name)
-		if notifier, err := unified.LoadVia(strings.ToLower(f.Receiver.Notifier), f.Loader); err == nil {
-			switch n := notifier.(type) {
-			case notify.ByEmail:
-				n.To(f.Receiver.To[0], f.Receiver.To[1:]...).
-					WithSubject(sub).
-					WithBody(string(bytes)).
-					WithNoTracking().
-					Send()
-			case notify.BySMS:
-				n.To(f.Receiver.To[0], f.Receiver.To[1:]...).
-					WithBody(sub).
-					Send()
-			case notify.ByChat:
-				n.To(f.Receiver.To[0], f.Receiver.To[1:]...).
-					WithBody(sub).
-					Send()
+	for _, receiver := range f.Receivers {
+		if len(receiver.To) > 0 {
+			sub := fmt.Sprintf("%s %s %s/%s added", t.APIVersion, t.Kind, meta.Namespace, meta.Name)
+			if notifier, err := unified.LoadVia(strings.ToLower(receiver.Notifier), f.Loader); err == nil {
+				switch n := notifier.(type) {
+				case notify.ByEmail:
+					n.To(receiver.To[0], receiver.To[1:]...).
+						WithSubject(sub).
+						WithBody(string(bytes)).
+						WithNoTracking().
+						Send()
+				case notify.BySMS:
+					n.To(receiver.To[0], receiver.To[1:]...).
+						WithBody(sub).
+						Send()
+				case notify.ByChat:
+					n.To(receiver.To[0], receiver.To[1:]...).
+						WithBody(sub).
+						Send()
+				}
 			}
 		}
 	}

diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -106,8 +106,8 @@ func (op *Operator) Setup() error {
 
 	if op.Config.EventForwarder != nil {
 		op.Eventer = &eventer.EventForwarder{
-			Receiver: op.Config.EventForwarder.Receiver,
-			Loader:   op.NotifierLoader,
+			Receivers: op.Config.EventForwarder.Receivers,
+			Loader:    op.NotifierLoader,
 		}
 	}