Skip to content

Commit

Permalink
8.14: update docs, mergify, versions and changelogs (#12984)
Browse files Browse the repository at this point in the history
* [Release] update version 8.15.0

* [Release] update changelogs for 8.14 release

---------

Co-authored-by: apmmachine <[email protected]>
Co-authored-by: Edoardo Tenani <[email protected]>
Co-authored-by: Carson Ip <[email protected]>
  • Loading branch information
4 people authored Apr 17, 2024
1 parent 7484b71 commit 8fdf503
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 5 deletions.
14 changes: 14 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})"
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// tag::list[]
* <<apm-release-notes-8.14>>
* <<apm-release-notes-8.13>>
* <<apm-release-notes-8.12>>
* <<apm-release-notes-8.11>>
Expand All @@ -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[]
Expand Down
24 changes: 24 additions & 0 deletions changelogs/8.14.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[[apm-release-notes-8.14]]
== APM version 8.14
* <<apm-release-notes-8.14.0>>

[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]
4 changes: 1 addition & 3 deletions changelogs/head.asciidoc
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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]
2 changes: 1 addition & 1 deletion cmd/intake-receiver/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
package main

// version matches the APM Server's version
const version = "8.14.0"
const version = "8.15.0"
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
package version

// Version holds the APM Server version.
const Version = "8.14.0"
const Version = "8.15.0"

0 comments on commit 8fdf503

Please sign in to comment.