Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

[updatecli] update elastic stack version for testing 7.17.22-13d5abd0 #3844

Closed
wants to merge 4 commits into from
Closed

[updatecli] update elastic stack version for testing 7.17.22-13d5abd0 #3844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4532a3d
chore: Update .stack-version
apmmachine May 21, 2024
699ba5c
chore: Update defaults.go
apmmachine May 21, 2024
37d24f0
chore: Update deployment.yml files
apmmachine May 21, 2024
12c24d3
chore: Update docker-compose.yml files
apmmachine May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .stack-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.17.20-23ae4de5-SNAPSHOT
7.17.22-13d5abd0-SNAPSHOT
2 changes: 1 addition & 1 deletion internal/common/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
const FleetServerAgentServiceName = "fleet-server"

// BeatVersionBase is the base version of the Beat to use
var BeatVersionBase = "7.17.20-23ae4de5-SNAPSHOT"
var BeatVersionBase = "7.17.22-13d5abd0-SNAPSHOT"

// BeatVersion is the version of the Beat to use
// It can be overriden by BEAT_VERSION env var
Expand Down Expand Up @@ -72,7 +72,7 @@
config.Init()

elasticAgentWorkingDir = filepath.Join(config.OpDir(), ElasticAgentServiceName)
io.MkdirAll(elasticAgentWorkingDir)

Check failure on line 75 in internal/common/defaults.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

Error return value of `io.MkdirAll` is not checked (errcheck)

DeveloperMode = shell.GetEnvBool("DEVELOPER_MODE")
if DeveloperMode {
Expand All @@ -98,7 +98,7 @@
p := filepath.Join(elements...)

// create dirs up to the last parent
io.MkdirAll(filepath.Dir(p))

Check failure on line 101 in internal/common/defaults.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

Error return value of `io.MkdirAll` is not checked (errcheck)

return p
}
Expand Down
4 changes: 2 additions & 2 deletions internal/config/compose/profiles/fleet/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.22-13d5abd0-SNAPSHOT}"
platform: ${stackPlatform:-linux/amd64}
ports:
- "9200:9200"
Expand All @@ -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.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.22-13d5abd0-SNAPSHOT}"
platform: ${stackPlatform:-linux/amd64}
ports:
- "5601:5601"
Expand Down
2 changes: 1 addition & 1 deletion internal/config/compose/services/elastic-agent/cloud/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.4'
services:
elastic-agent:
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.22-13d5abd0-SNAPSHOT}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion internal/config/compose/services/elastic-agent/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.4'
services:
elastic-agent:
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.22-13d5abd0-SNAPSHOT}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion internal/config/compose/services/elastic-agent/fleet-server/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.4'
services:
fleet-server:
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.22-13d5abd0-SNAPSHOT}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion internal/config/compose/services/elasticsearch/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- xpack.monitoring.collection.enabled=true
- ELASTIC_USERNAME=elastic
- ELASTIC_PASSWORD=changeme
image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.22-13d5abd0-SNAPSHOT}"
platform: ${elasticsearchPlatform:-linux/amd64}
ports:
- "9200:9200"
Expand Down
2 changes: 1 addition & 1 deletion internal/config/compose/services/kibana/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ services:
test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null"
retries: 600
interval: 1s
image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.22-13d5abd0-SNAPSHOT}"
ports:
- "5601:5601"
2 changes: 1 addition & 1 deletion internal/config/compose/services/metricbeat/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
]
environment:
- BEAT_STRICT_PERMS=${beatStricPerms:-false}
image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.20-23ae4de5-SNAPSHOT}"
image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.22-13d5abd0-SNAPSHOT}"
labels:
co.elastic.logs/module: "${serviceName}"
platform: ${stackPlatform:-linux/amd64}
Expand Down
2 changes: 1 addition & 1 deletion internal/config/kubernetes/base/elasticsearch/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: elasticsearch
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.20-23ae4de5-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22-13d5abd0-SNAPSHOT
envFrom:
- configMapRef:
name: elasticsearch-config
Expand Down
2 changes: 1 addition & 1 deletion internal/config/kubernetes/base/fleet-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: fleet-server
image: docker.elastic.co/beats/elastic-agent:7.17.20-23ae4de5-SNAPSHOT
image: docker.elastic.co/beats/elastic-agent:7.17.22-13d5abd0-SNAPSHOT
env:
- name: FLEET_SERVER_ENABLE
value: "1"
Expand Down
2 changes: 1 addition & 1 deletion internal/config/kubernetes/base/kibana/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: kibana
image: docker.elastic.co/kibana/kibana:7.17.20-23ae4de5-SNAPSHOT
image: docker.elastic.co/kibana/kibana:7.17.22-13d5abd0-SNAPSHOT
env:
- name: ELASTICSEARCH_URL
value: http://elasticsearch:9200
Expand Down
Loading