Discover and merge dynamic fields for monitoring (#1300)

* Updated monitoring known fields * Discover new fields on every monitoring cron job * Merge dynamic fields for monitoring. Modularized two instance methods
wazuh · Mar 11, 2019 · 0ff0b38 · 0ff0b38
1 parent 64b208c
commit 0ff0b38
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 201 deletions.
diff --git a/server/integration-files/monitoring-known-fields.js b/server/integration-files/monitoring-known-fields.js
@@ -74,15 +74,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'dateAdd.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'group',
     type: 'string',
@@ -92,15 +83,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'group.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'host',
     type: 'string',
@@ -137,15 +119,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'lastKeepAlive.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'cluster.name',
     type: 'string',
@@ -155,15 +128,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'cluster.name.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'mergedSum',
     type: 'string',
@@ -173,15 +137,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'mergedSum.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'configSum',
     type: 'string',
@@ -191,15 +146,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'configSum.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'node_name',
     type: 'string',
@@ -209,15 +155,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'node_name.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'manager',
     type: 'string',
@@ -227,15 +164,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'manager.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'manager_host',
     type: 'string',
@@ -245,15 +173,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'manager_host.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'name',
     type: 'string',
@@ -272,15 +191,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'os.arch.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'os.codename',
     type: 'string',
@@ -290,15 +200,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'os.codename.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'os.major',
     type: 'string',
@@ -309,13 +210,13 @@ export const monitoringKnownFields = [
     readFromDocValues: false
   },
   {
-    name: 'os.major.keyword',
+    name: 'os.minor',
     type: 'string',
     count: 0,
     scripted: false,
     searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
+    aggregatable: false,
+    readFromDocValues: false
   },
   {
     name: 'os.name',
@@ -326,15 +227,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'os.name.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'os.platform',
     type: 'string',
@@ -344,15 +236,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'os.platform.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'os.uname',
     type: 'string',
@@ -362,15 +245,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'os.uname.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'os.version',
     type: 'string',
@@ -380,15 +254,6 @@ export const monitoringKnownFields = [
     aggregatable: false,
     readFromDocValues: false
   },
-  {
-    name: 'os.version.keyword',
-    type: 'string',
-    count: 0,
-    scripted: false,
-    searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
-  },
   {
     name: 'status',
     type: 'string',
@@ -408,12 +273,12 @@ export const monitoringKnownFields = [
     readFromDocValues: false
   },
   {
-    name: 'version.keyword',
+    name: 'registerIP',
     type: 'string',
     count: 0,
     scripted: false,
     searchable: true,
-    aggregatable: true,
-    readFromDocValues: true
+    aggregatable: false,
+    readFromDocValues: false
   }
 ];