Merge branch 'dev' into dist

nttgin · Oct 27, 2023 · a348929 · a348929
2 parents 93ba3c7 + e7f711b
commit a348929
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/monitors/monitorROAS.js b/src/monitors/monitorROAS.js
@@ -324,12 +324,17 @@ export default class MonitorROAS extends Monitor {
                             `ROAs change detected: ${alertsStrings.slice(0, 10).join("; ")} and more...`;
 
                         alerts = alerts.concat(alertsStrings);
+                        const metadata = this.rpki.getMetadata();
 
                         this.publishAlert(md5(message), // The hash will prevent alert duplications in case multiple ASes/prefixes are involved
                             matchedRule.prefix,
                             matchedRule,
                             message,
-                            {diff: alertsStrings, subType: "roa-diff"});
+                            {
+                                diff: alertsStrings,
+                                subType: "roa-diff",
+                                rpkiMetadata: metadata,
+                            });
                     }
                 }
             }

diff --git a/src/monitors/monitorRPKI.js b/src/monitors/monitorRPKI.js
@@ -107,6 +107,8 @@ export default class MonitorRPKI extends Monitor {
         const origin = result.origin.getValue();
         if (result && !this.rpki.getStatus().stale) {
 
+            const rpkiMetadata = this.rpki.getMetadata();
+
             const cacheKey = "a" + [prefix, origin]
                 .join("-")
                 .replace(/\./g, "_")
@@ -123,20 +125,20 @@ export default class MonitorRPKI extends Monitor {
                         prefix,
                         matchedRule,
                         message,
-                        { covering: null, valid: null, roaDisappeared: true, subType: "rpki-disappear" });
+                        { rpkiMetadata, covering: null, valid: null, roaDisappeared: true, subType: "rpki-disappear" });
                 } else if (this.params.checkUncovered) {
                     this.publishAlert(key,
                         prefix,
                         matchedRule,
                         message,
-                        { covering: null, valid: null, subType: "rpki-unknown" });
+                        { rpkiMetadata, covering: null, valid: null, subType: "rpki-unknown" });
                 }
             } else if (result.valid === false) {
                 this.publishAlert(key,
                     prefix,
                     matchedRule,
                     message,
-                    { covering: result.covering, valid: false, subType: "rpki-invalid" });
+                    { rpkiMetadata, covering: result.covering, valid: false, subType: "rpki-invalid" });
 
             } else if (result.valid) {