Skip to content

Commit 70040c9

Browse files
authored
Review use of deprecated apm settings (#2274)
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. Settings have been also reviewed for older versions of the stack.
1 parent 4a88283 commit 70040c9

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

internal/stack/_static/elasticsearch.yml.tmpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@ script.context.template.cache_max_size: 2000
2828
{{- end -}}
2929

3030
{{ $apm_enabled := fact "apm_enabled" }}
31-
{{ if eq $apm_enabled "true" }}
31+
{{ if (and (eq $apm_enabled "true") (not (semverLessThan $version "8.5.0"))) }}
32+
{{ if semverLessThan $version "8.14.0" }}
3233
tracing.apm.enabled: true
3334
tracing.apm.agent.server_url: "http://fleet-server:8200"
3435
tracing.apm.agent.environment: "dev"
36+
{{- else -}}
37+
telemetry.tracing.enabled: true
38+
telemetry.agent.server_url: "http://fleet-server:8200"
39+
telemetry.agent.environment: "dev"
40+
{{- end -}}
3541
{{- end -}}

internal/stack/_static/kibana.yml.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ xpack.fleet.agentPolicies:
101101
vars:
102102
- name: custom
103103
value: |
104+
{{ if not (semverLessThan $version "8.8.0") }}
104105
server:
106+
{{ end }}
105107
instrumentation:
106108
enabled: true
107109
hosts: ["http://fleet-server:8200"]

0 commit comments

Comments
 (0)