From e64c06c6bab85cdf202b7da9307280d83458886e Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Wed, 30 Jul 2025 16:29:44 +0200 Subject: [PATCH 1/5] [Post 3.1] Update stack versions in recipes/samples and e2e matrix --- .buildkite/e2e/nightly-main-matrix.yaml | 6 +++--- .buildkite/e2e/release-branch-matrix.yaml | 10 ++++++---- Makefile | 2 +- config/e2e/helm-monitoring-operator.yaml | 2 +- config/e2e/monitoring.yaml | 4 ++-- .../recipes/apm-server-jaeger/apm-server-jaeger.yaml | 2 +- .../associations-rbac/apm_es_kibana_rbac.yaml | 6 +++--- config/recipes/autopilot/elasticsearch.yaml | 2 +- .../autopilot/fleet-kubernetes-integration.yaml | 8 ++++---- config/recipes/autopilot/kubernetes-integration.yaml | 4 ++-- config/recipes/autopilot/metricbeat_hosts.yaml | 4 ++-- config/recipes/autoscaling/elasticsearch.yaml | 2 +- config/recipes/beats/auditbeat_hosts.yaml | 8 ++++---- config/recipes/beats/filebeat_autodiscover.yaml | 6 +++--- .../beats/filebeat_autodiscover_by_metadata.yaml | 6 +++--- config/recipes/beats/filebeat_no_autodiscover.yaml | 6 +++--- config/recipes/beats/heartbeat_es_kb_health.yaml | 6 +++--- config/recipes/beats/metricbeat_hosts.yaml | 6 +++--- config/recipes/beats/openshift_monitoring.yaml | 8 ++++---- config/recipes/beats/packetbeat_dns_http.yaml | 6 +++--- config/recipes/beats/stack_monitoring.yaml | 12 ++++++------ .../recipes/elastic-agent/fleet-apm-integration.yaml | 8 ++++---- .../elastic-agent/fleet-custom-logs-integration.yaml | 8 ++++---- .../fleet-kubernetes-integration-nonroot.yaml | 8 ++++---- .../elastic-agent/fleet-kubernetes-integration.yaml | 8 ++++---- config/recipes/elastic-agent/ksm-sharding.yaml | 6 +++--- .../elastic-agent/kubernetes-integration.yaml | 6 +++--- config/recipes/elastic-agent/multi-output.yaml | 10 +++++----- config/recipes/elastic-agent/system-integration.yaml | 8 ++++---- config/recipes/gclb/01-elastic-stack.yaml | 4 ++-- config/recipes/gclb/99-kibana-path.yaml | 2 +- .../istio-gateway/03-elasticsearch-kibana.yaml | 4 ++-- config/recipes/logstash/logstash-eck.yaml | 8 ++++---- config/recipes/logstash/logstash-es-role.yaml | 4 ++-- config/recipes/logstash/logstash-monitored.yaml | 12 ++++++------ config/recipes/logstash/logstash-multi.yaml | 8 ++++---- .../logstash/logstash-pipeline-as-secret.yaml | 8 ++++---- .../logstash/logstash-pipeline-as-volume.yaml | 8 ++++---- config/recipes/logstash/logstash-volumes.yaml | 6 +++--- config/recipes/maps/01-ems.yaml | 2 +- config/recipes/maps/02-es-kb.yaml | 4 ++-- config/recipes/remoteclusters/elasticsearch.yaml | 8 ++++---- config/recipes/traefik/02-elastic-stack.yaml | 6 +++--- config/samples/apm/apm_es_kibana.yaml | 6 +++--- config/samples/elasticsearch/elasticsearch.yaml | 2 +- config/samples/enterprisesearch/ent_es.yaml | 6 +++--- config/samples/kibana/kibana_es.yaml | 4 ++-- config/samples/logstash/logstash.yaml | 2 +- config/samples/logstash/logstash_es.yaml | 4 ++-- config/samples/logstash/logstash_pv.yaml | 2 +- config/samples/logstash/logstash_stackmonitor.yaml | 6 +++--- config/samples/logstash/logstash_svc.yaml | 4 ++-- 52 files changed, 150 insertions(+), 148 deletions(-) diff --git a/.buildkite/e2e/nightly-main-matrix.yaml b/.buildkite/e2e/nightly-main-matrix.yaml index 16e7904caf..8e2fe68ba5 100644 --- a/.buildkite/e2e/nightly-main-matrix.yaml +++ b/.buildkite/e2e/nightly-main-matrix.yaml @@ -6,16 +6,16 @@ - E2E_STACK_VERSION: "8.18.0" # current stack version 9.0.0 is tested in all other tests no need to test it again - E2E_STACK_VERSION: "8.19.0-SNAPSHOT" - - E2E_STACK_VERSION: "9.1.0-SNAPSHOT" + - E2E_STACK_VERSION: "9.2.0-SNAPSHOT" - label: ocp fixed: E2E_PROVIDER: ocp mixed: ## Test the current stack version. - - E2E_STACK_VERSION: "9.0.0" + - E2E_STACK_VERSION: "9.1.0" ## Also test the next stack version to detect any change in the images that might not be compatible with the CRI-O runtime. - - E2E_STACK_VERSION: "9.1.0-SNAPSHOT" + - E2E_STACK_VERSION: "9.2.0-SNAPSHOT" - label: kind fixed: diff --git a/.buildkite/e2e/release-branch-matrix.yaml b/.buildkite/e2e/release-branch-matrix.yaml index ddac752c55..8c371358c6 100644 --- a/.buildkite/e2e/release-branch-matrix.yaml +++ b/.buildkite/e2e/release-branch-matrix.yaml @@ -21,11 +21,13 @@ - E2E_STACK_VERSION: "8.14.3" - E2E_STACK_VERSION: "8.15.4" - E2E_STACK_VERSION: "8.16.6" - - E2E_STACK_VERSION: "8.17.5" - - E2E_STACK_VERSION: "8.18.0" - # current stack version 9.0.0 is tested in all other tests no need to test it again + - E2E_STACK_VERSION: "8.17.9" + - E2E_STACK_VERSION: "8.18.4" + - E2E_STACK_VERSION: "8.19.0" + - E2E_STACK_VERSION: "9.0.4" + # current stack version 9.1.0 is tested in all other tests no need to test it again - E2E_STACK_VERSION: "8.19.0-SNAPSHOT" - - E2E_STACK_VERSION: "9.1.0-SNAPSHOT" + - E2E_STACK_VERSION: "9.2.0-SNAPSHOT" - label: kind fixed: diff --git a/Makefile b/Makefile index 30c6c0f2ad..d50a3852d1 100644 --- a/Makefile +++ b/Makefile @@ -418,7 +418,7 @@ drivah-build-e2e: # -- run -E2E_STACK_VERSION ?= 9.0.0 +E2E_STACK_VERSION ?= 9.1.0 # regexp to filter tests to run export TESTS_MATCH ?= "^Test" export E2E_JSON ?= false diff --git a/config/e2e/helm-monitoring-operator.yaml b/config/e2e/helm-monitoring-operator.yaml index 306cbf8694..e70be2c08b 100644 --- a/config/e2e/helm-monitoring-operator.yaml +++ b/config/e2e/helm-monitoring-operator.yaml @@ -6,7 +6,7 @@ managedNamespaces: [{{ .E2ENamespace }}] image: repository: docker.elastic.co/eck/eck-operator - tag: 3.0.0 + tag: 3.1.0 podAnnotations: co.elastic.metrics/metricsets: collector diff --git a/config/e2e/monitoring.yaml b/config/e2e/monitoring.yaml index 6424f04ace..636a1235de 100644 --- a/config/e2e/monitoring.yaml +++ b/config/e2e/monitoring.yaml @@ -5,7 +5,7 @@ metadata: name: e2e-agent namespace: {{ .E2ENamespace }} spec: - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - secretName: eck-{{ .TestRun }} daemonSet: @@ -227,7 +227,7 @@ spec: meta: package: name: system - version: 9.0.0 + version: 9.1.0 data_stream: namespace: default processors: diff --git a/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml b/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml index f6c693c01d..9317a0d8bc 100644 --- a/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml +++ b/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml @@ -4,7 +4,7 @@ metadata: name: apm-server-quickstart namespace: default spec: - version: 9.0.0 + version: 9.1.0 count: 1 config: name: elastic-apm diff --git a/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml b/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml index 4bcff64086..397624bdba 100644 --- a/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml +++ b/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml @@ -84,7 +84,7 @@ metadata: name: elasticsearch-sample namespace: elasticsearch-ns spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 1 @@ -97,7 +97,7 @@ metadata: name: kibana-sample namespace: kibana-ns spec: - version: 9.0.0 + version: 9.1.0 count: 1 config: xpack.fleet.packages: @@ -115,7 +115,7 @@ metadata: name: apm-apm-sample namespace: apmserver-ns spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: "elasticsearch-sample" diff --git a/config/recipes/autopilot/elasticsearch.yaml b/config/recipes/autopilot/elasticsearch.yaml index 5bd50fbe38..54eca0122d 100644 --- a/config/recipes/autopilot/elasticsearch.yaml +++ b/config/recipes/autopilot/elasticsearch.yaml @@ -41,7 +41,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 1 diff --git a/config/recipes/autopilot/fleet-kubernetes-integration.yaml b/config/recipes/autopilot/fleet-kubernetes-integration.yaml index 36671b9520..f8eb46092c 100644 --- a/config/recipes/autopilot/fleet-kubernetes-integration.yaml +++ b/config/recipes/autopilot/fleet-kubernetes-integration.yaml @@ -41,7 +41,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 1 @@ -74,7 +74,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -138,7 +138,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana elasticsearchRefs: @@ -179,7 +179,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/autopilot/kubernetes-integration.yaml b/config/recipes/autopilot/kubernetes-integration.yaml index 437e925c92..5a7c63e039 100644 --- a/config/recipes/autopilot/kubernetes-integration.yaml +++ b/config/recipes/autopilot/kubernetes-integration.yaml @@ -4,7 +4,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -27,7 +27,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - name: elasticsearch daemonSet: diff --git a/config/recipes/autopilot/metricbeat_hosts.yaml b/config/recipes/autopilot/metricbeat_hosts.yaml index 5cb5e6e181..bf4c91811f 100644 --- a/config/recipes/autopilot/metricbeat_hosts.yaml +++ b/config/recipes/autopilot/metricbeat_hosts.yaml @@ -4,7 +4,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: diff --git a/config/recipes/autoscaling/elasticsearch.yaml b/config/recipes/autoscaling/elasticsearch.yaml index 4a7ff1ca64..0f3f404ff7 100644 --- a/config/recipes/autoscaling/elasticsearch.yaml +++ b/config/recipes/autoscaling/elasticsearch.yaml @@ -51,7 +51,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: master count: 3 diff --git a/config/recipes/beats/auditbeat_hosts.yaml b/config/recipes/beats/auditbeat_hosts.yaml index 4c7c338ad7..ff8d41d5a4 100644 --- a/config/recipes/beats/auditbeat_hosts.yaml +++ b/config/recipes/beats/auditbeat_hosts.yaml @@ -4,7 +4,7 @@ metadata: name: auditbeat spec: type: auditbeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -76,7 +76,7 @@ spec: # path: /run #initContainers: #- name: cos-init - # image: docker.elastic.co/beats/auditbeat:9.0.0 + # image: docker.elastic.co/beats/auditbeat:9.1.0 # volumeMounts: # - name: run # mountPath: /run @@ -118,7 +118,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -130,7 +130,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/filebeat_autodiscover.yaml b/config/recipes/beats/filebeat_autodiscover.yaml index 217cfa2032..202f3094bb 100644 --- a/config/recipes/beats/filebeat_autodiscover.yaml +++ b/config/recipes/beats/filebeat_autodiscover.yaml @@ -4,7 +4,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -122,7 +122,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -134,7 +134,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml b/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml index 4c24587c6d..4df4592a44 100644 --- a/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml +++ b/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml @@ -4,7 +4,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -118,7 +118,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -130,7 +130,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/filebeat_no_autodiscover.yaml b/config/recipes/beats/filebeat_no_autodiscover.yaml index 5ff3a8d9a8..f8202d6adc 100644 --- a/config/recipes/beats/filebeat_no_autodiscover.yaml +++ b/config/recipes/beats/filebeat_no_autodiscover.yaml @@ -4,7 +4,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -60,7 +60,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -72,7 +72,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/heartbeat_es_kb_health.yaml b/config/recipes/beats/heartbeat_es_kb_health.yaml index 77ea561a4d..50f0cec280 100644 --- a/config/recipes/beats/heartbeat_es_kb_health.yaml +++ b/config/recipes/beats/heartbeat_es_kb_health.yaml @@ -4,7 +4,7 @@ metadata: name: heartbeat spec: type: heartbeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch config: @@ -27,7 +27,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -39,7 +39,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/metricbeat_hosts.yaml b/config/recipes/beats/metricbeat_hosts.yaml index fe892e1cb2..525b2baa47 100644 --- a/config/recipes/beats/metricbeat_hosts.yaml +++ b/config/recipes/beats/metricbeat_hosts.yaml @@ -4,7 +4,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -174,7 +174,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -186,7 +186,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/openshift_monitoring.yaml b/config/recipes/beats/openshift_monitoring.yaml index d53449facc..a2f2e4c4d1 100644 --- a/config/recipes/beats/openshift_monitoring.yaml +++ b/config/recipes/beats/openshift_monitoring.yaml @@ -4,7 +4,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -221,7 +221,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -324,7 +324,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -336,7 +336,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/packetbeat_dns_http.yaml b/config/recipes/beats/packetbeat_dns_http.yaml index f406d22275..16ff16d468 100644 --- a/config/recipes/beats/packetbeat_dns_http.yaml +++ b/config/recipes/beats/packetbeat_dns_http.yaml @@ -4,7 +4,7 @@ metadata: name: packetbeat spec: type: packetbeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch kibanaRef: @@ -44,7 +44,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -56,7 +56,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/stack_monitoring.yaml b/config/recipes/beats/stack_monitoring.yaml index 3cd1ecbb90..74d86789bf 100644 --- a/config/recipes/beats/stack_monitoring.yaml +++ b/config/recipes/beats/stack_monitoring.yaml @@ -6,7 +6,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch-monitoring config: @@ -140,7 +140,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: elasticsearch-monitoring kibanaRef: @@ -260,7 +260,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -276,7 +276,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -293,7 +293,7 @@ kind: Elasticsearch metadata: name: elasticsearch-monitoring spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -305,7 +305,7 @@ kind: Kibana metadata: name: kibana-monitoring spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch-monitoring diff --git a/config/recipes/elastic-agent/fleet-apm-integration.yaml b/config/recipes/elastic-agent/fleet-apm-integration.yaml index 2509b0c1e0..e08c194e30 100644 --- a/config/recipes/elastic-agent/fleet-apm-integration.yaml +++ b/config/recipes/elastic-agent/fleet-apm-integration.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -61,7 +61,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -73,7 +73,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana elasticsearchRefs: @@ -95,7 +95,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml b/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml index 663172d1d3..f773c22fb7 100644 --- a/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml +++ b/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -70,7 +70,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -82,7 +82,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana elasticsearchRefs: @@ -104,7 +104,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml b/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml index 081f961043..ebbdafd874 100644 --- a/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml +++ b/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml @@ -71,7 +71,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -129,7 +129,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -141,7 +141,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana elasticsearchRefs: @@ -161,7 +161,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml b/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml index 7e16e3f9c5..5a87904078 100644 --- a/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml +++ b/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -54,7 +54,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -66,7 +66,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana elasticsearchRefs: @@ -88,7 +88,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/ksm-sharding.yaml b/config/recipes/elastic-agent/ksm-sharding.yaml index 884a146af3..a0eed3e0e8 100644 --- a/config/recipes/elastic-agent/ksm-sharding.yaml +++ b/config/recipes/elastic-agent/ksm-sharding.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - name: elasticsearch statefulSet: @@ -450,7 +450,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -462,7 +462,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/elastic-agent/kubernetes-integration.yaml b/config/recipes/elastic-agent/kubernetes-integration.yaml index 99e10e646b..fd0fd9d357 100644 --- a/config/recipes/elastic-agent/kubernetes-integration.yaml +++ b/config/recipes/elastic-agent/kubernetes-integration.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - name: elasticsearch daemonSet: @@ -213,7 +213,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -225,7 +225,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/elastic-agent/multi-output.yaml b/config/recipes/elastic-agent/multi-output.yaml index 6dfbbd4e18..4c39c8dda6 100644 --- a/config/recipes/elastic-agent/multi-output.yaml +++ b/config/recipes/elastic-agent/multi-output.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - outputName: default name: elasticsearch @@ -196,7 +196,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -208,7 +208,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -218,7 +218,7 @@ kind: Elasticsearch metadata: name: elasticsearch-mon spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -230,7 +230,7 @@ kind: Kibana metadata: name: kibana-mon spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch-mon diff --git a/config/recipes/elastic-agent/system-integration.yaml b/config/recipes/elastic-agent/system-integration.yaml index c7fc33eebc..8add6b4825 100644 --- a/config/recipes/elastic-agent/system-integration.yaml +++ b/config/recipes/elastic-agent/system-integration.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - name: elasticsearch daemonSet: @@ -31,7 +31,7 @@ spec: meta: package: name: system - version: 9.0.0 + version: 9.1.0 data_stream: namespace: default streams: @@ -136,7 +136,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -148,7 +148,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/gclb/01-elastic-stack.yaml b/config/recipes/gclb/01-elastic-stack.yaml index 7c5363ce9f..845f1a3fcc 100644 --- a/config/recipes/gclb/01-elastic-stack.yaml +++ b/config/recipes/gclb/01-elastic-stack.yaml @@ -6,7 +6,7 @@ metadata: labels: app: hulk spec: - version: 9.0.0 + version: 9.1.0 http: service: metadata: @@ -45,7 +45,7 @@ metadata: labels: app: hulk spec: - version: 9.0.0 + version: 9.1.0 count: 1 http: service: diff --git a/config/recipes/gclb/99-kibana-path.yaml b/config/recipes/gclb/99-kibana-path.yaml index a504eb918d..440b5faf3c 100644 --- a/config/recipes/gclb/99-kibana-path.yaml +++ b/config/recipes/gclb/99-kibana-path.yaml @@ -7,7 +7,7 @@ metadata: labels: app: thor spec: - version: 9.0.0 + version: 9.1.0 count: 1 config: # Make Kibana aware of the fact that it is behind a proxy diff --git a/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml b/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml index 2006fe441f..9564f9058f 100644 --- a/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml +++ b/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml @@ -7,7 +7,7 @@ metadata: labels: app: ekmnt spec: - version: 9.0.0 + version: 9.1.0 http: tls: selfSignedCertificate: @@ -82,7 +82,7 @@ metadata: labels: app: ekmnt spec: - version: 9.0.0 + version: 9.1.0 count: 1 http: tls: diff --git a/config/recipes/logstash/logstash-eck.yaml b/config/recipes/logstash/logstash-eck.yaml index 964c32677b..6974db73dc 100644 --- a/config/recipes/logstash/logstash-eck.yaml +++ b/config/recipes/logstash/logstash-eck.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/logstash/logstash-es-role.yaml b/config/recipes/logstash/logstash-es-role.yaml index e39a1e7e0c..baab2a1fd7 100644 --- a/config/recipes/logstash/logstash-es-role.yaml +++ b/config/recipes/logstash/logstash-es-role.yaml @@ -15,7 +15,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 auth: roles: - secretName: my-roles-secret @@ -31,7 +31,7 @@ metadata: name: logstash spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - name: elasticsearch clusterName: eck diff --git a/config/recipes/logstash/logstash-monitored.yaml b/config/recipes/logstash/logstash-monitored.yaml index 4c6d6d70f5..0c0cd3c53c 100644 --- a/config/recipes/logstash/logstash-monitored.yaml +++ b/config/recipes/logstash/logstash-monitored.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - clusterName: eck name: elasticsearch @@ -116,7 +116,7 @@ kind: Elasticsearch metadata: name: elasticsearch-monitoring spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -128,7 +128,7 @@ kind: Kibana metadata: name: kibana-monitoring spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch-monitoring diff --git a/config/recipes/logstash/logstash-multi.yaml b/config/recipes/logstash/logstash-multi.yaml index 8d1fffff4c..e1272c96f2 100644 --- a/config/recipes/logstash/logstash-multi.yaml +++ b/config/recipes/logstash/logstash-multi.yaml @@ -12,7 +12,7 @@ metadata: name: qa namespace: qa spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -25,7 +25,7 @@ kind: Elasticsearch metadata: name: production spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -39,7 +39,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 config: filebeat.inputs: - type: log @@ -78,7 +78,7 @@ metadata: name: logstash spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - clusterName: prod-es name: production diff --git a/config/recipes/logstash/logstash-pipeline-as-secret.yaml b/config/recipes/logstash/logstash-pipeline-as-secret.yaml index af59da4a58..10918ecfd4 100644 --- a/config/recipes/logstash/logstash-pipeline-as-secret.yaml +++ b/config/recipes/logstash/logstash-pipeline-as-secret.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/logstash/logstash-pipeline-as-volume.yaml b/config/recipes/logstash/logstash-pipeline-as-volume.yaml index 0bfa431007..776d8670e6 100644 --- a/config/recipes/logstash/logstash-pipeline-as-volume.yaml +++ b/config/recipes/logstash/logstash-pipeline-as-volume.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/logstash/logstash-volumes.yaml b/config/recipes/logstash/logstash-volumes.yaml index 0e00d759a6..e9bf9d9516 100644 --- a/config/recipes/logstash/logstash-volumes.yaml +++ b/config/recipes/logstash/logstash-volumes.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -18,7 +18,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.0.0 + version: 9.1.0 config: filebeat.inputs: - type: log @@ -57,7 +57,7 @@ metadata: name: logstash spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/maps/01-ems.yaml b/config/recipes/maps/01-ems.yaml index 253587c5bc..e2a05aeaf3 100644 --- a/config/recipes/maps/01-ems.yaml +++ b/config/recipes/maps/01-ems.yaml @@ -3,5 +3,5 @@ kind: ElasticMapsServer metadata: name: ems-sample spec: - version: 9.0.0 + version: 9.1.0 count: 1 diff --git a/config/recipes/maps/02-es-kb.yaml b/config/recipes/maps/02-es-kb.yaml index 4c856311d4..f7e6db98d5 100644 --- a/config/recipes/maps/02-es-kb.yaml +++ b/config/recipes/maps/02-es-kb.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -27,7 +27,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.0.0 + version: 9.1.0 count: 1 config: # Configure this to a domain you control diff --git a/config/recipes/remoteclusters/elasticsearch.yaml b/config/recipes/remoteclusters/elasticsearch.yaml index ab330a03a0..4b3a302332 100644 --- a/config/recipes/remoteclusters/elasticsearch.yaml +++ b/config/recipes/remoteclusters/elasticsearch.yaml @@ -9,7 +9,7 @@ metadata: name: cluster1 namespace: ns1 spec: - version: 9.0.0 + version: 9.1.0 remoteClusters: - name: to-ns2-cluster2 elasticsearchRef: @@ -38,7 +38,7 @@ spec: # spec: # # expose this cluster Service with a LoadBalancer # type: LoadBalancer - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: "cluster1" @@ -54,7 +54,7 @@ metadata: name: cluster2 namespace: ns2 spec: - version: 9.0.0 + version: 9.1.0 ## Required for this cluster to be accessed using remote cluster API keys. remoteClusterServer: enabled: true @@ -75,7 +75,7 @@ spec: # spec: # # expose this cluster Service with a LoadBalancer # type: LoadBalancer - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: "cluster2" \ No newline at end of file diff --git a/config/recipes/traefik/02-elastic-stack.yaml b/config/recipes/traefik/02-elastic-stack.yaml index fe79e86449..7d39dbaee9 100644 --- a/config/recipes/traefik/02-elastic-stack.yaml +++ b/config/recipes/traefik/02-elastic-stack.yaml @@ -6,7 +6,7 @@ metadata: labels: app: hulk spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: master count: 1 @@ -41,7 +41,7 @@ metadata: labels: app: hulk spec: - version: 9.0.0 + version: 9.1.0 count: 1 config: xpack.fleet.packages: @@ -57,7 +57,7 @@ metadata: labels: app: hulk spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: hulk diff --git a/config/samples/apm/apm_es_kibana.yaml b/config/samples/apm/apm_es_kibana.yaml index aaae96ff6f..5eabe64040 100644 --- a/config/samples/apm/apm_es_kibana.yaml +++ b/config/samples/apm/apm_es_kibana.yaml @@ -5,7 +5,7 @@ kind: Elasticsearch metadata: name: es-apm-sample spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -19,7 +19,7 @@ kind: Kibana metadata: name: kb-apm-sample spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: "es-apm-sample" @@ -33,7 +33,7 @@ kind: ApmServer metadata: name: apm-apm-sample spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: "es-apm-sample" diff --git a/config/samples/elasticsearch/elasticsearch.yaml b/config/samples/elasticsearch/elasticsearch.yaml index fef14ea9f2..6f11271c57 100644 --- a/config/samples/elasticsearch/elasticsearch.yaml +++ b/config/samples/elasticsearch/elasticsearch.yaml @@ -7,7 +7,7 @@ metadata: # eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone" name: elasticsearch-sample spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default config: diff --git a/config/samples/enterprisesearch/ent_es.yaml b/config/samples/enterprisesearch/ent_es.yaml index 988a1df361..90d4578749 100644 --- a/config/samples/enterprisesearch/ent_es.yaml +++ b/config/samples/enterprisesearch/ent_es.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 8.18.0 + version: 8.19.0 nodeSets: - name: default count: 1 @@ -23,7 +23,7 @@ kind: Kibana metadata: name: kibana-sample spec: - version: 8.18.0 + version: 8.19.0 count: 1 elasticsearchRef: name: elasticsearch-sample @@ -35,7 +35,7 @@ kind: EnterpriseSearch metadata: name: ent-sample spec: - version: 8.18.0 + version: 8.19.0 count: 1 elasticsearchRef: name: elasticsearch-sample diff --git a/config/samples/kibana/kibana_es.yaml b/config/samples/kibana/kibana_es.yaml index 310a474a97..613065b43e 100644 --- a/config/samples/kibana/kibana_es.yaml +++ b/config/samples/kibana/kibana_es.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 1 @@ -18,7 +18,7 @@ kind: Kibana metadata: name: kibana-sample spec: - version: 9.0.0 + version: 9.1.0 count: 1 elasticsearchRef: name: "elasticsearch-sample" diff --git a/config/samples/logstash/logstash.yaml b/config/samples/logstash/logstash.yaml index 82520b31c0..90694c6dbf 100644 --- a/config/samples/logstash/logstash.yaml +++ b/config/samples/logstash/logstash.yaml @@ -3,7 +3,7 @@ kind: Logstash metadata: name: logstash-sample spec: - version: 9.0.0 + version: 9.1.0 count: 3 config: log.level: info diff --git a/config/samples/logstash/logstash_es.yaml b/config/samples/logstash/logstash_es.yaml index 8ccaaf230c..606eb79d32 100644 --- a/config/samples/logstash/logstash_es.yaml +++ b/config/samples/logstash/logstash_es.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 2 @@ -16,7 +16,7 @@ metadata: name: logstash-sample spec: count: 1 - version: 9.0.0 + version: 9.1.0 elasticsearchRefs: - clusterName: production name: elasticsearch-sample diff --git a/config/samples/logstash/logstash_pv.yaml b/config/samples/logstash/logstash_pv.yaml index 916b1a5c5d..52683b0bfc 100644 --- a/config/samples/logstash/logstash_pv.yaml +++ b/config/samples/logstash/logstash_pv.yaml @@ -4,7 +4,7 @@ metadata: name: d spec: count: 1 - version: 9.0.0 + version: 9.1.0 config: queue.type: persisted pipelines: diff --git a/config/samples/logstash/logstash_stackmonitor.yaml b/config/samples/logstash/logstash_stackmonitor.yaml index 1e9ecb030d..c82fe163ad 100644 --- a/config/samples/logstash/logstash_stackmonitor.yaml +++ b/config/samples/logstash/logstash_stackmonitor.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: monitoring spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ metadata: name: logstash-sample spec: count: 1 - version: 9.0.0 + version: 9.1.0 config: log.level: info api.http.host: "0.0.0.0" @@ -55,7 +55,7 @@ kind: Kibana metadata: name: kibana-sample spec: - version: 9.0.0 + version: 9.1.0 elasticsearchRef: name: monitoring count: 1 diff --git a/config/samples/logstash/logstash_svc.yaml b/config/samples/logstash/logstash_svc.yaml index 19f2132b9a..d83545d3cb 100644 --- a/config/samples/logstash/logstash_svc.yaml +++ b/config/samples/logstash/logstash_svc.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.0.0 + version: 9.1.0 nodeSets: - name: default count: 3 @@ -16,7 +16,7 @@ metadata: name: logstash-sample spec: count: 2 - version: 9.0.0 + version: 9.1.0 config: log.level: info api.http.host: "0.0.0.0" From f58e2eee324865ae0515018af9a112ae51b3cb46 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Wed, 30 Jul 2025 17:03:39 +0200 Subject: [PATCH 2/5] Update from review --- .buildkite/e2e/nightly-main-matrix.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/e2e/nightly-main-matrix.yaml b/.buildkite/e2e/nightly-main-matrix.yaml index 8e2fe68ba5..2c3b9b3733 100644 --- a/.buildkite/e2e/nightly-main-matrix.yaml +++ b/.buildkite/e2e/nightly-main-matrix.yaml @@ -3,8 +3,8 @@ fixed: E2E_PROVIDER: gke mixed: - - E2E_STACK_VERSION: "8.18.0" - # current stack version 9.0.0 is tested in all other tests no need to test it again + - E2E_STACK_VERSION: "8.19.0" + # current stack version 9.1.0 is tested in all other tests no need to test it again - E2E_STACK_VERSION: "8.19.0-SNAPSHOT" - E2E_STACK_VERSION: "9.2.0-SNAPSHOT" From be32883bda2c3b2f0d7c25c5bfe2e4a125eff326 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Thu, 31 Jul 2025 07:56:58 +0200 Subject: [PATCH 3/5] Fix Agent package versions --- config/e2e/monitoring.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/e2e/monitoring.yaml b/config/e2e/monitoring.yaml index 636a1235de..4aacefbc6d 100644 --- a/config/e2e/monitoring.yaml +++ b/config/e2e/monitoring.yaml @@ -111,7 +111,7 @@ spec: meta: package: name: journald - version: 1.1.0 + version: 1.2.1 data_stream: namespace: default streams: @@ -126,7 +126,7 @@ spec: meta: package: name: kubernetes - version: 1.49.0 + version: 1.80.2 data_stream: namespace: k8s processors: @@ -227,7 +227,7 @@ spec: meta: package: name: system - version: 9.1.0 + version: 2.5.1 data_stream: namespace: default processors: From b94a49d1a41e2b4cac597a932d1b0b837d19b381 Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Mon, 4 Aug 2025 11:51:19 +0200 Subject: [PATCH 4/5] Skip TestFleetKubernetesNonRootIntegrationRecipe for affected versions --- test/e2e/agent/recipes_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/e2e/agent/recipes_test.go b/test/e2e/agent/recipes_test.go index 138cc774e0..b0d6eb242e 100644 --- a/test/e2e/agent/recipes_test.go +++ b/test/e2e/agent/recipes_test.go @@ -132,6 +132,11 @@ func TestFleetKubernetesNonRootIntegrationRecipe(t *testing.T) { t.SkipNow() } + if (v.GE(version.MinFor(9, 0, 1)) && v.LE(version.MinFor(9, 0, 4))) || + (v.EQ(version.From(9, 1, 0))) { + t.Skipf("Skipped as version %s is affected by https://github.com/elastic/kibana/pull/230211", v) + } + // The recipe does not work fully within an openshift cluster without modifications. if test.Ctx().OcpCluster { t.SkipNow() From c05a88b6dc3671ed74564bedcbf7b9af6c4545ef Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Fri, 8 Aug 2025 10:33:19 +0200 Subject: [PATCH 5/5] 9.1.0 -> 9.1.1 --- .buildkite/e2e/nightly-main-matrix.yaml | 4 ++-- .buildkite/e2e/release-branch-matrix.yaml | 2 +- Makefile | 2 +- config/e2e/monitoring.yaml | 2 +- .../recipes/apm-server-jaeger/apm-server-jaeger.yaml | 2 +- .../associations-rbac/apm_es_kibana_rbac.yaml | 6 +++--- config/recipes/autopilot/elasticsearch.yaml | 2 +- .../autopilot/fleet-kubernetes-integration.yaml | 8 ++++---- config/recipes/autopilot/kubernetes-integration.yaml | 4 ++-- config/recipes/autopilot/metricbeat_hosts.yaml | 4 ++-- config/recipes/autoscaling/elasticsearch.yaml | 2 +- config/recipes/beats/auditbeat_hosts.yaml | 8 ++++---- config/recipes/beats/filebeat_autodiscover.yaml | 6 +++--- .../beats/filebeat_autodiscover_by_metadata.yaml | 6 +++--- config/recipes/beats/filebeat_no_autodiscover.yaml | 6 +++--- config/recipes/beats/heartbeat_es_kb_health.yaml | 6 +++--- config/recipes/beats/metricbeat_hosts.yaml | 6 +++--- config/recipes/beats/openshift_monitoring.yaml | 8 ++++---- config/recipes/beats/packetbeat_dns_http.yaml | 6 +++--- config/recipes/beats/stack_monitoring.yaml | 12 ++++++------ .../recipes/elastic-agent/fleet-apm-integration.yaml | 8 ++++---- .../elastic-agent/fleet-custom-logs-integration.yaml | 8 ++++---- .../fleet-kubernetes-integration-nonroot.yaml | 8 ++++---- .../elastic-agent/fleet-kubernetes-integration.yaml | 8 ++++---- config/recipes/elastic-agent/ksm-sharding.yaml | 6 +++--- .../elastic-agent/kubernetes-integration.yaml | 6 +++--- config/recipes/elastic-agent/multi-output.yaml | 10 +++++----- config/recipes/elastic-agent/system-integration.yaml | 8 ++++---- config/recipes/gclb/01-elastic-stack.yaml | 4 ++-- config/recipes/gclb/99-kibana-path.yaml | 2 +- .../istio-gateway/03-elasticsearch-kibana.yaml | 4 ++-- config/recipes/logstash/logstash-eck.yaml | 8 ++++---- config/recipes/logstash/logstash-es-role.yaml | 4 ++-- config/recipes/logstash/logstash-monitored.yaml | 12 ++++++------ config/recipes/logstash/logstash-multi.yaml | 8 ++++---- .../logstash/logstash-pipeline-as-secret.yaml | 8 ++++---- .../logstash/logstash-pipeline-as-volume.yaml | 8 ++++---- config/recipes/logstash/logstash-volumes.yaml | 6 +++--- config/recipes/maps/01-ems.yaml | 2 +- config/recipes/maps/02-es-kb.yaml | 4 ++-- config/recipes/remoteclusters/elasticsearch.yaml | 8 ++++---- config/recipes/traefik/02-elastic-stack.yaml | 6 +++--- config/samples/apm/apm_es_kibana.yaml | 6 +++--- config/samples/elasticsearch/elasticsearch.yaml | 2 +- config/samples/kibana/kibana_es.yaml | 4 ++-- config/samples/logstash/logstash.yaml | 2 +- config/samples/logstash/logstash_es.yaml | 4 ++-- config/samples/logstash/logstash_pv.yaml | 2 +- config/samples/logstash/logstash_stackmonitor.yaml | 6 +++--- config/samples/logstash/logstash_svc.yaml | 4 ++-- 50 files changed, 139 insertions(+), 139 deletions(-) diff --git a/.buildkite/e2e/nightly-main-matrix.yaml b/.buildkite/e2e/nightly-main-matrix.yaml index 2c3b9b3733..5b86c929bd 100644 --- a/.buildkite/e2e/nightly-main-matrix.yaml +++ b/.buildkite/e2e/nightly-main-matrix.yaml @@ -4,7 +4,7 @@ E2E_PROVIDER: gke mixed: - E2E_STACK_VERSION: "8.19.0" - # current stack version 9.1.0 is tested in all other tests no need to test it again + # current stack version 9.1.1 is tested in all other tests no need to test it again - E2E_STACK_VERSION: "8.19.0-SNAPSHOT" - E2E_STACK_VERSION: "9.2.0-SNAPSHOT" @@ -13,7 +13,7 @@ E2E_PROVIDER: ocp mixed: ## Test the current stack version. - - E2E_STACK_VERSION: "9.1.0" + - E2E_STACK_VERSION: "9.1.1" ## Also test the next stack version to detect any change in the images that might not be compatible with the CRI-O runtime. - E2E_STACK_VERSION: "9.2.0-SNAPSHOT" diff --git a/.buildkite/e2e/release-branch-matrix.yaml b/.buildkite/e2e/release-branch-matrix.yaml index 8c371358c6..c822397e79 100644 --- a/.buildkite/e2e/release-branch-matrix.yaml +++ b/.buildkite/e2e/release-branch-matrix.yaml @@ -25,7 +25,7 @@ - E2E_STACK_VERSION: "8.18.4" - E2E_STACK_VERSION: "8.19.0" - E2E_STACK_VERSION: "9.0.4" - # current stack version 9.1.0 is tested in all other tests no need to test it again + # current stack version 9.1.1 is tested in all other tests no need to test it again - E2E_STACK_VERSION: "8.19.0-SNAPSHOT" - E2E_STACK_VERSION: "9.2.0-SNAPSHOT" diff --git a/Makefile b/Makefile index d50a3852d1..5862887bf6 100644 --- a/Makefile +++ b/Makefile @@ -418,7 +418,7 @@ drivah-build-e2e: # -- run -E2E_STACK_VERSION ?= 9.1.0 +E2E_STACK_VERSION ?= 9.1.1 # regexp to filter tests to run export TESTS_MATCH ?= "^Test" export E2E_JSON ?= false diff --git a/config/e2e/monitoring.yaml b/config/e2e/monitoring.yaml index 4aacefbc6d..60a80cc438 100644 --- a/config/e2e/monitoring.yaml +++ b/config/e2e/monitoring.yaml @@ -5,7 +5,7 @@ metadata: name: e2e-agent namespace: {{ .E2ENamespace }} spec: - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - secretName: eck-{{ .TestRun }} daemonSet: diff --git a/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml b/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml index 9317a0d8bc..64f7a76035 100644 --- a/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml +++ b/config/recipes/apm-server-jaeger/apm-server-jaeger.yaml @@ -4,7 +4,7 @@ metadata: name: apm-server-quickstart namespace: default spec: - version: 9.1.0 + version: 9.1.1 count: 1 config: name: elastic-apm diff --git a/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml b/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml index 397624bdba..4e3a680090 100644 --- a/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml +++ b/config/recipes/associations-rbac/apm_es_kibana_rbac.yaml @@ -84,7 +84,7 @@ metadata: name: elasticsearch-sample namespace: elasticsearch-ns spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 1 @@ -97,7 +97,7 @@ metadata: name: kibana-sample namespace: kibana-ns spec: - version: 9.1.0 + version: 9.1.1 count: 1 config: xpack.fleet.packages: @@ -115,7 +115,7 @@ metadata: name: apm-apm-sample namespace: apmserver-ns spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: "elasticsearch-sample" diff --git a/config/recipes/autopilot/elasticsearch.yaml b/config/recipes/autopilot/elasticsearch.yaml index 54eca0122d..26d3ee6c71 100644 --- a/config/recipes/autopilot/elasticsearch.yaml +++ b/config/recipes/autopilot/elasticsearch.yaml @@ -41,7 +41,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 1 diff --git a/config/recipes/autopilot/fleet-kubernetes-integration.yaml b/config/recipes/autopilot/fleet-kubernetes-integration.yaml index f8eb46092c..be224b95b7 100644 --- a/config/recipes/autopilot/fleet-kubernetes-integration.yaml +++ b/config/recipes/autopilot/fleet-kubernetes-integration.yaml @@ -41,7 +41,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 1 @@ -74,7 +74,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -138,7 +138,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana elasticsearchRefs: @@ -179,7 +179,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/autopilot/kubernetes-integration.yaml b/config/recipes/autopilot/kubernetes-integration.yaml index 5a7c63e039..89b44c77ec 100644 --- a/config/recipes/autopilot/kubernetes-integration.yaml +++ b/config/recipes/autopilot/kubernetes-integration.yaml @@ -4,7 +4,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -27,7 +27,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - name: elasticsearch daemonSet: diff --git a/config/recipes/autopilot/metricbeat_hosts.yaml b/config/recipes/autopilot/metricbeat_hosts.yaml index bf4c91811f..42227a099f 100644 --- a/config/recipes/autopilot/metricbeat_hosts.yaml +++ b/config/recipes/autopilot/metricbeat_hosts.yaml @@ -4,7 +4,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: diff --git a/config/recipes/autoscaling/elasticsearch.yaml b/config/recipes/autoscaling/elasticsearch.yaml index 0f3f404ff7..3358f821b5 100644 --- a/config/recipes/autoscaling/elasticsearch.yaml +++ b/config/recipes/autoscaling/elasticsearch.yaml @@ -51,7 +51,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: master count: 3 diff --git a/config/recipes/beats/auditbeat_hosts.yaml b/config/recipes/beats/auditbeat_hosts.yaml index ff8d41d5a4..9df4b5db6b 100644 --- a/config/recipes/beats/auditbeat_hosts.yaml +++ b/config/recipes/beats/auditbeat_hosts.yaml @@ -4,7 +4,7 @@ metadata: name: auditbeat spec: type: auditbeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -76,7 +76,7 @@ spec: # path: /run #initContainers: #- name: cos-init - # image: docker.elastic.co/beats/auditbeat:9.1.0 + # image: docker.elastic.co/beats/auditbeat:9.1.1 # volumeMounts: # - name: run # mountPath: /run @@ -118,7 +118,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -130,7 +130,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/filebeat_autodiscover.yaml b/config/recipes/beats/filebeat_autodiscover.yaml index 202f3094bb..75113f2e05 100644 --- a/config/recipes/beats/filebeat_autodiscover.yaml +++ b/config/recipes/beats/filebeat_autodiscover.yaml @@ -4,7 +4,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -122,7 +122,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -134,7 +134,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml b/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml index 4df4592a44..3b2f8d5300 100644 --- a/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml +++ b/config/recipes/beats/filebeat_autodiscover_by_metadata.yaml @@ -4,7 +4,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -118,7 +118,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -130,7 +130,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/filebeat_no_autodiscover.yaml b/config/recipes/beats/filebeat_no_autodiscover.yaml index f8202d6adc..9f97e441b3 100644 --- a/config/recipes/beats/filebeat_no_autodiscover.yaml +++ b/config/recipes/beats/filebeat_no_autodiscover.yaml @@ -4,7 +4,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -60,7 +60,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -72,7 +72,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/heartbeat_es_kb_health.yaml b/config/recipes/beats/heartbeat_es_kb_health.yaml index 50f0cec280..07c0eaf1c6 100644 --- a/config/recipes/beats/heartbeat_es_kb_health.yaml +++ b/config/recipes/beats/heartbeat_es_kb_health.yaml @@ -4,7 +4,7 @@ metadata: name: heartbeat spec: type: heartbeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch config: @@ -27,7 +27,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -39,7 +39,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/metricbeat_hosts.yaml b/config/recipes/beats/metricbeat_hosts.yaml index 525b2baa47..9f47b93e93 100644 --- a/config/recipes/beats/metricbeat_hosts.yaml +++ b/config/recipes/beats/metricbeat_hosts.yaml @@ -4,7 +4,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -174,7 +174,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -186,7 +186,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/openshift_monitoring.yaml b/config/recipes/beats/openshift_monitoring.yaml index a2f2e4c4d1..0c9199ec9e 100644 --- a/config/recipes/beats/openshift_monitoring.yaml +++ b/config/recipes/beats/openshift_monitoring.yaml @@ -4,7 +4,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -221,7 +221,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -324,7 +324,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -336,7 +336,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/packetbeat_dns_http.yaml b/config/recipes/beats/packetbeat_dns_http.yaml index 16ff16d468..41b2af7b55 100644 --- a/config/recipes/beats/packetbeat_dns_http.yaml +++ b/config/recipes/beats/packetbeat_dns_http.yaml @@ -4,7 +4,7 @@ metadata: name: packetbeat spec: type: packetbeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch kibanaRef: @@ -44,7 +44,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -56,7 +56,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/beats/stack_monitoring.yaml b/config/recipes/beats/stack_monitoring.yaml index 74d86789bf..ce8ae21ce4 100644 --- a/config/recipes/beats/stack_monitoring.yaml +++ b/config/recipes/beats/stack_monitoring.yaml @@ -6,7 +6,7 @@ metadata: name: metricbeat spec: type: metricbeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch-monitoring config: @@ -140,7 +140,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: elasticsearch-monitoring kibanaRef: @@ -260,7 +260,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -276,7 +276,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -293,7 +293,7 @@ kind: Elasticsearch metadata: name: elasticsearch-monitoring spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -305,7 +305,7 @@ kind: Kibana metadata: name: kibana-monitoring spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch-monitoring diff --git a/config/recipes/elastic-agent/fleet-apm-integration.yaml b/config/recipes/elastic-agent/fleet-apm-integration.yaml index e08c194e30..db8ffa47b6 100644 --- a/config/recipes/elastic-agent/fleet-apm-integration.yaml +++ b/config/recipes/elastic-agent/fleet-apm-integration.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -61,7 +61,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -73,7 +73,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana elasticsearchRefs: @@ -95,7 +95,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml b/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml index f773c22fb7..e1bb03584c 100644 --- a/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml +++ b/config/recipes/elastic-agent/fleet-custom-logs-integration.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -70,7 +70,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -82,7 +82,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana elasticsearchRefs: @@ -104,7 +104,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml b/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml index ebbdafd874..4fe7862aa2 100644 --- a/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml +++ b/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml @@ -71,7 +71,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -129,7 +129,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -141,7 +141,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana elasticsearchRefs: @@ -161,7 +161,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml b/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml index 5a87904078..822cb55f54 100644 --- a/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml +++ b/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -54,7 +54,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -66,7 +66,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana elasticsearchRefs: @@ -88,7 +88,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 kibanaRef: name: kibana fleetServerRef: diff --git a/config/recipes/elastic-agent/ksm-sharding.yaml b/config/recipes/elastic-agent/ksm-sharding.yaml index a0eed3e0e8..a456ae0e29 100644 --- a/config/recipes/elastic-agent/ksm-sharding.yaml +++ b/config/recipes/elastic-agent/ksm-sharding.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - name: elasticsearch statefulSet: @@ -450,7 +450,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -462,7 +462,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/elastic-agent/kubernetes-integration.yaml b/config/recipes/elastic-agent/kubernetes-integration.yaml index fd0fd9d357..fcbc727f88 100644 --- a/config/recipes/elastic-agent/kubernetes-integration.yaml +++ b/config/recipes/elastic-agent/kubernetes-integration.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - name: elasticsearch daemonSet: @@ -213,7 +213,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -225,7 +225,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/elastic-agent/multi-output.yaml b/config/recipes/elastic-agent/multi-output.yaml index 4c39c8dda6..8b4f656ffe 100644 --- a/config/recipes/elastic-agent/multi-output.yaml +++ b/config/recipes/elastic-agent/multi-output.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - outputName: default name: elasticsearch @@ -196,7 +196,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -208,7 +208,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -218,7 +218,7 @@ kind: Elasticsearch metadata: name: elasticsearch-mon spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -230,7 +230,7 @@ kind: Kibana metadata: name: kibana-mon spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch-mon diff --git a/config/recipes/elastic-agent/system-integration.yaml b/config/recipes/elastic-agent/system-integration.yaml index 8add6b4825..1a9db3b2c9 100644 --- a/config/recipes/elastic-agent/system-integration.yaml +++ b/config/recipes/elastic-agent/system-integration.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: elastic-agent spec: - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - name: elasticsearch daemonSet: @@ -31,7 +31,7 @@ spec: meta: package: name: system - version: 9.1.0 + version: 9.1.1 data_stream: namespace: default streams: @@ -136,7 +136,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -148,7 +148,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch diff --git a/config/recipes/gclb/01-elastic-stack.yaml b/config/recipes/gclb/01-elastic-stack.yaml index 845f1a3fcc..0bc8d1154f 100644 --- a/config/recipes/gclb/01-elastic-stack.yaml +++ b/config/recipes/gclb/01-elastic-stack.yaml @@ -6,7 +6,7 @@ metadata: labels: app: hulk spec: - version: 9.1.0 + version: 9.1.1 http: service: metadata: @@ -45,7 +45,7 @@ metadata: labels: app: hulk spec: - version: 9.1.0 + version: 9.1.1 count: 1 http: service: diff --git a/config/recipes/gclb/99-kibana-path.yaml b/config/recipes/gclb/99-kibana-path.yaml index 440b5faf3c..841965b6e3 100644 --- a/config/recipes/gclb/99-kibana-path.yaml +++ b/config/recipes/gclb/99-kibana-path.yaml @@ -7,7 +7,7 @@ metadata: labels: app: thor spec: - version: 9.1.0 + version: 9.1.1 count: 1 config: # Make Kibana aware of the fact that it is behind a proxy diff --git a/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml b/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml index 9564f9058f..a19e77012a 100644 --- a/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml +++ b/config/recipes/istio-gateway/03-elasticsearch-kibana.yaml @@ -7,7 +7,7 @@ metadata: labels: app: ekmnt spec: - version: 9.1.0 + version: 9.1.1 http: tls: selfSignedCertificate: @@ -82,7 +82,7 @@ metadata: labels: app: ekmnt spec: - version: 9.1.0 + version: 9.1.1 count: 1 http: tls: diff --git a/config/recipes/logstash/logstash-eck.yaml b/config/recipes/logstash/logstash-eck.yaml index 6974db73dc..879132fc1e 100644 --- a/config/recipes/logstash/logstash-eck.yaml +++ b/config/recipes/logstash/logstash-eck.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/logstash/logstash-es-role.yaml b/config/recipes/logstash/logstash-es-role.yaml index baab2a1fd7..5be75d56ac 100644 --- a/config/recipes/logstash/logstash-es-role.yaml +++ b/config/recipes/logstash/logstash-es-role.yaml @@ -15,7 +15,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 auth: roles: - secretName: my-roles-secret @@ -31,7 +31,7 @@ metadata: name: logstash spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - name: elasticsearch clusterName: eck diff --git a/config/recipes/logstash/logstash-monitored.yaml b/config/recipes/logstash/logstash-monitored.yaml index 0c0cd3c53c..26d551efc1 100644 --- a/config/recipes/logstash/logstash-monitored.yaml +++ b/config/recipes/logstash/logstash-monitored.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - clusterName: eck name: elasticsearch @@ -116,7 +116,7 @@ kind: Elasticsearch metadata: name: elasticsearch-monitoring spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -128,7 +128,7 @@ kind: Kibana metadata: name: kibana-monitoring spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch-monitoring diff --git a/config/recipes/logstash/logstash-multi.yaml b/config/recipes/logstash/logstash-multi.yaml index e1272c96f2..55ee9a41f1 100644 --- a/config/recipes/logstash/logstash-multi.yaml +++ b/config/recipes/logstash/logstash-multi.yaml @@ -12,7 +12,7 @@ metadata: name: qa namespace: qa spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -25,7 +25,7 @@ kind: Elasticsearch metadata: name: production spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -39,7 +39,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 config: filebeat.inputs: - type: log @@ -78,7 +78,7 @@ metadata: name: logstash spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - clusterName: prod-es name: production diff --git a/config/recipes/logstash/logstash-pipeline-as-secret.yaml b/config/recipes/logstash/logstash-pipeline-as-secret.yaml index 10918ecfd4..e34ace6ea0 100644 --- a/config/recipes/logstash/logstash-pipeline-as-secret.yaml +++ b/config/recipes/logstash/logstash-pipeline-as-secret.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/logstash/logstash-pipeline-as-volume.yaml b/config/recipes/logstash/logstash-pipeline-as-volume.yaml index 776d8670e6..c886cba5a2 100644 --- a/config/recipes/logstash/logstash-pipeline-as-volume.yaml +++ b/config/recipes/logstash/logstash-pipeline-as-volume.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: elasticsearch @@ -28,7 +28,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 config: filebeat.inputs: - type: log @@ -67,7 +67,7 @@ metadata: name: logstash spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/logstash/logstash-volumes.yaml b/config/recipes/logstash/logstash-volumes.yaml index e9bf9d9516..ae9beb8d75 100644 --- a/config/recipes/logstash/logstash-volumes.yaml +++ b/config/recipes/logstash/logstash-volumes.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -18,7 +18,7 @@ metadata: name: filebeat spec: type: filebeat - version: 9.1.0 + version: 9.1.1 config: filebeat.inputs: - type: log @@ -57,7 +57,7 @@ metadata: name: logstash spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - clusterName: eck name: elasticsearch diff --git a/config/recipes/maps/01-ems.yaml b/config/recipes/maps/01-ems.yaml index e2a05aeaf3..0d4072a091 100644 --- a/config/recipes/maps/01-ems.yaml +++ b/config/recipes/maps/01-ems.yaml @@ -3,5 +3,5 @@ kind: ElasticMapsServer metadata: name: ems-sample spec: - version: 9.1.0 + version: 9.1.1 count: 1 diff --git a/config/recipes/maps/02-es-kb.yaml b/config/recipes/maps/02-es-kb.yaml index f7e6db98d5..45c4181f68 100644 --- a/config/recipes/maps/02-es-kb.yaml +++ b/config/recipes/maps/02-es-kb.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -27,7 +27,7 @@ kind: Kibana metadata: name: kibana spec: - version: 9.1.0 + version: 9.1.1 count: 1 config: # Configure this to a domain you control diff --git a/config/recipes/remoteclusters/elasticsearch.yaml b/config/recipes/remoteclusters/elasticsearch.yaml index 4b3a302332..d350e2bd87 100644 --- a/config/recipes/remoteclusters/elasticsearch.yaml +++ b/config/recipes/remoteclusters/elasticsearch.yaml @@ -9,7 +9,7 @@ metadata: name: cluster1 namespace: ns1 spec: - version: 9.1.0 + version: 9.1.1 remoteClusters: - name: to-ns2-cluster2 elasticsearchRef: @@ -38,7 +38,7 @@ spec: # spec: # # expose this cluster Service with a LoadBalancer # type: LoadBalancer - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: "cluster1" @@ -54,7 +54,7 @@ metadata: name: cluster2 namespace: ns2 spec: - version: 9.1.0 + version: 9.1.1 ## Required for this cluster to be accessed using remote cluster API keys. remoteClusterServer: enabled: true @@ -75,7 +75,7 @@ spec: # spec: # # expose this cluster Service with a LoadBalancer # type: LoadBalancer - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: "cluster2" \ No newline at end of file diff --git a/config/recipes/traefik/02-elastic-stack.yaml b/config/recipes/traefik/02-elastic-stack.yaml index 7d39dbaee9..4aeba5de87 100644 --- a/config/recipes/traefik/02-elastic-stack.yaml +++ b/config/recipes/traefik/02-elastic-stack.yaml @@ -6,7 +6,7 @@ metadata: labels: app: hulk spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: master count: 1 @@ -41,7 +41,7 @@ metadata: labels: app: hulk spec: - version: 9.1.0 + version: 9.1.1 count: 1 config: xpack.fleet.packages: @@ -57,7 +57,7 @@ metadata: labels: app: hulk spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: hulk diff --git a/config/samples/apm/apm_es_kibana.yaml b/config/samples/apm/apm_es_kibana.yaml index 5eabe64040..9a60b78889 100644 --- a/config/samples/apm/apm_es_kibana.yaml +++ b/config/samples/apm/apm_es_kibana.yaml @@ -5,7 +5,7 @@ kind: Elasticsearch metadata: name: es-apm-sample spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -19,7 +19,7 @@ kind: Kibana metadata: name: kb-apm-sample spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: "es-apm-sample" @@ -33,7 +33,7 @@ kind: ApmServer metadata: name: apm-apm-sample spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: "es-apm-sample" diff --git a/config/samples/elasticsearch/elasticsearch.yaml b/config/samples/elasticsearch/elasticsearch.yaml index 6f11271c57..e37eac5db1 100644 --- a/config/samples/elasticsearch/elasticsearch.yaml +++ b/config/samples/elasticsearch/elasticsearch.yaml @@ -7,7 +7,7 @@ metadata: # eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone" name: elasticsearch-sample spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default config: diff --git a/config/samples/kibana/kibana_es.yaml b/config/samples/kibana/kibana_es.yaml index 613065b43e..fbb6d8e55b 100644 --- a/config/samples/kibana/kibana_es.yaml +++ b/config/samples/kibana/kibana_es.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 1 @@ -18,7 +18,7 @@ kind: Kibana metadata: name: kibana-sample spec: - version: 9.1.0 + version: 9.1.1 count: 1 elasticsearchRef: name: "elasticsearch-sample" diff --git a/config/samples/logstash/logstash.yaml b/config/samples/logstash/logstash.yaml index 90694c6dbf..350c194c87 100644 --- a/config/samples/logstash/logstash.yaml +++ b/config/samples/logstash/logstash.yaml @@ -3,7 +3,7 @@ kind: Logstash metadata: name: logstash-sample spec: - version: 9.1.0 + version: 9.1.1 count: 3 config: log.level: info diff --git a/config/samples/logstash/logstash_es.yaml b/config/samples/logstash/logstash_es.yaml index 606eb79d32..ac7fd4e002 100644 --- a/config/samples/logstash/logstash_es.yaml +++ b/config/samples/logstash/logstash_es.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 2 @@ -16,7 +16,7 @@ metadata: name: logstash-sample spec: count: 1 - version: 9.1.0 + version: 9.1.1 elasticsearchRefs: - clusterName: production name: elasticsearch-sample diff --git a/config/samples/logstash/logstash_pv.yaml b/config/samples/logstash/logstash_pv.yaml index 52683b0bfc..559f9ee2e0 100644 --- a/config/samples/logstash/logstash_pv.yaml +++ b/config/samples/logstash/logstash_pv.yaml @@ -4,7 +4,7 @@ metadata: name: d spec: count: 1 - version: 9.1.0 + version: 9.1.1 config: queue.type: persisted pipelines: diff --git a/config/samples/logstash/logstash_stackmonitor.yaml b/config/samples/logstash/logstash_stackmonitor.yaml index c82fe163ad..beac6d9a27 100644 --- a/config/samples/logstash/logstash_stackmonitor.yaml +++ b/config/samples/logstash/logstash_stackmonitor.yaml @@ -4,7 +4,7 @@ kind: Elasticsearch metadata: name: monitoring spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -17,7 +17,7 @@ metadata: name: logstash-sample spec: count: 1 - version: 9.1.0 + version: 9.1.1 config: log.level: info api.http.host: "0.0.0.0" @@ -55,7 +55,7 @@ kind: Kibana metadata: name: kibana-sample spec: - version: 9.1.0 + version: 9.1.1 elasticsearchRef: name: monitoring count: 1 diff --git a/config/samples/logstash/logstash_svc.yaml b/config/samples/logstash/logstash_svc.yaml index d83545d3cb..ce53d6f111 100644 --- a/config/samples/logstash/logstash_svc.yaml +++ b/config/samples/logstash/logstash_svc.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch-sample spec: - version: 9.1.0 + version: 9.1.1 nodeSets: - name: default count: 3 @@ -16,7 +16,7 @@ metadata: name: logstash-sample spec: count: 2 - version: 9.1.0 + version: 9.1.1 config: log.level: info api.http.host: "0.0.0.0"