Recycle ecs/vulnerability-detector

wazuh · Sep 13, 2024 · b5c8ca0 · b5c8ca0
1 parent 6daea75
commit b5c8ca0
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 241 deletions.
diff --git a/ecs/alerts/event-generator/event_generator.py b/ecs/alerts/event-generator/event_generator.py
diff --git a/ecs/generate.sh b/ecs/generate.sh
@@ -57,14 +57,6 @@ generate_mappings() {
   echo "Removing scaling_factor lines"
   find "$OUT_DIR" -type f -exec sed -i '/scaling_factor/d' {} \;
 
-  # Replace "constant_keyword" type (not supported by OpenSearch) with "keyword"
-  echo "Replacing \"constant_keyword\" type with \"keyword\""
-  find "$OUT_DIR" -type f -exec sed -i 's/constant_keyword/keyword/g' {} \;
-
-  # Replace "flattened" type (not supported by OpenSearch) with "flat_object"
-  echo "Replacing \"flattened\" type with \"flat_object\""
-  find "$OUT_DIR" -type f -exec sed -i 's/flattened/flat_object/g' {} \;
-
   local IN_FILE="$OUT_DIR/generated/elasticsearch/legacy/template.json"
   local OUT_FILE="$OUT_DIR/generated/elasticsearch/legacy/template-tmp.json"
 

diff --git a/ecs/states-inventory-vulnerabilities/fields/template-settings-legacy.json b/ecs/states-inventory-vulnerabilities/fields/template-settings-legacy.json
diff --git a/ecs/states-inventory-vulnerabilities/fields/template-settings.json b/ecs/states-inventory-vulnerabilities/fields/template-settings.json
diff --git a/...tector/event-generator/event_generator.py → ...lities/event-generator/event_generator.py b/...tector/event-generator/event_generator.py → ...lities/event-generator/event_generator.py
diff --git a/...abilities/fields/custom/vulnerability.yml → ...abilities/fields/custom/vulnerability.yml b/...abilities/fields/custom/vulnerability.yml → ...abilities/fields/custom/vulnerability.yml
@@ -27,24 +27,4 @@
       type: keyword
       level: custom
       description: >
-        The origin of the decision of the scanner (AKA feed used to detect the vulnerability).
-- name: wazuh
-  title: Wazuh
-  description: >
-    Wazuh Inc. custom fields
-  fields:
-    - name: cluster.name
-      type: keyword
-      level: custom
-      description: >
-        Wazuh cluster name.
-    - name: cluster.node
-      type: keyword
-      level: custom
-      description: >
-        Wazuh cluster node name.
-    - name: schema.version
-      type: keyword
-      level: custom
-      description: >
-        Wazuh schema version.
+        The origin of the decision of the scanner (AKA feed used to detect the vulnerability).
diff --git a/...rability-detector/fields/custom/wazuh.yml → ...s-vulnerabilities/fields/custom/wazuh.yml b/...rability-detector/fields/custom/wazuh.yml → ...s-vulnerabilities/fields/custom/wazuh.yml
@@ -1,4 +1,3 @@
----
 - name: wazuh
   title: Wazuh
   description: >
@@ -14,13 +13,8 @@
       level: custom
       description: >
         Wazuh cluster node name.
-    - name: manager.name
-      type: keyword
-      level: custom
-      description: >
-        Wazuh manager name. Used by dashboards to filter results on single node deployments.
     - name: schema.version
       type: keyword
       level: custom
       description: >
-        Wazuh schema version.
+        Wazuh schema version.
diff --git a/...nerabilities/fields/mapping-settings.json → ...nerabilities/fields/mapping-settings.json b/...nerabilities/fields/mapping-settings.json → ...nerabilities/fields/mapping-settings.json
diff --git a/...ventory-vulnerabilities/fields/subset.yml → ecs/states-vulnerabilities/fields/subset.yml b/...ventory-vulnerabilities/fields/subset.yml → ecs/states-vulnerabilities/fields/subset.yml
@@ -1,5 +1,5 @@
 ---
-name: wazuh-states-inventory-vulnerability
+name: wazuh-inventory-vulnerabilities
 fields:
   base:
     fields:

diff --git a/...ctor/fields/template-settings-legacy.json → ...ties/fields/template-settings-legacy.json b/...ctor/fields/template-settings-legacy.json → ...ties/fields/template-settings-legacy.json
diff --git a/...ty-detector/fields/template-settings.json → ...erabilities/fields/template-settings.json b/...ty-detector/fields/template-settings.json → ...erabilities/fields/template-settings.json
diff --git a/ecs/vulnerability-detector/fields/custom/vulnerability.yml b/ecs/vulnerability-detector/fields/custom/vulnerability.yml
diff --git a/ecs/vulnerability-detector/fields/mapping-settings.json b/ecs/vulnerability-detector/fields/mapping-settings.json
diff --git a/ecs/vulnerability-detector/fields/subset.yml b/ecs/vulnerability-detector/fields/subset.yml