Merge branch 'main' into middleware-otel-metrics

elastic · Sep 5, 2023 · b4f8db1 · b4f8db1
2 parents 0e36ccc + 56f6fe2
commit b4f8db1
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git 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
@@ -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
diff --git 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.20230904092252-ab2f67d7ee4e
 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.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/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-e6822a57-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-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-1e5443be-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-1e5443be-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/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.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
@@ -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.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=

diff --git 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-e6822a57-SNAPSHOT
   count: 1
   http:
     tls:

diff --git 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-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
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
   name: kibana
 spec:
-  version: 8.11.0-1e5443be-SNAPSHOT
+  version: 8.11.0-e6822a57-SNAPSHOT
   count: 1
   elasticsearchRef:
     name: elasticsearch