From 1c0e7c6a5d6d912fc13ba366233401e687ce07cd Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 31 Jul 2023 15:02:12 +0000 Subject: [PATCH 01/22] chore: Updated to content "" in file ".ci/e2eTestingMacosDaily.groovy" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .ci/e2eTestingMacosDaily.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/e2eTestingMacosDaily.groovy b/.ci/e2eTestingMacosDaily.groovy index 35fb4c2b6d..8168205f1d 100644 --- a/.ci/e2eTestingMacosDaily.groovy +++ b/.ci/e2eTestingMacosDaily.groovy @@ -32,9 +32,9 @@ pipeline { quietPeriod(10) } parameters { - string(name: 'ELASTIC_AGENT_VERSION', defaultValue: "7.17.11-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: 'ELASTIC_STACK_VERSION', defaultValue: "7.17.11-SNAPSHOT", description: 'SemVer version of the stack to be used for the tests.') - string(name: 'BEAT_VERSION', defaultValue: "7.17.11-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_VERSION', defaultValue: "7.17.12-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: 'ELASTIC_STACK_VERSION', defaultValue: "7.17.12-SNAPSHOT", description: 'SemVer version of the stack to be used for the tests.') + string(name: 'BEAT_VERSION', defaultValue: "7.17.12-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') } From 04fb73b8ed853f4675e33322b540c5d6d6bf061b Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 31 Jul 2023 15:02:16 +0000 Subject: [PATCH 02/22] chore: Updated to content "" in file ".ci/Jenkinsfile" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .ci/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 6be4e21b46..440ca55f50 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/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') + 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.12-7c1d40f1-SNAPSHOT-linux-x86_64.tar.gz') + string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.12-7c1d40f1-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.12-7c1d40f1-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-670b6a4a-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') + string(name: 'STACK_VERSION', defaultValue: '7.17.12-7c1d40f1-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.') From 0e7cd6b18fc414c37efbc4557fc8d1de12acfdbb Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 31 Jul 2023 15:02:19 +0000 Subject: [PATCH 03/22] chore: Updated to content "" in file "./internal/config/kubernetes/ba... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... se/fleet-server/deployment.yaml" Updated to content "" in file "./internal/config/kubernetes/base/elasticsearch/deployment.yaml" Updated to content "" in file "./internal/config/kubernetes/base/kibana/deployment.yaml" Made with ❤️️ by updatecli --- 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 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/kubernetes/base/elasticsearch/deployment.yaml b/internal/config/kubernetes/base/elasticsearch/deployment.yaml index 38af3d182b..cfaf2827dd 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:7.17.11-670b6a4a-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.12-7c1d40f1-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 073655ab4f..c5a89aef91 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:7.17.11-670b6a4a-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:7.17.12-7c1d40f1-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 c0d85e213f..d52e7f2fa5 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:7.17.11-670b6a4a-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.17.12-7c1d40f1-SNAPSHOT env: - name: ELASTICSEARCH_URL value: http://elasticsearch:9200 From f1f9347436e26f11d3100aace58e9174655bfe89 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 31 Jul 2023 15:02:22 +0000 Subject: [PATCH 04/22] chore: Updated to content "" in file "./internal/config/compose/profi... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... 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 --- 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 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/config/compose/profiles/fleet/docker-compose.yml b/internal/config/compose/profiles/fleet/docker-compose.yml index 59d624d853..75d413798a 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:-7.17.11-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.12-7c1d40f1-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.11-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.12-7c1d40f1-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 4591f5ef1f..91ad6442ed 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:-7.17.11-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.12-7c1d40f1-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 ef3a5d890f..c4cd779830 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:-7.17.11-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.12-7c1d40f1-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 d0eac804aa..c561f14bd4 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:-7.17.11-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.12-7c1d40f1-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 8034cd0ffc..8b2d4fcc60 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:-7.17.11-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.12-7c1d40f1-SNAPSHOT}" platform: ${elasticsearchPlatform:-linux/amd64} ports: - "9200:9200" diff --git a/internal/config/compose/services/kibana/docker-compose.yml b/internal/config/compose/services/kibana/docker-compose.yml index 5d746e4b4c..57b9f54e47 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: "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-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.12-7c1d40f1-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 ccdb7fe9e2..21cfc13761 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:-7.17.11-670b6a4a-SNAPSHOT}" + image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.12-7c1d40f1-SNAPSHOT}" labels: co.elastic.logs/module: "${serviceName}" platform: ${stackPlatform:-linux/amd64} From 25e27c708fc92b6059bc5a6bbc1a093a02d25214 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 31 Jul 2023 15:02:25 +0000 Subject: [PATCH 05/22] chore: Updated to content "7.17.12-7c1d40f1-SNAPSHOT" in file ".stack... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... -version" Made with ❤️️ by updatecli --- .stack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stack-version b/.stack-version index a799bafa6e..d08bf18abd 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -7.17.11-670b6a4a-SNAPSHOT \ No newline at end of file +7.17.12-7c1d40f1-SNAPSHOT \ No newline at end of file From 23f5355b2e9dee3c8196c8811e9b8e2738d70989 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 31 Jul 2023 15:02:28 +0000 Subject: [PATCH 06/22] chore: Updated to content "" in file "./internal/common/defaults.go" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- internal/common/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/common/defaults.go b/internal/common/defaults.go index eb72a442f0..b359afc8b8 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 = "7.17.11-670b6a4a-SNAPSHOT" +var BeatVersionBase = "7.17.12-7c1d40f1-SNAPSHOT" // BeatVersion is the version of the Beat to use // It can be overriden by BEAT_VERSION env var From 5ff7146aa15568f03cca2e90231bd265a9d4a4bd Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 1 Aug 2023 15:02:08 +0000 Subject: [PATCH 07/22] chore: Updated to content "" in file ".ci/e2eTestingMacosDaily.groovy" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .ci/e2eTestingMacosDaily.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/e2eTestingMacosDaily.groovy b/.ci/e2eTestingMacosDaily.groovy index 8168205f1d..b60bbabede 100644 --- a/.ci/e2eTestingMacosDaily.groovy +++ b/.ci/e2eTestingMacosDaily.groovy @@ -32,9 +32,9 @@ pipeline { quietPeriod(10) } parameters { - string(name: 'ELASTIC_AGENT_VERSION', defaultValue: "7.17.12-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: 'ELASTIC_STACK_VERSION', defaultValue: "7.17.12-SNAPSHOT", description: 'SemVer version of the stack to be used for the tests.') - string(name: 'BEAT_VERSION', defaultValue: "7.17.12-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_VERSION', defaultValue: "7.17.13-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: 'ELASTIC_STACK_VERSION', defaultValue: "7.17.13-SNAPSHOT", description: 'SemVer version of the stack to be used for the tests.') + string(name: 'BEAT_VERSION', defaultValue: "7.17.13-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') } From a1fd5bb343e22193dfae82d644876a812d2e9bd9 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 1 Aug 2023 15:02:14 +0000 Subject: [PATCH 08/22] chore: Updated to content "" in file ".ci/Jenkinsfile" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .ci/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 440ca55f50..0828c632d8 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/7.17.12-7c1d40f1-SNAPSHOT-linux-x86_64.tar.gz') - string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.12-7c1d40f1-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.12-7c1d40f1-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.13-19dc27d2-SNAPSHOT-linux-x86_64.tar.gz') + string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.13-19dc27d2-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.13-19dc27d2-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.12-7c1d40f1-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') + string(name: 'STACK_VERSION', defaultValue: '7.17.13-19dc27d2-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.') From c6afdc927a82470c96c2864437f981bc57289f63 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 1 Aug 2023 15:02:18 +0000 Subject: [PATCH 09/22] chore: Updated to content "" in file "./internal/config/kubernetes/ba... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... 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 --- 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 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/kubernetes/base/elasticsearch/deployment.yaml b/internal/config/kubernetes/base/elasticsearch/deployment.yaml index cfaf2827dd..22da34e206 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:7.17.12-7c1d40f1-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13-19dc27d2-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 c5a89aef91..4d45967b11 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:7.17.12-7c1d40f1-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:7.17.13-19dc27d2-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 d52e7f2fa5..a5f19976ca 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:7.17.12-7c1d40f1-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.17.13-19dc27d2-SNAPSHOT env: - name: ELASTICSEARCH_URL value: http://elasticsearch:9200 From 7b75e5fc796add4bd0193b46f9451d94b2cd9ec8 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 1 Aug 2023 15:02:24 +0000 Subject: [PATCH 10/22] chore: Updated to content "" in file "./internal/config/compose/profi... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... 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 --- 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 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/config/compose/profiles/fleet/docker-compose.yml b/internal/config/compose/profiles/fleet/docker-compose.yml index 75d413798a..752bc01074 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:-7.17.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.13-19dc27d2-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.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.13-19dc27d2-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 91ad6442ed..f03cb86637 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:-7.17.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-19dc27d2-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 c4cd779830..5db207dd34 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:-7.17.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-19dc27d2-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 c561f14bd4..309790d519 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:-7.17.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-19dc27d2-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 8b2d4fcc60..a0ec348da5 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:-7.17.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.13-19dc27d2-SNAPSHOT}" platform: ${elasticsearchPlatform:-linux/amd64} ports: - "9200:9200" diff --git a/internal/config/compose/services/kibana/docker-compose.yml b/internal/config/compose/services/kibana/docker-compose.yml index 57b9f54e47..2461b4505d 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: "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.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.13-19dc27d2-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 21cfc13761..9e9e37b807 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:-7.17.12-7c1d40f1-SNAPSHOT}" + image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.13-19dc27d2-SNAPSHOT}" labels: co.elastic.logs/module: "${serviceName}" platform: ${stackPlatform:-linux/amd64} From 8e24dbe96176efc2e4c97a3b5df3ee59efcf393f Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 1 Aug 2023 15:02:28 +0000 Subject: [PATCH 11/22] chore: Updated to content "7.17.13-19dc27d2-SNAPSHOT" in file ".stack... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... -version" Made with ❤️️ by updatecli --- .stack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stack-version b/.stack-version index d08bf18abd..ffd04c38f4 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -7.17.12-7c1d40f1-SNAPSHOT \ No newline at end of file +7.17.13-19dc27d2-SNAPSHOT \ No newline at end of file From 7b6fed95a85da3b9c2805f1606617d7ec74f26cd Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 1 Aug 2023 15:02:32 +0000 Subject: [PATCH 12/22] chore: Updated to content "" in file "./internal/common/defaults.go" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- internal/common/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/common/defaults.go b/internal/common/defaults.go index b359afc8b8..a41244cac0 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 = "7.17.12-7c1d40f1-SNAPSHOT" +var BeatVersionBase = "7.17.13-19dc27d2-SNAPSHOT" // BeatVersion is the version of the Beat to use // It can be overriden by BEAT_VERSION env var From 99d61552056e0d15b976e0fb2704525bfe9110ca Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 2 Aug 2023 15:01:56 +0000 Subject: [PATCH 13/22] chore: Updated to content "7.17.13-7f46ddb9-SNAPSHOT" in file ".stack... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... -version" Made with ❤️️ by updatecli --- .stack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stack-version b/.stack-version index ffd04c38f4..61734fbcdb 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -7.17.13-19dc27d2-SNAPSHOT \ No newline at end of file +7.17.13-7f46ddb9-SNAPSHOT \ No newline at end of file From 0ccce00316267a1944af96b626df72b09eb9c857 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 2 Aug 2023 15:02:05 +0000 Subject: [PATCH 14/22] chore: Updated to content "" in file "./internal/common/defaults.go" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- internal/common/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/common/defaults.go b/internal/common/defaults.go index a41244cac0..8d89d21be8 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 = "7.17.13-19dc27d2-SNAPSHOT" +var BeatVersionBase = "7.17.13-7f46ddb9-SNAPSHOT" // BeatVersion is the version of the Beat to use // It can be overriden by BEAT_VERSION env var From bb795688e0109e9515c6701d097433d358cc95ac Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 2 Aug 2023 15:02:10 +0000 Subject: [PATCH 15/22] chore: Updated to content "" in file ".ci/Jenkinsfile" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .ci/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 0828c632d8..f63d7ac1b3 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/7.17.13-19dc27d2-SNAPSHOT-linux-x86_64.tar.gz') - string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.13-19dc27d2-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.13-19dc27d2-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.13-7f46ddb9-SNAPSHOT-linux-x86_64.tar.gz') + string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.13-7f46ddb9-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.13-7f46ddb9-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.13-19dc27d2-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') + string(name: 'STACK_VERSION', defaultValue: '7.17.13-7f46ddb9-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.') From 0bf3bfed83698a59ace105b5f087916c4f903b20 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 2 Aug 2023 15:02:19 +0000 Subject: [PATCH 16/22] chore: Updated to content "" in file "./internal/config/kubernetes/ba... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... 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 --- 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 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/kubernetes/base/elasticsearch/deployment.yaml b/internal/config/kubernetes/base/elasticsearch/deployment.yaml index 22da34e206..74bccab05b 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:7.17.13-19dc27d2-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13-7f46ddb9-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 4d45967b11..2d6abf7860 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:7.17.13-19dc27d2-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:7.17.13-7f46ddb9-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 a5f19976ca..26fd58e2d6 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:7.17.13-19dc27d2-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.17.13-7f46ddb9-SNAPSHOT env: - name: ELASTICSEARCH_URL value: http://elasticsearch:9200 From 12a4bcc46a56966e265fe6f2a11721b3b8d00699 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 2 Aug 2023 15:02:23 +0000 Subject: [PATCH 17/22] chore: Updated to content "" in file "./internal/config/compose/servi... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... ces/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" Updated to content "" in file "./internal/config/compose/profiles/fleet/docker-compose.yml" Made with ❤️️ by updatecli --- 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 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/config/compose/profiles/fleet/docker-compose.yml b/internal/config/compose/profiles/fleet/docker-compose.yml index 752bc01074..ebbee8009b 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:-7.17.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.13-7f46ddb9-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.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.13-7f46ddb9-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 f03cb86637..706b63420c 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:-7.17.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-7f46ddb9-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 5db207dd34..789eb32f9c 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:-7.17.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-7f46ddb9-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 309790d519..f0c0499dde 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:-7.17.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-7f46ddb9-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 a0ec348da5..af2f0b2e40 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:-7.17.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.13-7f46ddb9-SNAPSHOT}" platform: ${elasticsearchPlatform:-linux/amd64} ports: - "9200:9200" diff --git a/internal/config/compose/services/kibana/docker-compose.yml b/internal/config/compose/services/kibana/docker-compose.yml index 2461b4505d..a59e64df43 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: "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.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.13-7f46ddb9-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 9e9e37b807..1f7e81166c 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:-7.17.13-19dc27d2-SNAPSHOT}" + image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.13-7f46ddb9-SNAPSHOT}" labels: co.elastic.logs/module: "${serviceName}" platform: ${stackPlatform:-linux/amd64} From a527fd2cb97666ff88740925ac2c8a6ec3069d78 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Thu, 3 Aug 2023 15:01:57 +0000 Subject: [PATCH 18/22] chore: Updated to content "" in file ".ci/Jenkinsfile" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .ci/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index f63d7ac1b3..37c8c94c66 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/7.17.13-7f46ddb9-SNAPSHOT-linux-x86_64.tar.gz') - string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.13-7f46ddb9-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.13-7f46ddb9-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.13-f0591b59-SNAPSHOT-linux-x86_64.tar.gz') + string(name: 'ELASTIC_AGENT_VERSION', defaultValue: '7.17.13-f0591b59-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.13-f0591b59-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.13-7f46ddb9-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') + string(name: 'STACK_VERSION', defaultValue: '7.17.13-f0591b59-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.') From a74e285f10e9d60fed534b89c156949c73fc027a Mon Sep 17 00:00:00 2001 From: apmmachine Date: Thu, 3 Aug 2023 15:02:00 +0000 Subject: [PATCH 19/22] chore: Updated to content "" in file "./internal/config/kubernetes/ba... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... 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 --- 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 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/kubernetes/base/elasticsearch/deployment.yaml b/internal/config/kubernetes/base/elasticsearch/deployment.yaml index 74bccab05b..b90f1fe466 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:7.17.13-7f46ddb9-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13-f0591b59-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 2d6abf7860..e2ad12fb6c 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:7.17.13-7f46ddb9-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:7.17.13-f0591b59-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 26fd58e2d6..2142f071fb 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:7.17.13-7f46ddb9-SNAPSHOT + image: docker.elastic.co/kibana/kibana:7.17.13-f0591b59-SNAPSHOT env: - name: ELASTICSEARCH_URL value: http://elasticsearch:9200 From a2b9bc5be85dd3d589741949ffa151ca9cadf57c Mon Sep 17 00:00:00 2001 From: apmmachine Date: Thu, 3 Aug 2023 15:02:04 +0000 Subject: [PATCH 20/22] chore: Updated to content "" in file "./internal/config/compose/profi... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... 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 --- 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 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/config/compose/profiles/fleet/docker-compose.yml b/internal/config/compose/profiles/fleet/docker-compose.yml index ebbee8009b..4c3c6ce786 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:-7.17.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.17.13-f0591b59-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.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-7.17.13-f0591b59-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 706b63420c..5a95b8f1a5 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:-7.17.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-f0591b59-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 789eb32f9c..15e3dced40 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:-7.17.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-f0591b59-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 f0c0499dde..40f95c1717 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:-7.17.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.17.13-f0591b59-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 af2f0b2e40..82848d5e22 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:-7.17.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/observability-ci/elasticsearch:${elasticsearchTag:-7.17.13-f0591b59-SNAPSHOT}" platform: ${elasticsearchPlatform:-linux/amd64} ports: - "9200:9200" diff --git a/internal/config/compose/services/kibana/docker-compose.yml b/internal/config/compose/services/kibana/docker-compose.yml index a59e64df43..26f472a3cb 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: "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.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.17.13-f0591b59-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 1f7e81166c..43a1b23530 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:-7.17.13-7f46ddb9-SNAPSHOT}" + image: "docker.elastic.co/${metricbeatDockerNamespace:-beats}/metricbeat:${metricbeatTag:-7.17.13-f0591b59-SNAPSHOT}" labels: co.elastic.logs/module: "${serviceName}" platform: ${stackPlatform:-linux/amd64} From 4112e46d6a66b423e179ba4d6968eb11baea22b4 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Thu, 3 Aug 2023 15:02:07 +0000 Subject: [PATCH 21/22] chore: Updated to content "7.17.13-f0591b59-SNAPSHOT" in file ".stack... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... -version" Made with ❤️️ by updatecli --- .stack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.stack-version b/.stack-version index 61734fbcdb..f5b96e2278 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -7.17.13-7f46ddb9-SNAPSHOT \ No newline at end of file +7.17.13-f0591b59-SNAPSHOT \ No newline at end of file From 91ba877dd18f5b584ef54553dbf93d9ce14bdc41 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Thu, 3 Aug 2023 15:02:10 +0000 Subject: [PATCH 22/22] chore: Updated to content "" in file "./internal/common/defaults.go" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- internal/common/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/common/defaults.go b/internal/common/defaults.go index 8d89d21be8..2be61d4a60 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 = "7.17.13-7f46ddb9-SNAPSHOT" +var BeatVersionBase = "7.17.13-f0591b59-SNAPSHOT" // BeatVersion is the version of the Beat to use // It can be overriden by BEAT_VERSION env var