improved performance of misconfig monitor

nttgin · Oct 19, 2023 · 631aae1 · 631aae1
1 parent e3f5746
commit 631aae1
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/src/monitors/monitorAS.js b/src/monitors/monitorAS.js
@@ -80,32 +80,34 @@ export default class MonitorAS extends Monitor {
 
             const messageOrigin = message.originAS;
             const messagePrefix = message.prefix;
-            const matchedRule = this.getMonitoredAsMatch(messageOrigin);
+            const matchedASRule = this.getMonitoredAsMatch(messageOrigin);
 
-            if (matchedRule) {
+            if (matchedASRule) {
 
                 const matchedPrefixRules = this.getMoreSpecificMatches(messagePrefix, true, false);
 
                 if (this.skipPrefixMatch) {
-                    this.publishAlert(messageOrigin.getId().toString() + "-" + messagePrefix,
-                        messageOrigin.getId(),
-                        matchedRule,
-                        message,
-                        {});
-
-                    for (let matchedPrefixRule of matchedPrefixRules) {
-                        this.publishAlert(messageOrigin.getId().toString() + "-" + messagePrefix,
-                            messageOrigin.getId(),
-                            matchedPrefixRule,
-                            message,
-                            {});
+                    const skipMatches = matchedPrefixRules.map(i => i.group).flat();
+                    const goodMatches = matchedASRule.map(i => i.group).flat();
+
+                    for (let g of goodMatches) {
+                        if (!skipMatches.includes(g)) {
+                            this.publishAlert(messageOrigin.getId().toString() + "-" + messagePrefix,
+                                messageOrigin.getId(),
+                                {
+                                    ...matchedASRule,
+                                    group: [g]
+                                },
+                                message,
+                                {});
+                        }
                     }
 
                 } else if (!matchedPrefixRules.length) {
 
                     this.publishAlert(messageOrigin.getId().toString() + "-" + messagePrefix,
                         messageOrigin.getId(),
-                        matchedRule,
+                        matchedASRule,
                         message,
                         {});
                 }