diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index a8542fb3fce..55db1d0085c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -119,6 +119,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Fix field mapping for the system process CPU ticks fields. {pull}7230[7230] - Fix Windows service metricset when using a 32-bit binary on a 64-bit OS. {pull}7294[7294] - Fix Jolokia attribute mapping when using wildcards and MBean names with multiple properties. {pull}7321[7321] +- Do not report Metricbeat container host as hostname in Kubernetes deployment. {issue}7199[7199] *Packetbeat* diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml index a67003732de..d8ef660cf25 100644 --- a/deploy/kubernetes/metricbeat-kubernetes.yaml +++ b/deploy/kubernetes/metricbeat-kubernetes.yaml @@ -109,10 +109,6 @@ spec: value: - name: ELASTIC_CLOUD_AUTH value: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace securityContext: runAsUser: 0 resources: @@ -198,6 +194,8 @@ spec: k8s-app: metricbeat spec: serviceAccountName: metricbeat + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet containers: - name: metricbeat image: docker.elastic.co/beats/metricbeat:7.0.0-alpha1 @@ -218,10 +216,6 @@ spec: value: - name: ELASTIC_CLOUD_AUTH value: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace securityContext: runAsUser: 0 resources: diff --git a/deploy/kubernetes/metricbeat/metricbeat-daemonset.yaml b/deploy/kubernetes/metricbeat/metricbeat-daemonset.yaml index 343012624f0..6f54deb828c 100644 --- a/deploy/kubernetes/metricbeat/metricbeat-daemonset.yaml +++ b/deploy/kubernetes/metricbeat/metricbeat-daemonset.yaml @@ -37,10 +37,6 @@ spec: value: - name: ELASTIC_CLOUD_AUTH value: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace securityContext: runAsUser: 0 resources: diff --git a/deploy/kubernetes/metricbeat/metricbeat-deployment.yaml b/deploy/kubernetes/metricbeat/metricbeat-deployment.yaml index 6601cdc85c0..b05b30edeeb 100644 --- a/deploy/kubernetes/metricbeat/metricbeat-deployment.yaml +++ b/deploy/kubernetes/metricbeat/metricbeat-deployment.yaml @@ -13,6 +13,8 @@ spec: k8s-app: metricbeat spec: serviceAccountName: metricbeat + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet containers: - name: metricbeat image: docker.elastic.co/beats/metricbeat:%VERSION% @@ -33,10 +35,6 @@ spec: value: - name: ELASTIC_CLOUD_AUTH value: - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace securityContext: runAsUser: 0 resources: