diff --git a/.mergify.yml b/.mergify.yml index fb0f2880eb0..8cb101bb087 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -332,3 +332,17 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + - name: backport patches to 8.14 branch + conditions: + - merged + - base=main + - label=backport-8.14 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.14" + labels: + - "backport" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index e57b067927a..623bc75afd3 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,4 +1,5 @@ // tag::list[] +* <> * <> * <> * <> @@ -17,6 +18,7 @@ // tag::includes[] include::./changelogs/head.asciidoc[] +include::./changelogs/8.14.asciidoc[] include::./changelogs/8.13.asciidoc[] include::./changelogs/8.12.asciidoc[] include::./changelogs/8.11.asciidoc[] diff --git a/changelogs/8.14.asciidoc b/changelogs/8.14.asciidoc new file mode 100644 index 00000000000..0f7b06b3b99 --- /dev/null +++ b/changelogs/8.14.asciidoc @@ -0,0 +1,24 @@ +[[apm-release-notes-8.14]] +== APM version 8.14 +* <> + +[float] +[[apm-release-notes-8.14.0]] +=== APM version 8.14.0 + +https://github.com/elastic/apm-server/compare/v8.13.2\...v8.14.0[View commits] + +[float] +==== Breaking Changes + +[float] +==== Deprecations + +[float] +==== Intake API Changes + +[float] +==== Added +- OpenTelemetry Distro Name will now be used for `agent.name` and `agent.version` {pull}12940[12940] +- Add support for setting the `host.id` via IntakeV2 {pull}12940[12940] +- Improved error message when tail sampling processor fails to read from subscriber position file {pull}12759[12759] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 2960ca0b5b5..a3cf1bf266d 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -1,7 +1,7 @@ [[release-notes-head]] == APM version HEAD -https://github.com/elastic/apm-server/compare/8.13\...main[View commits] +https://github.com/elastic/apm-server/compare/8.14\...main[View commits] [float] ==== Breaking Changes @@ -14,5 +14,3 @@ https://github.com/elastic/apm-server/compare/8.13\...main[View commits] [float] ==== Added -- OpenTelemetry Distro Name will now be used for `agent.name` and `agent.version` {pull}12940[12940] -- Add support for setting the `host.id` via IntakeV2 {pull}12940[12940] \ No newline at end of file diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go index 7b4c8aa6075..a7731b88d2a 100644 --- a/cmd/intake-receiver/version.go +++ b/cmd/intake-receiver/version.go @@ -18,4 +18,4 @@ package main // version matches the APM Server's version -const version = "8.14.0" +const version = "8.15.0" diff --git a/internal/version/version.go b/internal/version/version.go index fdde5cd026d..2985c194338 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -18,4 +18,4 @@ package version // Version holds the APM Server version. -const Version = "8.14.0" +const Version = "8.15.0"