From 0ffbedfd669a998fe0cc5c4d0305338515f07c46 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 22 Jul 2022 18:07:28 +0200
Subject: [PATCH] Add filestream ID on standalone kubernetes manifest (#742)
 (#767)

This commit add unique IDs for the filestream inputs used by the
Kubernetes integration in the Elastic-Agent standalone
Kubernetes configuration/manifest file.

(cherry picked from commit be3c48e98171548f61f7aa4de16e48d1a288cff7)

Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co>
---
 CHANGELOG.next.asciidoc                                         | 1 +
 deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml      | 2 ++
 .../elastic-agent-standalone-daemonset-configmap.yaml           | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 8e766d24611..220d3d1160c 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -107,6 +107,7 @@
 - Allow ':' characters in dynamic variables {issue}624[624] {pull}680[680]
 - Allow the - char to appear as part of variable names in eql expressions. {issue}709[709] {pull}710[710]
 - Allow the / char in variable names in eql and transpiler. {issue}715[715] {pull}718[718]
+- Fix data duplication for standalone agent on Kubernetes using the default manifest {issue-beats}31512[31512] {pull}742[742]
 
 ==== New features
 
diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
index 8b99ce3ab0c..1aff977d342 100644
--- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
+++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
@@ -227,6 +227,7 @@ data:
                   fields:
                     ecs.version: 1.12.0
       - name: container-log
+        id: container-log-${kubernetes.pod.name}-${kubernetes.container.id}
         type: filestream
         use_output: default
         meta:
@@ -252,6 +253,7 @@ data:
             paths:
               - /var/log/containers/*${kubernetes.container.id}.log
       - name: audit-log
+        id: audit-log
         type: filestream
         use_output: default
         meta:
diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
index 6894f32bbe4..0581585e2fb 100644
--- a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
+++ b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset-configmap.yaml
@@ -227,6 +227,7 @@ data:
                   fields:
                     ecs.version: 1.12.0
       - name: container-log
+        id: container-log-${kubernetes.pod.name}-${kubernetes.container.id}
         type: filestream
         use_output: default
         meta:
@@ -252,6 +253,7 @@ data:
             paths:
               - /var/log/containers/*${kubernetes.container.id}.log
       - name: audit-log
+        id: audit-log
         type: filestream
         use_output: default
         meta: