From 7cd8d1b26bedeeed9ba46bdf8b42b335f7f038e2 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 1 Sep 2023 12:06:40 +0200 Subject: [PATCH 1/5] buildkite: docker login (#11565) --- .buildkite/hooks/pre-command | 10 +++++++++- .buildkite/hooks/pre-exit | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 427b4a0f1ad..acb73845547 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -65,7 +65,7 @@ get_os_details() { } if command -v docker &>/dev/null; then - echo "--- Prepare docker context :docker:" + echo "--- Prepare Elastic docker context :docker:" DOCKER_REGISTRY_SECRET_PATH="secret/ci/elastic-apm-server/docker-elastic-observability" DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}") DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}") @@ -74,6 +74,14 @@ if command -v docker &>/dev/null; then unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET export DOCKER_REGISTRY_SECRET retry 4 docker pull --quiet docker.elastic.co/infra/release-manager:latest + + echo "--- Prepare dockerhub context :docker:" + DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/observability-ci/docker-hub-observability" + DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}") + DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}") + DOCKERHUB_REGISTRY_SECRET=$(retry 5 vault kv get -field registry "${DOCKER_REGISTRY_SECRET_PATH}") + docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKERHUB_REGISTRY_SECRET}" + unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET fi echo "--- Setting up the :golang: environment..." diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit index 8368ff3d62c..90e6efff6f2 100755 --- a/.buildkite/hooks/pre-exit +++ b/.buildkite/hooks/pre-exit @@ -9,4 +9,5 @@ unset VAULT_SECRET if command -v docker &>/dev/null; then docker logout $DOCKER_REGISTRY_SECRET + docker logout $DOCKERHUB_REGISTRY_SECRET fi From d44fc918a3235021e3b46d3b7a257465c02f2ff8 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:27:37 -0400 Subject: [PATCH 2/5] [updatecli] Bump elastic stack version to 8.11.0-8369a13a (#11570) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Updated to content "" in file "testing/infra/k8s/base/stack/el... ... asticsearch.yaml" Updated to content "" in file "testing/infra/k8s/base/stack/kibana.yaml" Updated to content "" in file "testing/infra/k8s/base/stack/apm-server.yaml" Made with ❤️️ by updatecli * chore: Updated to content "" in file "docker-compose.yml" Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- docker-compose.yml | 8 ++++---- 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, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5f8337e3ad9..8c0521e0e1a 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-1e5443be-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-8369a13a-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.11.0-1e5443be-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.11.0-8369a13a-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-1e5443be-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.11.0-8369a13a-SNAPSHOT ports: - 8220:8220 healthcheck: @@ -90,7 +90,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.11.0-1e5443be-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.11.0-8369a13a-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 0b6304a263b..b0c589036bc 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-1e5443be-SNAPSHOT + version: 8.11.0-8369a13a-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index a3b76341669..7643ec80703 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-1e5443be-SNAPSHOT + version: 8.11.0-8369a13a-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 bd2b27337a9..9556e8bbb26 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-1e5443be-SNAPSHOT + version: 8.11.0-8369a13a-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From e2c2ed056f3bfa2cd8b2c6a218fa700c34552cf4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:45:45 -0400 Subject: [PATCH 3/5] chore: ran shell command ".ci/scripts/update-beats.sh a6bae85b20b8" (#11572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index eb2fdfc14b1..90e1736c40b 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.20230830203348-eef9598ea110 +Version: v7.0.0-alpha2.0.20230831205938-a6bae85b20b8 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230830203348-eef9598ea110/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230831205938-a6bae85b20b8/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/go.mod b/go.mod index 9fc217ca3de..bbeda073952 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.20230830203348-eef9598ea110 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230831205938-a6bae85b20b8 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 d5db61e5c62..0b10959b22c 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.20230830203348-eef9598ea110 h1:oZRK/1iWvCm2G4tQVf7tX/g1GP7Ph7ucBGAud2Whjfc= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230830203348-eef9598ea110/go.mod h1:srIutI4lvWid1a/qf+YhpA2BLw4//CQAF7gT0lHjXvE= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230831205938-a6bae85b20b8 h1:VT+Fmy5y6uIG0C348A864rgUD4+4wkIUQQ6gNFATqKk= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230831205938-a6bae85b20b8/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= From 4e465fbac8dbb521b7406d63f327cb2faf42069d Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 4 Sep 2023 11:27:30 -0400 Subject: [PATCH 4/5] chore: ran shell command ".ci/scripts/update-beats.sh ab2f67d7ee4e" (#11577) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: apmmachine --- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 90e1736c40b..268f35b143f 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.20230831205938-a6bae85b20b8 +Version: v7.0.0-alpha2.0.20230904092252-ab2f67d7ee4e Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230831205938-a6bae85b20b8/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20230904092252-ab2f67d7ee4e/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/go.mod b/go.mod index bbeda073952..968b52a25bd 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.20230831205938-a6bae85b20b8 + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230904092252-ab2f67d7ee4e 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 0b10959b22c..bda5690e4f0 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.20230831205938-a6bae85b20b8 h1:VT+Fmy5y6uIG0C348A864rgUD4+4wkIUQQ6gNFATqKk= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230831205938-a6bae85b20b8/go.mod h1:srIutI4lvWid1a/qf+YhpA2BLw4//CQAF7gT0lHjXvE= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230904092252-ab2f67d7ee4e h1:OQz2igjUFzlJzDu+gZcky2A8k1x8YUOVmt+9SUH2t7M= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20230904092252-ab2f67d7ee4e/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= From 56f6fe2afd9b65d34014f45460025f2fe39523b4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 4 Sep 2023 11:48:01 -0400 Subject: [PATCH 5/5] [updatecli] Bump elastic stack version to 8.11.0-e6822a57 (#11576) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Updated to content "" in file "testing/infra/k8s/base/stack/ap... ... m-server.yaml" Updated to content "" in file "testing/infra/k8s/base/stack/elasticsearch.yaml" Updated to content "" in file "testing/infra/k8s/base/stack/kibana.yaml" Made with ❤️️ by updatecli * chore: Updated to content "" in file "docker-compose.yml" Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- docker-compose.yml | 8 ++++---- 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, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8c0521e0e1a..e66f9ac304f 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-8369a13a-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0-e6822a57-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.11.0-8369a13a-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.11.0-e6822a57-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-8369a13a-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.11.0-e6822a57-SNAPSHOT ports: - 8220:8220 healthcheck: @@ -90,7 +90,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.11.0-8369a13a-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.11.0-e6822a57-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 b0c589036bc..5f84823f3c3 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-8369a13a-SNAPSHOT + version: 8.11.0-e6822a57-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 7643ec80703..8b07b4fdfb3 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-8369a13a-SNAPSHOT + version: 8.11.0-e6822a57-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 9556e8bbb26..d91054282fd 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-8369a13a-SNAPSHOT + version: 8.11.0-e6822a57-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch