From 9cb13d577c0953fcabd12f966f86af6011c9a1c3 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 13 Dec 2024 10:55:43 +0100
Subject: [PATCH 1/3] Replace deprecated apm settings

tracing.apm.* settings were deprecated in 8.14.0 in favor of the new
telemetry.* settings. Use the new settings starting with 8.14.0.

Old settings will be removed in 9.0.
---
 internal/stack/_static/elasticsearch.yml.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/internal/stack/_static/elasticsearch.yml.tmpl b/internal/stack/_static/elasticsearch.yml.tmpl
index 43a8a981aa..07847cb574 100644
--- a/internal/stack/_static/elasticsearch.yml.tmpl
+++ b/internal/stack/_static/elasticsearch.yml.tmpl
@@ -29,7 +29,13 @@ script.context.template.cache_max_size: 2000
 
 {{ $apm_enabled := fact "apm_enabled" }}
 {{ if eq $apm_enabled "true" }}
+{{ if semverLessThan $version "8.14.0" }}
 tracing.apm.enabled: true
 tracing.apm.agent.server_url: "http://fleet-server:8200"
 tracing.apm.agent.environment: "dev"
+{{- else -}}
+telemetry.tracing.enabled: true
+telemetry.agent.server_url: "http://fleet-server:8200"
+telemetry.agent.environment: "dev"
+{{- end -}}
 {{- end -}}

From 59ab2dede17f51d3a8522b746e1d5b03a43b5565 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Fri, 13 Dec 2024 17:34:41 +0100
Subject: [PATCH 2/3] Fix settings till 8.5.0

---
 internal/stack/_static/elasticsearch.yml.tmpl | 2 +-
 internal/stack/_static/kibana.yml.tmpl        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/internal/stack/_static/elasticsearch.yml.tmpl b/internal/stack/_static/elasticsearch.yml.tmpl
index 07847cb574..d796e98247 100644
--- 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
index d83b7e1afc..8fa7acfa2d 100644
--- 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

From b0704053f46d2a5e439e35c2820d2c9c0c1dbb12 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Mon, 16 Dec 2024 12:45:00 +0100
Subject: [PATCH 3/3] Adjust version for enabling apm in fleet server

---
 internal/stack/_static/kibana.yml.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/stack/_static/kibana.yml.tmpl b/internal/stack/_static/kibana.yml.tmpl
index 8fa7acfa2d..6020c25925 100644
--- a/internal/stack/_static/kibana.yml.tmpl
+++ b/internal/stack/_static/kibana.yml.tmpl
@@ -96,18 +96,18 @@ xpack.fleet.agentPolicies:
         package:
           name: fleet_server
       {{ if eq $apm_enabled "true" }}
-      {{ if not (semverLessThan $version "8.5.0") }}
         inputs:
           - type: fleet-server
             vars:
               - name: custom
                 value: |
+      {{ if not (semverLessThan $version "8.8.0") }}
                   server:
+      {{ end }}
                     instrumentation:
                       enabled: true
                       hosts: ["http://fleet-server:8200"]
                       environment: "dev"
-      {{ end }}
       - name: apm-1
         package:
           name: apm