From f18f224e6644ef5077d35c367a0220cba20fbefd Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Wed, 13 Dec 2023 18:15:29 +0000 Subject: [PATCH 1/2] docs: Update changelogs for 8.12 release (#12220) --- CHANGELOG.asciidoc | 2 +- changelogs/{head.asciidoc => 8.12.asciidoc} | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) rename changelogs/{head.asciidoc => 8.12.asciidoc} (82%) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index ea8a6729f14..3952927ccf6 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,4 +1,4 @@ -include::./changelogs/head.asciidoc[] +include::./changelogs/8.12.asciidoc[] include::./changelogs/8.11.asciidoc[] include::./changelogs/8.10.asciidoc[] include::./changelogs/8.9.asciidoc[] diff --git a/changelogs/head.asciidoc b/changelogs/8.12.asciidoc similarity index 82% rename from changelogs/head.asciidoc rename to changelogs/8.12.asciidoc index 637fc1f5df9..ea2d8013de7 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/8.12.asciidoc @@ -1,7 +1,13 @@ -[[release-notes-head]] -== APM version HEAD +[[release-notes-8.12]] +== APM version 8.12 -https://github.com/elastic/apm-server/compare/8.11\...main[View commits] +https://github.com/elastic/apm-server/compare/8.11\...8.12[View commits] + +* <> + +[float] +[[release-notes-8.12.0]] +=== APM version 8.12.0 [float] ==== Breaking Changes @@ -12,12 +18,6 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits] ==== Bug fixes - Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729]. -[float] -==== Deprecations - -[float] -==== Intake API Changes - [float] ==== Added - Update container base image to Ubuntu 22.04 {pull}11778[11778] From 0a75df62e6dc553aac3513b8238a045091e39016 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Thu, 14 Dec 2023 16:40:07 +0000 Subject: [PATCH 2/2] Fix geo ip approval changes (#12227) --- systemtest/approvals/TestIntake/Errors.approved.json | 6 ------ systemtest/approvals/TestIntake/Events.approved.json | 6 ------ systemtest/approvals/TestIntake/Transactions.approved.json | 6 ------ .../TestIntake/TransactionsHugeTraces.approved.json | 6 ------ 4 files changed, 24 deletions(-) diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json index 95efbeba3f6..466be37c138 100644 --- a/systemtest/approvals/TestIntake/Errors.approved.json +++ b/systemtest/approvals/TestIntake/Errors.approved.json @@ -27,12 +27,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ], diff --git a/systemtest/approvals/TestIntake/Events.approved.json b/systemtest/approvals/TestIntake/Events.approved.json index 01730dcfb7b..e03a5c1f8ea 100644 --- a/systemtest/approvals/TestIntake/Events.approved.json +++ b/systemtest/approvals/TestIntake/Events.approved.json @@ -791,12 +791,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ], diff --git a/systemtest/approvals/TestIntake/Transactions.approved.json b/systemtest/approvals/TestIntake/Transactions.approved.json index 83281a6eb7b..a3df939ae5d 100644 --- a/systemtest/approvals/TestIntake/Transactions.approved.json +++ b/systemtest/approvals/TestIntake/Transactions.approved.json @@ -445,12 +445,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ], diff --git a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json index 6507c06df7b..c3b48460971 100644 --- a/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json +++ b/systemtest/approvals/TestIntake/TransactionsHugeTraces.approved.json @@ -24,12 +24,6 @@ "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ "12.53.12.1" ],