From fe509ba2cd54aa9127c9e25919d453e26503b014 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 16 Jun 2023 12:11:59 -0400 Subject: [PATCH] [updatecli] update elastic stack version for testing 8.9.0-473a43eb (#3553) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Updated to content "" in file ".ci/Jenkinsfile" Made with ❤️️ by updatecli * chore: Updated to content "" in file "./internal/config/kubernetes/ba... ... se/kibana/deployment.yaml" Updated to content "" in file "./internal/config/kubernetes/base/fleet-server/deployment.yaml" Updated to content "" in file "./internal/config/kubernetes/base/elasticsearch/deployment.yaml" Made with ❤️️ by updatecli * chore: Updated to content "" in file "./internal/config/compose/profi... ... les/fleet/docker-compose.yml" Updated to content "" in file "./internal/config/compose/services/elastic-agent/cloud/docker-compose.yml" Updated to content "" in file "./internal/config/compose/services/elastic-agent/docker-compose.yml" Updated to content "" in file "./internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml" Updated to content "" in file "./internal/config/compose/services/elasticsearch/docker-compose.yml" Updated to content "" in file "./internal/config/compose/services/kibana/docker-compose.yml" Updated to content "" in file "./internal/config/compose/services/metricbeat/docker-compose.yml" Made with ❤️️ by updatecli * chore: Updated to content "8.9.0-473a43eb-SNAPSHOT" in file ".stack-v... ... ersion" Made with ❤️️ by updatecli * chore: Updated to content "" in file "./internal/common/defaults.go" Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine --- .ci/Jenkinsfile | 8 ++++---- .stack-version | 2 +- internal/common/defaults.go | 2 +- internal/config/compose/profiles/fleet/docker-compose.yml | 4 ++-- .../services/elastic-agent/cloud/docker-compose.yml | 2 +- .../compose/services/elastic-agent/docker-compose.yml | 2 +- .../elastic-agent/fleet-server/docker-compose.yml | 2 +- .../compose/services/elasticsearch/docker-compose.yml | 2 +- .../config/compose/services/kibana/docker-compose.yml | 2 +- .../config/compose/services/metricbeat/docker-compose.yml | 2 +- .../config/kubernetes/base/elasticsearch/deployment.yaml | 2 +- .../config/kubernetes/base/fleet-server/deployment.yaml | 2 +- internal/config/kubernetes/base/kibana/deployment.yaml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index d70dad09fc..a996a7ee8b 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -54,13 +54,13 @@ pipeline { booleanParam(name: "forceSkipGitChecks", defaultValue: false, description: "If it's needed to check for Git changes to filter by modified sources") booleanParam(name: "notifyOnGreenBuilds", defaultValue: false, description: "If it's needed to notify to Slack with green builds.") string(name: 'SLACK_CHANNEL', defaultValue: 'observablt-bots', description: 'The Slack channel(s) where errors will be posted. For multiple channels, use a comma-separated list of channels') - string(name: 'ELASTIC_AGENT_DOWNLOAD_URL', defaultValue: '', description: 'If present, it will override the download URL for the Elastic agent artifact. (I.e. https://snapshots.elastic.co/8.9.0-fefa3eb8-SNAPSHOT-linux-x86_64.tar.gz') - string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '8.9.0-fefa3eb8-SNAPSHOT', description: 'SemVer version of the Elastic Agent to be used for the tests. You can use here the tag of your PR to test your changes') - string(name: 'BEAT_VERSION', defaultValue: '8.9.0-fefa3eb8-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes') + string(name: 'ELASTIC_AGENT_DOWNLOAD_URL', defaultValue: '', description: 'If present, it will override the download URL for the Elastic agent artifact. (I.e. https://snapshots.elastic.co/8.9.0-473a43eb-SNAPSHOT-linux-x86_64.tar.gz') + string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '8.9.0-473a43eb-SNAPSHOT', description: 'SemVer version of the Elastic Agent to be used for the tests. You can use here the tag of your PR to test your changes') + string(name: 'BEAT_VERSION', defaultValue: '8.9.0-473a43eb-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes') choice(name: 'LOG_LEVEL', choices: ['INFO', 'DEBUG', 'TRACE'], description: 'Log level to be used') choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies') string(name: 'KIBANA_VERSION', defaultValue: '', description: 'Docker tag of the kibana to be used for the tests. It will refer to an image related to a Kibana PR, under the Observability-CI namespace') - string(name: 'STACK_VERSION', defaultValue: '8.9.0-fefa3eb8-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') + string(name: 'STACK_VERSION', defaultValue: '8.9.0-473a43eb-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') string(name: 'HELM_CHART_VERSION', defaultValue: '7.17.3', description: 'SemVer version of Helm chart to be used.') string(name: 'HELM_VERSION', defaultValue: '3.9.0', description: 'SemVer version of Helm to be used.') string(name: 'KIND_VERSION', defaultValue: '0.17.0', description: 'SemVer version of Kind to be used.') diff --git a/.stack-version b/.stack-version index 2dd11d2634..2403ddd309 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -8.9.0-fefa3eb8-SNAPSHOT \ No newline at end of file +8.9.0-473a43eb-SNAPSHOT \ No newline at end of file diff --git a/internal/common/defaults.go b/internal/common/defaults.go index 62f645bb81..c0e20cc3d3 100644 --- a/internal/common/defaults.go +++ b/internal/common/defaults.go @@ -36,7 +36,7 @@ const FleetProfileName = "fleet" const FleetServerAgentServiceName = "fleet-server" // BeatVersionBase is the base version of the Beat to use -var BeatVersionBase = "8.9.0-fefa3eb8-SNAPSHOT" +var BeatVersionBase = "8.9.0-473a43eb-SNAPSHOT" // BeatVersion is the version of the Beat to use // It can be overriden by BEAT_VERSION env var diff --git a/internal/config/compose/profiles/fleet/docker-compose.yml b/internal/config/compose/profiles/fleet/docker-compose.yml index f1dea366bd..27f77836e2 100644 --- a/internal/config/compose/profiles/fleet/docker-compose.yml +++ b/internal/config/compose/profiles/fleet/docker-compose.yml @@ -18,7 +18,7 @@ services: - xpack.security.authc.token.timeout=60m - ELASTIC_USERNAME=admin - ELASTIC_PASSWORD=changeme - image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.9.0-473a43eb-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "9200:9200" @@ -34,7 +34,7 @@ services: test: ["CMD-SHELL", "curl -u admin:changeme -s http://localhost:5601/api/status | grep -q 'All services are available'"] retries: 60 interval: 10s - image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.9.0-473a43eb-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "5601:5601" diff --git a/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml b/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml index 7f0fab982a..b9f74d292c 100644 --- a/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml +++ b/internal/config/compose/services/elastic-agent/cloud/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.4' services: elastic-agent: - image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.9.0-473a43eb-SNAPSHOT}" depends_on: elasticsearch: condition: service_healthy diff --git a/internal/config/compose/services/elastic-agent/docker-compose.yml b/internal/config/compose/services/elastic-agent/docker-compose.yml index d9aed91b6a..91d6bcf695 100644 --- a/internal/config/compose/services/elastic-agent/docker-compose.yml +++ b/internal/config/compose/services/elastic-agent/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.4' services: elastic-agent: - image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.9.0-473a43eb-SNAPSHOT}" depends_on: elasticsearch: condition: service_healthy diff --git a/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml b/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml index 119940334f..da97aba0f6 100644 --- a/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml +++ b/internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml @@ -1,7 +1,7 @@ version: '2.4' services: fleet-server: - image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.9.0-473a43eb-SNAPSHOT}" depends_on: elasticsearch: condition: service_healthy diff --git a/internal/config/compose/services/elasticsearch/docker-compose.yml b/internal/config/compose/services/elasticsearch/docker-compose.yml index e3c4903288..11d52c9a44 100644 --- a/internal/config/compose/services/elasticsearch/docker-compose.yml +++ b/internal/config/compose/services/elasticsearch/docker-compose.yml @@ -9,7 +9,7 @@ services: - xpack.monitoring.collection.enabled=true - ELASTIC_USERNAME=elastic - ELASTIC_PASSWORD=changeme - image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-8.9.0-473a43eb-SNAPSHOT}" healthcheck: interval: 10s retries: 100 diff --git a/internal/config/compose/services/kibana/docker-compose.yml b/internal/config/compose/services/kibana/docker-compose.yml index d0a0cb65da..2ffc184541 100644 --- a/internal/config/compose/services/kibana/docker-compose.yml +++ b/internal/config/compose/services/kibana/docker-compose.yml @@ -9,6 +9,6 @@ services: test: ["CMD-SHELL", "curl -u admin:changeme -s http://localhost:5601/api/status | grep -q 'All services are available'"] retries: 60 interval: 10s - image: "docker.elastic.co/kibana/kibana:${kibanaTag:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/kibana/kibana:${kibanaTag:-8.9.0-473a43eb-SNAPSHOT}" ports: - "5601:5601" diff --git a/internal/config/compose/services/metricbeat/docker-compose.yml b/internal/config/compose/services/metricbeat/docker-compose.yml index 110721c310..00a5831f42 100644 --- a/internal/config/compose/services/metricbeat/docker-compose.yml +++ b/internal/config/compose/services/metricbeat/docker-compose.yml @@ -14,7 +14,7 @@ services: ] environment: - BEAT_STRICT_PERMS=${beatStricPerms:-false} - image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-8.9.0-fefa3eb8-SNAPSHOT}" + image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-8.9.0-473a43eb-SNAPSHOT}" labels: co.elastic.logs/module: "${serviceName}" platform: ${stackPlatform:-linux/amd64} diff --git a/internal/config/kubernetes/base/elasticsearch/deployment.yaml b/internal/config/kubernetes/base/elasticsearch/deployment.yaml index e27d6e9dc0..8d5e7fe021 100644 --- a/internal/config/kubernetes/base/elasticsearch/deployment.yaml +++ b/internal/config/kubernetes/base/elasticsearch/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: elasticsearch - image: docker.elastic.co/elasticsearch/elasticsearch:8.9.0-fefa3eb8-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.9.0-473a43eb-SNAPSHOT envFrom: - configMapRef: name: elasticsearch-config diff --git a/internal/config/kubernetes/base/fleet-server/deployment.yaml b/internal/config/kubernetes/base/fleet-server/deployment.yaml index 8b7fe9c7ca..cad5f7046f 100644 --- a/internal/config/kubernetes/base/fleet-server/deployment.yaml +++ b/internal/config/kubernetes/base/fleet-server/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: fleet-server - image: docker.elastic.co/beats/elastic-agent:8.9.0-fefa3eb8-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.9.0-473a43eb-SNAPSHOT env: - name: FLEET_SERVER_ENABLE value: "1" diff --git a/internal/config/kubernetes/base/kibana/deployment.yaml b/internal/config/kubernetes/base/kibana/deployment.yaml index 43b3f162a4..c494de2b40 100644 --- a/internal/config/kubernetes/base/kibana/deployment.yaml +++ b/internal/config/kubernetes/base/kibana/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: kibana - image: docker.elastic.co/kibana/kibana:8.9.0-fefa3eb8-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.9.0-473a43eb-SNAPSHOT env: - name: ELASTICSEARCH_URL value: http://elasticsearch:9200