From 2f6bb48fe71c6a6af6e4ff03fe271765721d3019 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Mon, 1 Apr 2024 07:11:42 -0400 Subject: [PATCH] [updatecli] update elastic stack version for testing 8.14.0-cca51f6c (#3800) --- .stack-version | 2 +- internal/common/defaults.go | 2 +- internal/config/compose/profiles/fleet/docker-compose.yml | 4 ++-- .../compose/services/elastic-agent/cloud/docker-compose.yml | 2 +- .../config/compose/services/elastic-agent/docker-compose.yml | 2 +- .../services/elastic-agent/fleet-server/docker-compose.yml | 2 +- .../config/compose/services/elasticsearch/docker-compose.yml | 2 +- internal/config/compose/services/kibana/docker-compose.yml | 2 +- .../config/compose/services/metricbeat/docker-compose.yml | 2 +- internal/config/kubernetes/base/elasticsearch/deployment.yaml | 2 +- internal/config/kubernetes/base/fleet-server/deployment.yaml | 2 +- internal/config/kubernetes/base/kibana/deployment.yaml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.stack-version b/.stack-version index 2403ddd309..002fbf2b83 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -8.9.0-473a43eb-SNAPSHOT \ No newline at end of file +8.14.0-cca51f6c-SNAPSHOT \ No newline at end of file diff --git a/internal/common/defaults.go b/internal/common/defaults.go index c0e20cc3d3..95466407e4 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-473a43eb-SNAPSHOT" +var BeatVersionBase = "8.14.0-cca51f6c-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 27f77836e2..e7fd5a7645 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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.14.0-cca51f6c-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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.14.0-cca51f6c-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 b9f74d292c..8bcb32c695 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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.14.0-cca51f6c-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 91d6bcf695..930176031e 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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.14.0-cca51f6c-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 da97aba0f6..39f93c38c9 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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.14.0-cca51f6c-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 11d52c9a44..02761189a1 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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-8.14.0-cca51f6c-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 2ffc184541..f3059f18a6 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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/kibana/kibana:${kibanaTag:-8.14.0-cca51f6c-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 00a5831f42..0a325d5473 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-473a43eb-SNAPSHOT}" + image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-8.14.0-cca51f6c-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 8d5e7fe021..57f4cda2a5 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-473a43eb-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.14.0-cca51f6c-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 cad5f7046f..588ea7a4bf 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-473a43eb-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.14.0-cca51f6c-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 c494de2b40..a392f22ffd 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-473a43eb-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.14.0-cca51f6c-SNAPSHOT env: - name: ELASTICSEARCH_URL value: http://elasticsearch:9200