From 33575b661b577f6eb19486bce64b660f825fe8b3 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Mon, 5 Feb 2024 20:31:58 +0800 Subject: [PATCH 1/2] changelog: add fleet ingest pipeline breaking change (#12556) * changelog: add fleet ingest pipeline breaking change See https://github.com/elastic/kibana/issues/175254 Part of #12498 (cherry picked from commit 6ed334ac1de2e7bcb8293c7c62126b99ef8fff60) # Conflicts: # changelogs/8.12.asciidoc --- changelogs/8.12.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index e35845de993..55c8a67976e 100644 --- a/changelogs/8.12.asciidoc +++ b/changelogs/8.12.asciidoc @@ -13,7 +13,11 @@ https://github.com/elastic/apm-server/compare/v8.11.4\...v8.12.0[View commits] ==== Breaking Changes - The unsupported apm_data_stream_migration ingest pipeline has been removed {pull}12102[12102]. - "publish_ready" is always false in the "GET /" response until events are received by apm-server {pull}12150[12150] +<<<<<<< HEAD - Reverts a breaking change that ignored the beat name. This is visible in Stack Monitoring {pull}12176[12176] +======= +- A bug has been introduced, so that `traces-apm@custom` ingest pipeline is now additionally applied to data streams `traces-apm.sampled-*` and `traces-apm.rum-*` and applied twice for `traces-apm-*`. See more details and information around a fix in the Known Issues section. +>>>>>>> 6ed334ac1 (changelog: add fleet ingest pipeline breaking change (#12556)) [float] ==== Bug fixes From 1444f163d3024d84d4acdd68988d5b6276d85784 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Mon, 5 Feb 2024 14:41:27 +0000 Subject: [PATCH 2/2] Fix conflict --- changelogs/8.12.asciidoc | 3 --- 1 file changed, 3 deletions(-) diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index 55c8a67976e..df36348770a 100644 --- a/changelogs/8.12.asciidoc +++ b/changelogs/8.12.asciidoc @@ -13,11 +13,8 @@ https://github.com/elastic/apm-server/compare/v8.11.4\...v8.12.0[View commits] ==== Breaking Changes - The unsupported apm_data_stream_migration ingest pipeline has been removed {pull}12102[12102]. - "publish_ready" is always false in the "GET /" response until events are received by apm-server {pull}12150[12150] -<<<<<<< HEAD - Reverts a breaking change that ignored the beat name. This is visible in Stack Monitoring {pull}12176[12176] -======= - A bug has been introduced, so that `traces-apm@custom` ingest pipeline is now additionally applied to data streams `traces-apm.sampled-*` and `traces-apm.rum-*` and applied twice for `traces-apm-*`. See more details and information around a fix in the Known Issues section. ->>>>>>> 6ed334ac1 (changelog: add fleet ingest pipeline breaking change (#12556)) [float] ==== Bug fixes