Merge branch 'master' into notifications-correct-grouping

do not send more than group_threshold alerts at once to a notification plugin
2023-04-14 11:25:55 +02:00 · 2023-04-14 11:13:52 +02:00
1 changed files with 13 additions and 2 deletions
--- a/pkg/csplugin/broker.go
+++ b/pkg/csplugin/broker.go
@ -115,9 +115,20 @@ loop:
 			pb.alertsByPluginName[pluginName] = make([]*models.Alert, 0)
 			pluginMutex.Unlock()
 			go func() {
-				if err := pb.pushNotificationsToPlugin(pluginName, tmpAlerts); err != nil {
+				//Chunk alerts to respect group_threshold
+				threshold := pb.pluginConfigByName[pluginName].GroupThreshold
+				if threshold == 0 {
+					threshold = 1
+				}
+				for i := 0; i < len(tmpAlerts); i += threshold {
+					end := i + threshold
+					if end > len(tmpAlerts) {
+						end = len(tmpAlerts)
+					}
+					if err := pb.pushNotificationsToPlugin(pluginName, tmpAlerts[i:end]); err != nil {
 						log.WithField("plugin:", pluginName).Error(err)
 					}
+				}
 			}()

 		case <-pluginTomb.Dying():
Author	SHA1	Message	Date
blotus	5e8081e76c	Merge branch 'master' into notifications-correct-grouping	2023-04-14 11:25:55 +02:00
Sebastien Blot	1aa6f4014f	do not send more than group_threshold alerts at once to a notification plugin	2023-04-14 11:13:52 +02:00