juniper_*,m365_defender,microsoft_defender_endpoint,mimecast,modsecurity: remove duplicate fields (elastic#4611)

efd6 · web-flow · commit e23f14f520fd · 2022-11-29T17:03:27.000+10:30
diff --git a/packages/juniper_junos/changelog.yml b/packages/juniper_junos/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.5.1"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4611
 - version: "0.5.0"
   changes:
     - description: Update package to ECS 8.5.0.
diff --git a/packages/juniper_junos/data_stream/log/fields/agent.yml b/packages/juniper_junos/data_stream/log/fields/agent.yml
@@ -62,11 +62,6 @@
     These fields help correlate data based containers from any runtime.'
   type: group
   fields:
-    - name: id
-      level: core
-      type: keyword
-      ignore_above: 1024
-      description: Unique container id.
     - name: image.name
       level: extended
       type: keyword
diff --git a/packages/juniper_junos/data_stream/log/fields/ecs.yml b/packages/juniper_junos/data_stream/log/fields/ecs.yml
@@ -202,8 +202,6 @@
   name: source.subdomain
 - external: ecs
   name: source.top_level_domain
-- external: ecs
-  name: tags
 - external: ecs
   name: url.domain
 - external: ecs
diff --git a/packages/juniper_junos/manifest.yml b/packages/juniper_junos/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: juniper_junos
 title: Juniper JunOS
-version: "0.5.0"
+version: "0.5.1"
 description: Collect logs from Juniper JunOS with Elastic Agent.
 categories: ["network", "security"]
 release: experimental
diff --git a/packages/juniper_netscreen/changelog.yml b/packages/juniper_netscreen/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.5.1"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4611
 - version: "0.5.0"
   changes:
     - description: Update package to ECS 8.5.0.
diff --git a/packages/juniper_netscreen/data_stream/log/fields/agent.yml b/packages/juniper_netscreen/data_stream/log/fields/agent.yml
@@ -62,11 +62,6 @@
     These fields help correlate data based containers from any runtime.'
   type: group
   fields:
-    - name: id
-      level: core
-      type: keyword
-      ignore_above: 1024
-      description: Unique container id.
     - name: image.name
       level: extended
       type: keyword
diff --git a/packages/juniper_netscreen/data_stream/log/fields/ecs.yml b/packages/juniper_netscreen/data_stream/log/fields/ecs.yml
@@ -202,8 +202,6 @@
   name: source.subdomain
 - external: ecs
   name: source.top_level_domain
-- external: ecs
-  name: tags
 - external: ecs
   name: url.domain
 - external: ecs
diff --git a/packages/juniper_netscreen/manifest.yml b/packages/juniper_netscreen/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: juniper_netscreen
 title: Juniper NetScreen
-version: "0.5.0"
+version: "0.5.1"
 description: Collect logs from Juniper NetScreen with Elastic Agent.
 categories: ["network", "security"]
 release: experimental
diff --git a/packages/juniper_srx/changelog.yml b/packages/juniper_srx/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.6.1"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4611
 - version: "1.6.0"
   changes:
     - description: Update package to ECS 8.5.0.
diff --git a/packages/juniper_srx/data_stream/log/fields/ecs.yml b/packages/juniper_srx/data_stream/log/fields/ecs.yml
@@ -108,16 +108,8 @@
   name: code_signature.trusted
 - external: ecs
   name: code_signature.valid
-- external: ecs
-  name: container.id
-- external: ecs
-  name: container.image.name
 - external: ecs
   name: container.image.tag
-- external: ecs
-  name: container.labels
-- external: ecs
-  name: container.name
 - external: ecs
   name: container.runtime
 - external: ecs
diff --git a/packages/juniper_srx/manifest.yml b/packages/juniper_srx/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: juniper_srx
 title: Juniper SRX
-version: "1.6.0"
+version: "1.6.1"
 description: Collect logs from Juniper SRX devices with Elastic Agent.
 categories: ["network", "security"]
 release: ga
diff --git a/packages/m365_defender/changelog.yml b/packages/m365_defender/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.4.1"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4611
 - version: "1.4.0"
   changes:
     - description: Add New Incident Data Stream.
diff --git a/packages/m365_defender/data_stream/log/fields/ecs.yml b/packages/m365_defender/data_stream/log/fields/ecs.yml
@@ -52,8 +52,6 @@
   name: observer.vendor
 - external: ecs
   name: observer.name
-- external: ecs
-  name: url.full
 - external: ecs
   name: url.domain
 - external: ecs
diff --git a/packages/m365_defender/manifest.yml b/packages/m365_defender/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: m365_defender
 title: Microsoft M365 Defender
-version: 1.4.0
+version: 1.4.1
 description: Collect logs from Microsoft M365 Defender with Elastic Agent.
 categories:
   - "network"
diff --git a/packages/microsoft_defender_endpoint/changelog.yml b/packages/microsoft_defender_endpoint/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "2.5.1"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4611
 - version: "2.5.0"
   changes:
     - description: Update package to ECS 8.5.0.
diff --git a/packages/microsoft_defender_endpoint/data_stream/log/fields/ecs.yml b/packages/microsoft_defender_endpoint/data_stream/log/fields/ecs.yml
@@ -1,13 +1,5 @@
-- external: ecs
-  name: container.id
-- external: ecs
-  name: container.image.name
 - external: ecs
   name: container.image.tag
-- external: ecs
-  name: container.labels
-- external: ecs
-  name: container.name
 - external: ecs
   name: container.runtime
 - external: ecs
diff --git a/packages/microsoft_defender_endpoint/data_stream/log/fields/fields.yml b/packages/microsoft_defender_endpoint/data_stream/log/fields/fields.yml
@@ -1,6 +1,5 @@
 - name: microsoft.defender_endpoint
   type: group
-  release: ga
   fields:
     - name: lastUpdateTime
       type: date
diff --git a/packages/microsoft_defender_endpoint/manifest.yml b/packages/microsoft_defender_endpoint/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: microsoft_defender_endpoint
 title: Microsoft Defender for Endpoint
-version: "2.5.0"
+version: "2.5.1"
 description: Collect logs from Microsoft Defender for Endpoint with Elastic Agent.
 categories:
   - "network"
diff --git a/packages/mimecast/changelog.yml b/packages/mimecast/changelog.yml
@@ -1,3 +1,8 @@
+- version: "1.4.1"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4611
 - version: "1.4.0"
   changes:
     - description: Update package to ECS 8.5.0.
diff --git a/packages/mimecast/data_stream/siem_logs/fields/ecs.yml b/packages/mimecast/data_stream/siem_logs/fields/ecs.yml
@@ -12,8 +12,6 @@
   name: email.attachments.file.mime_type
 - external: ecs
   name: email.attachments.file.name
-- external: ecs
-  name: email.attachments.file.name
 - external: ecs
   name: email.attachments.file.size
 - external: ecs
@@ -36,8 +34,6 @@
   name: error.type
 - external: ecs
   name: event.action
-- external: ecs
-  name: event.action
 - external: ecs
   name: event.created
 - external: ecs
diff --git a/packages/mimecast/data_stream/ttp_ap_logs/fields/ecs.yml b/packages/mimecast/data_stream/ttp_ap_logs/fields/ecs.yml
@@ -6,8 +6,6 @@
   name: email.attachments.file.hash.sha256
 - external: ecs
   name: email.attachments.file.mime_type
-- external: ecs
-  name: email.attachments.file.mime_type
 - external: ecs
   name: email.attachments.file.name
 - external: ecs
@@ -22,8 +20,6 @@
   name: email.to.address
 - external: ecs
   name: event.action
-- external: ecs
-  name: event.action
 - external: ecs
   name: event.created
 - external: ecs
diff --git a/packages/mimecast/data_stream/ttp_ip_logs/fields/ecs.yml b/packages/mimecast/data_stream/ttp_ip_logs/fields/ecs.yml
@@ -10,8 +10,6 @@
   name: email.to.address
 - external: ecs
   name: event.action
-- external: ecs
-  name: event.action
 - external: ecs
   name: event.created
 - external: ecs
diff --git a/packages/mimecast/data_stream/ttp_url_logs/fields/ecs.yml b/packages/mimecast/data_stream/ttp_url_logs/fields/ecs.yml
@@ -12,8 +12,6 @@
   name: email.to.address
 - external: ecs
   name: event.action
-- external: ecs
-  name: event.action
 - external: ecs
   name: event.created
 - external: ecs
diff --git a/packages/mimecast/manifest.yml b/packages/mimecast/manifest.yml
@@ -2,7 +2,7 @@
 format_version: 1.0.0
 name: mimecast
 title: "Mimecast"
-version: "1.4.0"
+version: "1.4.1"
 license: basic
 description: Collect logs from Mimecast with Elastic Agent.
 type: integration
diff --git a/packages/modsecurity/changelog.yml b/packages/modsecurity/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.4.1"
+  changes:
+    - description: Remove duplicate fields.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/4611
 - version: "1.4.0"
   changes:
     - description: Update package to ECS 8.5.0.
diff --git a/packages/modsecurity/data_stream/auditlog/fields/agent.yml b/packages/modsecurity/data_stream/auditlog/fields/agent.yml
@@ -121,10 +121,6 @@
         As hostname is not always unique, use values that are meaningful in your environment.
 
         Example: The current usage of `beat.name`.'
-    - name: ip
-      level: core
-      type: ip
-      description: Host ip addresses.
     - name: mac
       level: core
       type: keyword
diff --git a/packages/modsecurity/manifest.yml b/packages/modsecurity/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: modsecurity
 title: "ModSecurity Audit"
-version: "1.4.0"
+version: "1.4.1"
 license: basic
 description: Collect logs from ModSecurity with Elastic Agent
 type: integration
