From a3ce1b105180e2a5e1630d46333b096f21b4dbf4 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 15:35:07 +0300 Subject: [PATCH] Fixing the hints autodiscovery configuration path in Elastic Agent Manifests (#5136) (#5138) * updating manifests with hints notes (cherry picked from commit 27dacc5bdaae99aabdfcefc74ef4ccd10627d3b8) Co-authored-by: Andrew Gizas --- deploy/kubernetes/creator_k8s_manifest.sh | 1 + .../base/elastic-agent-standalone-daemonset-configmap.yaml | 3 ++- .../base/elastic-agent-standalone-ksm-daemonset-configmap.yaml | 3 ++- .../base/elastic-agent-standalone-ksm-daemonset-configmap.yaml | 3 ++- deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml | 3 ++- .../elastic-agent-standalone-daemonset-configmap.yaml | 3 ++- .../elastic-agent-standalone-ksm-daemonset-configmap.yaml | 3 ++- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/deploy/kubernetes/creator_k8s_manifest.sh b/deploy/kubernetes/creator_k8s_manifest.sh index e63c7a0b16b..2d3b82ce6b6 100755 --- a/deploy/kubernetes/creator_k8s_manifest.sh +++ b/deploy/kubernetes/creator_k8s_manifest.sh @@ -51,6 +51,7 @@ echo -n "\`;" >> $OUTPUT_FILE #Replacing all occurencies of elastic-agent-standalone sed -i -e 's/elastic-agent-standalone/elastic-agent/g' $OUTPUT_FILE +sed -i -e 's/elastic-agent\/templates.d/elastic-agent-standalone\/templates.d/g' $OUTPUT_FILE #Remove ES_HOST entry from file sed -i -e '/# The Elasticsearch host to communicate with/d' $OUTPUT_FILE diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml index 196250999a0..36108e80a9b 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset-configmap.yaml @@ -28,8 +28,9 @@ data: providers.kubernetes: node: ${NODE_NAME} scope: node - #Uncomment to enable hints' support + #Uncomment to enable hints' support - https://www.elastic.co/guide/en/fleet/current/hints-annotations-autodiscovery.html #hints.enabled: true + #hints.default_container_logs: true inputs: - id: kubernetes-cluster-metrics condition: ${kubernetes_leaderelection.leader} == true diff --git a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml index 8abe95421cb..dbffe084da1 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml @@ -26,8 +26,9 @@ data: providers.kubernetes: node: ${NODE_NAME} scope: node - #Uncomment to enable hints' support + #Uncomment to enable hints' support - https://www.elastic.co/guide/en/fleet/current/hints-annotations-autodiscovery.html #hints.enabled: true + #hints.default_container_logs: true inputs: - id: kubernetes-cluster-metrics condition: ${kubernetes_leaderelection.leader} == true diff --git a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml index 8abe95421cb..dbffe084da1 100644 --- a/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml +++ b/deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-ksm-daemonset-configmap.yaml @@ -26,8 +26,9 @@ data: providers.kubernetes: node: ${NODE_NAME} scope: node - #Uncomment to enable hints' support + #Uncomment to enable hints' support - https://www.elastic.co/guide/en/fleet/current/hints-annotations-autodiscovery.html #hints.enabled: true + #hints.default_container_logs: true inputs: - id: kubernetes-cluster-metrics condition: ${kubernetes_leaderelection.leader} == true diff --git a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml index b14158ed24e..f5302df7502 100644 --- a/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml +++ b/deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml @@ -28,8 +28,9 @@ data: providers.kubernetes: node: ${NODE_NAME} scope: node - #Uncomment to enable hints' support + #Uncomment to enable hints' support - https://www.elastic.co/guide/en/fleet/current/hints-annotations-autodiscovery.html #hints.enabled: true + #hints.default_container_logs: true inputs: - id: kubernetes-cluster-metrics condition: ${kubernetes_leaderelection.leader} == true 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 898666ed385..88f6f43dad1 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 @@ -28,8 +28,9 @@ data: providers.kubernetes: node: ${NODE_NAME} scope: node - #Uncomment to enable hints' support + #Uncomment to enable hints' support - https://www.elastic.co/guide/en/fleet/current/hints-annotations-autodiscovery.html #hints.enabled: true + #hints.default_container_logs: true inputs: - id: kubernetes-cluster-metrics condition: ${kubernetes_leaderelection.leader} == true diff --git a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-ksm-daemonset-configmap.yaml b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-ksm-daemonset-configmap.yaml index 8abe95421cb..dbffe084da1 100644 --- a/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-ksm-daemonset-configmap.yaml +++ b/deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-ksm-daemonset-configmap.yaml @@ -26,8 +26,9 @@ data: providers.kubernetes: node: ${NODE_NAME} scope: node - #Uncomment to enable hints' support + #Uncomment to enable hints' support - https://www.elastic.co/guide/en/fleet/current/hints-annotations-autodiscovery.html #hints.enabled: true + #hints.default_container_logs: true inputs: - id: kubernetes-cluster-metrics condition: ${kubernetes_leaderelection.leader} == true