From 06778b3d0cacfdb40da6c780071cb5c9bad834e9 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 28 Feb 2022 01:13:17 -0500 Subject: [PATCH] bump stack version 7.17.1-952e96f1 (#2178) Co-authored-by: apmmachine --- .ci/Jenkinsfile | 4 ++-- .stack-version | 2 +- cli/config/compose/profiles/fleet/docker-compose.yml | 4 ++-- cli/config/compose/profiles/metricbeat/docker-compose.yml | 2 +- .../services/elastic-agent/fleet-server/docker-compose.yml | 2 +- internal/common/defaults.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index bf3edc7b3d..f3f0dd9d28 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -48,12 +48,12 @@ pipeline { 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/7.12.0-069dfaa4/downloads/beats/elastic-agent/elastic-agent-7.12.0-SNAPSHOT-linux-x86_64.tar.gz') - string(name: 'BEAT_VERSION', defaultValue: '7.17.1-598c7994-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: 'BEAT_VERSION', defaultValue: '7.17.1-952e96f1-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_STALE_VERSION', defaultValue: '7.16-SNAPSHOT', description: 'SemVer version of the stale stand-alone elastic-agent to be used for Fleet upgrade tests.') choice(name: 'LOG_LEVEL', choices: ['DEBUG', 'TRACE', 'INFO'], 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: '7.17.1-598c7994-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') + string(name: 'STACK_VERSION', defaultValue: '7.17.1-952e96f1-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') string(name: 'HELM_CHART_VERSION', defaultValue: '7.11.2', description: 'SemVer version of Helm chart to be used.') string(name: 'HELM_VERSION', defaultValue: '3.5.2', description: 'SemVer version of Helm to be used.') string(name: 'KIND_VERSION', defaultValue: '0.10.0', description: 'SemVer version of Kind to be used.') diff --git a/.stack-version b/.stack-version index aab6cf0596..bf7c4888fd 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -7.17.1-598c7994-SNAPSHOT +7.17.1-952e96f1-SNAPSHOT diff --git a/cli/config/compose/profiles/fleet/docker-compose.yml b/cli/config/compose/profiles/fleet/docker-compose.yml index 8e029c52ce..39d2099834 100644 --- a/cli/config/compose/profiles/fleet/docker-compose.yml +++ b/cli/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:-7.17.1-598c7994-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.1-952e96f1-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "9200:9200" @@ -34,7 +34,7 @@ services: test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null" retries: 600 interval: 1s - image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.1-598c7994-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.1-952e96f1-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "5601:5601" diff --git a/cli/config/compose/profiles/metricbeat/docker-compose.yml b/cli/config/compose/profiles/metricbeat/docker-compose.yml index c231e204c9..f6bc937fa1 100644 --- a/cli/config/compose/profiles/metricbeat/docker-compose.yml +++ b/cli/config/compose/profiles/metricbeat/docker-compose.yml @@ -9,7 +9,7 @@ services: - xpack.monitoring.collection.enabled=true - ELASTIC_USERNAME=elastic - ELASTIC_PASSWORD=changeme - image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.1-598c7994-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.1-952e96f1-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "9200:9200" diff --git a/cli/config/compose/services/elastic-agent/fleet-server/docker-compose.yml b/cli/config/compose/services/elastic-agent/fleet-server/docker-compose.yml index ba6cca3c2e..eca9a1550f 100644 --- a/cli/config/compose/services/elastic-agent/fleet-server/docker-compose.yml +++ b/cli/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:-7.17.1-598c7994-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.1-952e96f1-SNAPSHOT}" depends_on: elasticsearch: condition: service_healthy diff --git a/internal/common/defaults.go b/internal/common/defaults.go index e560868731..043200240e 100644 --- a/internal/common/defaults.go +++ b/internal/common/defaults.go @@ -36,7 +36,7 @@ const FleetServerAgentServiceName = "fleet-server" var AgentStaleVersion = "7.16-SNAPSHOT" // BeatVersionBase is the base version of the Beat to use -var BeatVersionBase = "7.17.1-598c7994-SNAPSHOT" +var BeatVersionBase = "7.17.1-952e96f1-SNAPSHOT" // BeatVersion is the version of the Beat to use // It can be overriden by BEAT_VERSION env var