Fix settings till 8.5.0

elastic · Dec 13, 2024 · 59ab2de · 59ab2de
1 parent 9cb13d5
commit 59ab2de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/internal/stack/_static/elasticsearch.yml.tmpl b/internal/stack/_static/elasticsearch.yml.tmpl
@@ -28,7 +28,7 @@ script.context.template.cache_max_size: 2000
 {{- end -}}
 
 {{ $apm_enabled := fact "apm_enabled" }}
-{{ if eq $apm_enabled "true" }}
+{{ if (and (eq $apm_enabled "true") (not (semverLessThan $version "8.5.0"))) }}
 {{ if semverLessThan $version "8.14.0" }}
 tracing.apm.enabled: true
 tracing.apm.agent.server_url: "http://fleet-server:8200"

diff --git a/internal/stack/_static/kibana.yml.tmpl b/internal/stack/_static/kibana.yml.tmpl
@@ -96,6 +96,7 @@ xpack.fleet.agentPolicies:
         package:
           name: fleet_server
       {{ if eq $apm_enabled "true" }}
+      {{ if not (semverLessThan $version "8.5.0") }}
         inputs:
           - type: fleet-server
             vars:
@@ -106,6 +107,7 @@ xpack.fleet.agentPolicies:
                       enabled: true
                       hosts: ["http://fleet-server:8200"]
                       environment: "dev"
+      {{ end }}
       - name: apm-1
         package:
           name: apm