From 2a7f5d025a969382abba6b6f49c3f790b8f03a36 Mon Sep 17 00:00:00 2001 From: Andrew Gizas Date: Mon, 11 Sep 2023 14:55:39 +0300 Subject: [PATCH] Updating Elastic Manifests with NETINFO variable (#3354) * Updating Elastic Manifests with NETINFO variable * Adding Fragment * Adding kubernetes manifests * Changing variable to ELASTIC_NETINFO * Se drfault ELASTIC_NETINFO:false * Adding infromation in fragment changelog * Adding infromation in fragment changelog * Adding infromation in fragment changelog --- .../1693920861-netinfo-manifests.yaml | 32 +++++++++++++++++++ .../base/elastic-agent-managed-daemonset.yaml | 4 +++ .../elastic-agent-standalone-daemonset.yaml | 4 +++ .../base/elastic-agent-managed-daemonset.yaml | 4 +++ .../elastic-agent-managed-statefulset.yaml | 4 +++ .../elastic-agent-standalone-daemonset.yaml | 4 +++ .../elastic-agent-standalone-statefulset.yaml | 4 +++ .../elastic-agent-managed-kubernetes.yaml | 4 +++ .../elastic-agent-managed-daemonset.yaml | 4 +++ .../elastic-agent-standalone-kubernetes.yaml | 4 +++ .../elastic-agent-standalone-daemonset.yaml | 4 +++ 11 files changed, 72 insertions(+) create mode 100644 changelog/fragments/1693920861-netinfo-manifests.yaml diff --git a/changelog/fragments/1693920861-netinfo-manifests.yaml b/changelog/fragments/1693920861-netinfo-manifests.yaml new file mode 100644 index 00000000000..9c167de170a --- /dev/null +++ b/changelog/fragments/1693920861-netinfo-manifests.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: enhancement + +# Change summary; a 80ish characters long description of the change. +summary: Setting a new environmental variable ELASTIC_NETINFO=false globally disables the netinfo.enabled parameter of add_host_metadata processor. This disables the indexing of host.ip and host.mac fields. + +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. +#description: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: elastic-agent + +# PR URL; optional; the PR number that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +#pr: https://github.com/owner/repo/1234 + +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +#issue: https://github.com/owner/repo/1234 diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index a91498c2927..c529b15460b 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml @@ -62,6 +62,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index 5c304adb8be..9cdcf8670d6 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml @@ -63,6 +63,10 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: "/etc/elastic-agent" + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml index 1c82dcaf7f2..6f5344825c0 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml @@ -62,6 +62,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml index f99c5920b02..3a934d02685 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml @@ -62,6 +62,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml index 9e8efcc0293..7b5be3a848c 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml @@ -63,6 +63,10 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: "/etc/elastic-agent" + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml index 24520b1966b..352b5478673 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml @@ -63,6 +63,10 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: "/etc/elastic-agent" + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml index 2607f4a49c7..4e9399ec6c6 100644 --- a/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-managed-kubernetes.yaml @@ -62,6 +62,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml index e69cade1216..36d5afef3be 100644 --- a/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml @@ -62,6 +62,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index 4872f0e3e55..244003075e0 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -712,6 +712,10 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: "/etc/elastic-agent" + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend) diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml index dd5abae1481..674ab8425dd 100644 --- a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml +++ b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml @@ -63,6 +63,10 @@ spec: fieldPath: metadata.name - name: STATE_PATH value: "/etc/elastic-agent" + # The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac. + # For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html + - name: ELASTIC_NETINFO + value: "false" securityContext: runAsUser: 0 # The following capabilities are needed for 'Defend for containers' integration (cloud-defend)