Merge pull request #6721 from jasonlyc/bug_fix

firewalla · Apr 24, 2024 · ebaf322 · ebaf322
2 parents af92818 + 050e6ff
commit ebaf322
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/intel/TagsInfoIntel.js b/intel/TagsInfoIntel.js
@@ -20,14 +20,23 @@ const log = require('../net2/logger.js')(__filename);
 const Intel = require('./Intel.js');
 const tagManager = require('../net2/TagManager.js');
 const Constants = require('../net2/Constants.js');
+const Monitorable = require('../net2/Monitorable.js');
 
 class TagsInfoIntel extends Intel {
     async enrichAlarm(alarm) {
+      const guid = alarm["p.device.mac"] || alarm["p.device.guid"];
+      const device = Monitorable.getInstance(guid);
+      const allTags = device && await device.getTransitiveTags() || {};
       for (const type of Object.keys(Constants.TAG_TYPE_MAP)) {
         const config = Constants.TAG_TYPE_MAP[type];
         const idKey = config.alarmIdKey;
         const nameKey = config.alarmNameKey;
-        if (_.has(alarm, idKey)) {
+        if (!_.has(alarm, idKey)) {
+          const tags = Object.keys(_.get(allTags, type, {}));
+          if (!_.isEmpty(tags))
+            alarm[idKey] = tags;
+        }
+        if (!_.isEmpty(alarm[idKey])) {
           let names = [];
           for (let index = 0; index < alarm[idKey].length; index++) {
             const tagUid = alarm[idKey][index];