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

Commit

Permalink
[updatecli] update elastic stack version for testing 7.17.11-670b6a4a (
Browse files Browse the repository at this point in the history
…#3569)

* 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 "7.17.11-670b6a4a-SNAPSHOT" in file ".stack...

... -version"

Made with ❤️️ by updatecli

* chore: Updated to content "" in file "./internal/common/defaults.go"

Made with ❤️️ by updatecli

* chore: Updated to content "" in file ".ci/Jenkinsfile"

Made with ❤️️ by updatecli

* chore: Updated to content "" in file "./internal/config/kubernetes/ba...

... se/elasticsearch/deployment.yaml"

Updated to content "" in file "./internal/config/kubernetes/base/kibana/deployment.yaml"

Updated to content "" in file "./internal/config/kubernetes/base/fleet-server/deployment.yaml"

Made with ❤️️ by updatecli

---------

Co-authored-by: apmmachine <[email protected]>
  • Loading branch information
apmmachine and apmmachine authored Jul 3, 2023
1 parent 57173a8 commit fff4676
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/7.17.11-97b4b531-SNAPSHOT-linux-x86_64.tar.gz')
string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.11-97b4b531-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: '7.17.11-97b4b531-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/7.17.11-670b6a4a-SNAPSHOT-linux-x86_64.tar.gz')
string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.11-670b6a4a-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: '7.17.11-670b6a4a-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: ['TRACE', 'DEBUG', '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.11-97b4b531-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.')
string(name: 'STACK_VERSION', defaultValue: '7.17.11-670b6a4a-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.12.0', description: 'SemVer version of Kind to be used.')
Expand Down
2 changes: 1 addition & 1 deletion .stack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.17.11-97b4b531-SNAPSHOT
7.17.11-670b6a4a-SNAPSHOT
2 changes: 1 addition & 1 deletion internal/common/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const FleetProfileName = "fleet"
const FleetServerAgentServiceName = "fleet-server"

// BeatVersionBase is the base version of the Beat to use
var BeatVersionBase = "7.17.11-97b4b531-SNAPSHOT"
var BeatVersionBase = "7.17.11-670b6a4a-SNAPSHOT"

// BeatVersion is the version of the Beat to use
// It can be overriden by BEAT_VERSION env var
Expand Down
4 changes: 2 additions & 2 deletions internal/config/compose/profiles/fleet/docker-compose.yml
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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.11-670b6a4a-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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.11-670b6a4a-SNAPSHOT}"
platform: ${stackPlatform:-linux/amd64}
ports:
- "5601:5601"
Expand Down
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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.11-670b6a4a-SNAPSHOT}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.11-670b6a4a-SNAPSHOT}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.11-670b6a4a-SNAPSHOT}"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.11-670b6a4a-SNAPSHOT}"
platform: ${elasticsearchPlatform:-linux/amd64}
ports:
- "9200:9200"
Expand Down
2 changes: 1 addition & 1 deletion internal/config/compose/services/kibana/docker-compose.yml
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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.11-670b6a4a-SNAPSHOT}"
ports:
- "5601:5601"
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.11-97b4b531-SNAPSHOT}"
image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.11-670b6a4a-SNAPSHOT}"
labels:
co.elastic.logs/module: "${serviceName}"
platform: ${stackPlatform:-linux/amd64}
Expand Down
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.11-97b4b531-SNAPSHOT
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.11-670b6a4a-SNAPSHOT
envFrom:
- configMapRef:
name: elasticsearch-config
Expand Down
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.11-97b4b531-SNAPSHOT
image: docker.elastic.co/beats/elastic-agent:7.17.11-670b6a4a-SNAPSHOT
env:
- name: FLEET_SERVER_ENABLE
value: "1"
Expand Down
2 changes: 1 addition & 1 deletion internal/config/kubernetes/base/kibana/deployment.yaml
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.11-97b4b531-SNAPSHOT
image: docker.elastic.co/kibana/kibana:7.17.11-670b6a4a-SNAPSHOT
env:
- name: ELASTICSEARCH_URL
value: http://elasticsearch:9200
Expand Down

0 comments on commit fff4676

Please sign in to comment.