diff --git a/NOTICE.txt b/NOTICE.txt index 2b82e562f46..61971c24517 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20230905132607-3b02b8a82a5a +Version: v7.0.0-alpha2.0.20230906094532-4cf4292be494 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230905132607-3b02b8a82a5a/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230906094532-4cf4292be494/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of diff --git a/changelogs/8.9.asciidoc b/changelogs/8.9.asciidoc index 9cf4aa0e514..75af82371be 100644 --- a/changelogs/8.9.asciidoc +++ b/changelogs/8.9.asciidoc @@ -3,9 +3,20 @@ https://github.com/elastic/apm-server/compare/8.8\...8.9[View commits] +* <> * <> * <> +[float] +[[release-notes-8.9.2]] +=== APM version 8.9.2 + +https://github.com/elastic/apm-server/compare/v8.9.1\...v8.9.2[View commits] + +[float] +==== Bug fixes +- Add back handling of `queue.*` config for libbeat outputs, such as logstash and kafka {pull}11534[11534] + [float] [[release-notes-8.9.1]] === APM version 8.9.1 diff --git a/docker-compose.yml b/docker-compose.yml index e26392b9b76..e023cc8a88b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-32daf5de-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-d1486076-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.11.0-32daf5de-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.11.0-d1486076-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -61,7 +61,7 @@ services: logging: *default-logging fleet-server: - image: docker.elastic.co/beats/elastic-agent:8.11.0-32daf5de-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.11.0-d1486076-SNAPSHOT ports: - 8220:8220 healthcheck: @@ -90,7 +90,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.11.0-32daf5de-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.11.0-d1486076-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/go.mod b/go.mod index 626e7016671..676af4696fb 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20230815073233-455fb9f1280f - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230905132607-3b02b8a82a5a + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230906094532-4cf4292be494 github.com/elastic/elastic-agent-client/v7 v7.3.0 github.com/elastic/elastic-agent-libs v0.3.13 github.com/elastic/elastic-agent-system-metrics v0.6.1 diff --git a/go.sum b/go.sum index a3135f70417..1b34633a10b 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20230815073233-455fb9f1280f h1:xNu3G/+e2RnI2S7IL4rEg4/bzsDZP7FeNeGYUhn9foc= github.com/elastic/apm-data v0.1.1-0.20230815073233-455fb9f1280f/go.mod h1:lMTMoCWNadiDJih/tLechuMTtumEeedtKJlBOYAv030= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230905132607-3b02b8a82a5a h1:vWD5ltXDXos9lHhRQe8uchzj/4Ysq9KcAoxvSNUqNf0= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230905132607-3b02b8a82a5a/go.mod h1:srIutI4lvWid1a/qf+YhpA2BLw4//CQAF7gT0lHjXvE= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230906094532-4cf4292be494 h1:yWPIx2nkbtPAvKdrkhJZHH/i8b/ZGF5NA/jVsPeef/A= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230906094532-4cf4292be494/go.mod h1:srIutI4lvWid1a/qf+YhpA2BLw4//CQAF7gT0lHjXvE= github.com/elastic/elastic-agent-autodiscover v0.6.2 h1:7P3cbMBWXjbzA80rxitQjc+PiWyZ4I4F4LqrCYgYlNc= github.com/elastic/elastic-agent-client/v7 v7.3.0 h1:LugKtBXK7bp4SFL/uQqGU/f4Ppx12Jk5a36voGabLa0= github.com/elastic/elastic-agent-client/v7 v7.3.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0= diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 03465ee4521..028c522fe26 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.11.0-32daf5de-SNAPSHOT + version: 8.11.0-d1486076-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index a3ad8b58155..f3641ea143a 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.11.0-32daf5de-SNAPSHOT + version: 8.11.0-d1486076-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 05af25aa65e..a512b3e80a7 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.11.0-32daf5de-SNAPSHOT + version: 8.11.0-d1486076-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch