fix(compatibility): Hide button to remove filter of implicit filters …

…in Kibana 7.16 - Replaced query from `match` to `match_phrase`
wazuh · Dec 27, 2021 · b7f63d0 · b7f63d0
1 parent 872b092
commit b7f63d0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 49 deletions.
diff --git a/public/components/common/modules/modules-helper.js b/public/components/common/modules/modules-helper.js
@@ -53,10 +53,10 @@ export class ModulesHelper {
     for (let i = 0; i < filters.length; i++) {
       let found = false;
       (implicitFilters || []).forEach(x => {
-        const objKey = x.query && x.query.match ? Object.keys(x.query.match)[0] : x.meta.key;
+        const objKey = x.query && x.query.match_phrase ? Object.keys(x.query.match_phrase)[0] : x.meta.key;
         const key = `filter-key-${objKey}`;
-        const value = x.query && x.query.match
-          ? `filter-value-${x.query.match[objKey].query}`
+        const value = x.query && x.query.match_phrase
+          ? `filter-value-${x.query.match_phrase[objKey].query}`
           : `filter-value-${x.meta.value}`;
         const data = filters[i].attributes[3];
         if (data.value.includes(key) && data.value.includes(value)) {

diff --git a/public/components/wz-agent-selector/wz-agent-selector.js b/public/components/wz-agent-selector/wz-agent-selector.js
@@ -73,10 +73,9 @@ class WzAgentSelector extends Component {
             "index": AppState.getCurrentPattern() || WAZUH_ALERTS_PATTERN
           },
           "query": {
-            "match": {
+            "match_phrase": {
               'agent.id': {
-                query: agentIdList[0],
-                type: 'phrase'
+                query: agentIdList[0]
               }
             }
           },

diff --git a/public/controllers/agent/agents.js b/public/controllers/agent/agents.js
@@ -617,19 +617,6 @@ export class AgentsController {
     this.setTabs();
   }
 
-  /**
-   * Filter by Mitre.ID
-   * @param {*} id
-   */
-  addMitrefilter(id) {
-    const filter = `{"meta":{"index": ${
-      AppState.getCurrentPattern() || WAZUH_ALERTS_PATTERN
-    }},"query":{"match":{"rule.mitre.id":{"query":"${id}","type":"phrase"}}}}`;
-    this.$rootScope.$emit('addNewKibanaFilter', {
-      filter: JSON.parse(filter),
-    });
-  }
-
   /**
    * Build the current section tabs
    */

diff --git a/public/controllers/overview/components/overview-actions/overview-actions.js b/public/controllers/overview/components/overview-actions/overview-actions.js
@@ -113,10 +113,9 @@ class OverviewActions extends Component {
             index: AppState.getCurrentPattern() || WAZUH_ALERTS_PATTERN,
           },
           query: {
-            match: {
+            match_phrase: {
               'agent.id': {
-                query: agentIdList[0],
-                type: 'phrase',
+                query: agentIdList[0]
               },
             },
           },

diff --git a/public/controllers/overview/overview.js b/public/controllers/overview/overview.js
@@ -365,15 +365,6 @@ export class OverviewController {
     }
   }
 
-  /**
-   * Filter by Mitre.ID
-   * @param {*} id
-   */
-  addMitrefilter(id) {
-    const filter = `{"meta":{ "index": ${AppState.getCurrentPattern() || WAZUH_ALERTS_PATTERN}},"query":{"match":{"rule.mitre.id":{"query":"${id}","type":"phrase"}}}}`;
-    this.$rootScope.$emit('addNewKibanaFilter', { filter: JSON.parse(filter) });
-  }
-
   /**
    * On controller loads
    */

diff --git a/public/utils/filter-handler.js b/public/utils/filter-handler.js
@@ -31,7 +31,7 @@ export class FilterHandler {
         }
       },
       query: {
-        match: null
+        match_phrase: null
       },
       $state: {
         store: 'appState'
@@ -44,10 +44,9 @@ export class FilterHandler {
     result.meta.key = 'agent.id';
     result.meta.value = agent;
     result.meta.params.query = agent;
-    result.query.match = {
+    result.query.match_phrase = {
       'agent.id': {
-        query: agent,
-        type: 'phrase'
+        query: agent
       }
     };
     return result;
@@ -58,10 +57,9 @@ export class FilterHandler {
     result.meta.key = 'cluster.node';
     result.meta.value = node;
     result.meta.params.query = node;
-    result.query.match = {
+    result.query.match_phrase = {
       'cluster.node': {
-        query: node,
-        type: 'phrase'
+        query: node
       }
     };
     return result;
@@ -72,10 +70,9 @@ export class FilterHandler {
     result.meta.key = 'rule.groups';
     result.meta.value = group;
     result.meta.params.query = group;
-    result.query.match = {
+    result.query.match_phrase = {
       'rule.groups': {
-        query: group,
-        type: 'phrase'
+        query: group
       }
     };
     return result;
@@ -87,10 +84,9 @@ export class FilterHandler {
     result.meta.key = 'rule.id';
     result.meta.value = ruleId;
     result.meta.params.query = ruleId;
-    result.query.match = {
+    result.query.match_phrase = {
       'rule.id': {
-        query: ruleId,
-        type: 'phrase'
+        query: ruleId
       }
     };
     return result;
@@ -101,17 +97,15 @@ export class FilterHandler {
     result.meta.key = isCluster ? 'cluster.name' : 'manager.name';
     result.meta.value = manager;
     result.meta.params.query = manager;
-    result.query.match = isCluster
+    result.query.match_phrase = isCluster
       ? {
           'cluster.name': {
-            query: manager,
-            type: 'phrase'
+            query: manager
           }
         }
       : {
           'manager.name': {
-            query: manager,
-            type: 'phrase'
+            query: manager
           }
         };
     return result;