Merge branch '8.12' into updatecli_updatecli-bump-elastic-stack-snaps…

…hot-8.12
elastic · Dec 14, 2023 · 9ab49fd · 9ab49fd
2 parents a2e13f8 + 0a75df6
commit 9ab49fd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 34 deletions.
diff --git 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 → changelogs/8.12.asciidoc b/changelogs/head.asciidoc → 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]
+
+* <<release-notes-8.12.0>>
+
+[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]

diff --git 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
@@ -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
@@ -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
@@ -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"
         ],