From 46a3a91936c284e2927157a6bf84c1332e267543 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:49:48 +0100 Subject: [PATCH 1/4] mergify: update backports for 9.0 (#15480) Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com> --- .mergify.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index e065690fe7..c9ebc111df 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -431,3 +431,17 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + - name: backport patches to 9.0 branch + conditions: + - merged + - base=main + - label=backport-9.0 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "9.0" + labels: + - "backport" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" From 711b3e6fdb069c6c07114e8fa84ef88c7de39a2f Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:39:51 +0000 Subject: [PATCH 2/4] docs: Update changelogs for 8.18 release (#15470) Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com> --- CHANGELOG.asciidoc | 3 ++- changelogs/8.18.asciidoc | 26 ++++++++++++++++++++++++++ changelogs/head.asciidoc | 8 +++----- 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 changelogs/8.18.asciidoc diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 16b1fc4198..ec361561c2 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,4 +1,5 @@ // tag::list[] +* <> * <> * <> * <> @@ -20,7 +21,7 @@ // end::list[] // tag::includes[] -include::./changelogs/head.asciidoc[] +include::./changelogs/8.18.asciidoc[] include::./changelogs/8.17.asciidoc[] include::./changelogs/8.16.asciidoc[] include::./changelogs/8.15.asciidoc[] diff --git a/changelogs/8.18.asciidoc b/changelogs/8.18.asciidoc new file mode 100644 index 0000000000..c10ec50a37 --- /dev/null +++ b/changelogs/8.18.asciidoc @@ -0,0 +1,26 @@ +[[apm-release-notes-8.18]] +== APM version 8.18 +* <> + +[float] +[[apm-release-notes-8.18.0]] +=== APM version 8.18.0 + +https://github.com/elastic/apm-server/compare/v8.17.1\...v8.18.0[View commits] + +[float] +==== Bug fixes +- Fix overflow in validation of `apm-server.agent.config.cache.expiration` on 32-bit architectures {pull}15216[15216] + +[float] +==== Breaking Changes + +[float] +==== Deprecations + +[float] +==== Intake API Changes + +[float] +==== Added +- Tail-based sampling: Storage layer is rewritten to use Pebble database instead of BadgerDB. The new implementation offers a substantial throughput increase while consuming significantly less memory. Disk usage is lower and more stable. See PR for benchmark details. {pull}15235[15235] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 46aa533582..63d9b46cf3 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -1,14 +1,13 @@ [[release-notes-head]] == APM version HEAD -https://github.com/elastic/apm-server/compare/8.16\...8.x[View commits] +https://github.com/elastic/apm-server/compare/8.18\...8.x[View commits] [float] -==== Bug fixes -- Fix overflow in validation of `apm-server.agent.config.cache.expiration` on 32-bit architectures {pull}15216[15216] +==== Breaking Changes [float] -==== Breaking Changes +==== Bug fixes [float] ==== Deprecations @@ -18,4 +17,3 @@ https://github.com/elastic/apm-server/compare/8.16\...8.x[View commits] [float] ==== Added -- Tail-based sampling: Storage layer is rewritten to use Pebble database instead of BadgerDB. The new implementation offers a substantial throughput increase while consuming significantly less memory. Disk usage is lower and more stable. See PR for benchmark details. {pull}15235[15235] From 0315dfb83d5a0b395f2bc8db6bb79e23e3bcdee1 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:28:53 +0000 Subject: [PATCH 3/4] [updatecli] Bump elastic stack version to 9.0.0-80928867 (#15472) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update k8s stack yaml files Made with ❤️️ by updatecli * chore: Update docker-compose.yml Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 6 +++--- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f8c2eb1395..bdcae7433a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ x-logging: &default-logging services: elasticsearch: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-faf48818-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0-80928867-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -43,7 +43,7 @@ services: kibana: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/kibana/kibana:9.0.0-faf48818-SNAPSHOT + image: docker.elastic.co/kibana/kibana:9.0.0-80928867-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -63,7 +63,7 @@ services: metricbeat: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - image: docker.elastic.co/beats/metricbeat:9.0.0-faf48818-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:9.0.0-80928867-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 82fd4ea990..d4c0b458a0 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -4,7 +4,7 @@ metadata: name: apm-server spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-faf48818-SNAPSHOT + version: 9.0.0-80928867-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 6041e6acc2..3ddb3fa2a5 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -4,7 +4,7 @@ metadata: name: elasticsearch spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-faf48818-SNAPSHOT + version: 9.0.0-80928867-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index ca18661ffb..6884fbada9 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -4,7 +4,7 @@ metadata: name: kibana spec: # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT - version: 9.0.0-faf48818-SNAPSHOT + version: 9.0.0-80928867-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 9d109a5ae2b7d1b3535a37aaf6b77bf5e5bd7db5 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 30 Jan 2025 18:43:06 +0100 Subject: [PATCH 4/4] mergify: remove backport-8.x enforcement (#15485) --- .mergify.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index c9ebc111df..ecdadb993c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -174,20 +174,9 @@ pull_request_rules: branches, such as: * `backport-7.17` is the label to automatically backport to the 7.17 branch. * `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit. + * `backport-9./d` is the label to automatically backport to the `9./d` branch. `/d` is the digit. * `backport-8.x` is the label to automatically backport to the `8.x` branch. - - name: add backport-8.x for the all the PRs targeting main if no skipped or assigned already - conditions: - - -label~=^(backport-skip|backport-8.x)$ - - base=main - actions: - comment: - message: | - `backport-8.x` has been added to help with the transition to the new branch `8.x`. - If you don't need it please use `backport-skip` label. - label: - add: - - backport-8.x - name: remove backport-skip label conditions: - label~=^backport-\d