From 4621dadd22b4809629863797d72838e82d800ac6 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 21 May 2025 17:05:11 +0100 Subject: [PATCH 1/4] Backport ttl --- packages/apm/agent/input/template.yml.hbs | 1 + packages/apm/changelog.yml | 5 +++++ packages/apm/manifest.yml | 7 +++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/apm/agent/input/template.yml.hbs b/packages/apm/agent/input/template.yml.hbs index bff264560a0..a1268af37b6 100644 --- a/packages/apm/agent/input/template.yml.hbs +++ b/packages/apm/agent/input/template.yml.hbs @@ -70,5 +70,6 @@ apm-server: {{#if tail_sampling_interval}} interval: {{tail_sampling_interval}} {{/if}} + ttl: {{tail_sampling_ttl}} policies: {{tail_sampling_policies}} storage_limit: {{tail_sampling_storage_limit}} diff --git a/packages/apm/changelog.yml b/packages/apm/changelog.yml index 994e46ae304..09107048fea 100644 --- a/packages/apm/changelog.yml +++ b/packages/apm/changelog.yml @@ -1,3 +1,8 @@ +- version: 8.19.0-preview-1744129488 + changes: + - description: Add integration policy variable `tail_sampling_ttl` to configure `apm-server.sampling.tail.ttl` + type: enhancement + link: https://github.com/elastic/integrations/pull/13348 - version: 8.15.0-preview-1716438434 changes: - description: Remove data streams from integration package diff --git a/packages/apm/manifest.yml b/packages/apm/manifest.yml index 5f53f2a1386..ecc2c3d072c 100644 --- a/packages/apm/manifest.yml +++ b/packages/apm/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.1.0 name: apm title: Elastic APM -version: 8.15.0-preview-1716438434 +version: 8.19.0-preview-1744129488 description: Monitor, detect, and diagnose complex application performance issues. type: integration categories: ["elastic_stack", "monitoring"] @@ -10,7 +10,7 @@ conditions: capabilities: - apm kibana: - version: ^8.15.0 + version: ^8.19.0 icons: - src: /img/logo_apm.svg title: APM Logo @@ -166,6 +166,9 @@ policy_templates: - name: tail_sampling_interval type: text default: "1m" + - name: tail_sampling_ttl + type: text + default: "30m" - name: tail_sampling_enabled type: bool default: false From fcecf46023f6dbccb0add52e0b74d67a2a313df2 Mon Sep 17 00:00:00 2001 From: Isaac Flores <34590010+isaacaflores2@users.noreply.github.com> Date: Fri, 23 May 2025 09:36:42 -0700 Subject: [PATCH 2/4] Backport discard_on_write_failure --- packages/apm/agent/input/template.yml.hbs | 1 + packages/apm/changelog.yml | 5 ++++- packages/apm/manifest.yml | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/apm/agent/input/template.yml.hbs b/packages/apm/agent/input/template.yml.hbs index a1268af37b6..f3d2b65b6a0 100644 --- a/packages/apm/agent/input/template.yml.hbs +++ b/packages/apm/agent/input/template.yml.hbs @@ -73,3 +73,4 @@ apm-server: ttl: {{tail_sampling_ttl}} policies: {{tail_sampling_policies}} storage_limit: {{tail_sampling_storage_limit}} + discard_on_write_failure: {{tail_sampling_discard_on_write_failure}} diff --git a/packages/apm/changelog.yml b/packages/apm/changelog.yml index 09107048fea..726db455e18 100644 --- a/packages/apm/changelog.yml +++ b/packages/apm/changelog.yml @@ -1,8 +1,11 @@ -- version: 8.19.0-preview-1744129488 +- version: 8.19.0-preview-1747764883 changes: - description: Add integration policy variable `tail_sampling_ttl` to configure `apm-server.sampling.tail.ttl` type: enhancement link: https://github.com/elastic/integrations/pull/13348 + - description: Add integration policy variable `tail_sampling_discard_on_write_failure` to configure `apm-server.sampling.tail.discard_on_write_failure` + type: enhancement + link: https://github.com/elastic/integrations/pull/13950 - version: 8.15.0-preview-1716438434 changes: - description: Remove data streams from integration package diff --git a/packages/apm/manifest.yml b/packages/apm/manifest.yml index ecc2c3d072c..7d43ded4c51 100644 --- a/packages/apm/manifest.yml +++ b/packages/apm/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.1.0 name: apm title: Elastic APM -version: 8.19.0-preview-1744129488 +version: 8.19.0-preview-1747764883 description: Monitor, detect, and diagnose complex application performance issues. type: integration categories: ["elastic_stack", "monitoring"] @@ -175,6 +175,9 @@ policy_templates: - name: tail_sampling_storage_limit type: text default: "3GB" + - name: tail_sampling_discard_on_write_failure + type: bool + default: false template_path: template.yml.hbs owner: type: elastic From f4190861bce71727d7409ec6e1ce5d0eb842dafd Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 28 May 2025 10:49:20 +0100 Subject: [PATCH 3/4] Bump version --- packages/apm/changelog.yml | 2 +- packages/apm/manifest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apm/changelog.yml b/packages/apm/changelog.yml index 726db455e18..bd26b3f90b7 100644 --- a/packages/apm/changelog.yml +++ b/packages/apm/changelog.yml @@ -1,4 +1,4 @@ -- version: 8.19.0-preview-1747764883 +- version: 8.19.0-preview-1748425740 changes: - description: Add integration policy variable `tail_sampling_ttl` to configure `apm-server.sampling.tail.ttl` type: enhancement diff --git a/packages/apm/manifest.yml b/packages/apm/manifest.yml index 7d43ded4c51..cb5755de1e7 100644 --- a/packages/apm/manifest.yml +++ b/packages/apm/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.1.0 name: apm title: Elastic APM -version: 8.19.0-preview-1747764883 +version: 8.19.0-preview-1748425740 description: Monitor, detect, and diagnose complex application performance issues. type: integration categories: ["elastic_stack", "monitoring"] From 78730af1df7b0a79102dc8edb93a14ef75d28ca0 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 28 May 2025 10:51:19 +0100 Subject: [PATCH 4/4] Change PR link --- packages/apm/changelog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apm/changelog.yml b/packages/apm/changelog.yml index bd26b3f90b7..904af66a3c7 100644 --- a/packages/apm/changelog.yml +++ b/packages/apm/changelog.yml @@ -2,10 +2,10 @@ changes: - description: Add integration policy variable `tail_sampling_ttl` to configure `apm-server.sampling.tail.ttl` type: enhancement - link: https://github.com/elastic/integrations/pull/13348 + link: https://github.com/elastic/integrations/pull/14029 - description: Add integration policy variable `tail_sampling_discard_on_write_failure` to configure `apm-server.sampling.tail.discard_on_write_failure` type: enhancement - link: https://github.com/elastic/integrations/pull/13950 + link: https://github.com/elastic/integrations/pull/14029 - version: 8.15.0-preview-1716438434 changes: - description: Remove data streams from integration package