From b85927de51842ca9a9e5d8085cd6bfce1f4491e5 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 1 Jan 2024 15:03:56 +0000 Subject: [PATCH 1/7] chore: Update k8s stack yaml files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 55d368ffadc..0fe374382cd 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.13.0-4f8l51qr-SNAPSHOT + version: 8.13.0-p45l43ib-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 179c1b3bffb..740c873e0a4 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.13.0-4f8l51qr-SNAPSHOT + version: 8.13.0-p45l43ib-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 4fe246b629d..ed57d9af118 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.13.0-4f8l51qr-SNAPSHOT + version: 8.13.0-p45l43ib-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From c81e404743b54bcd924a65063a7194d2ae9f6209 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Mon, 1 Jan 2024 15:04:02 +0000 Subject: [PATCH 2/7] chore: Update docker-compose.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 976908db7e4..b9acdf5172e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-4f8l51qr-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-p45l43ib-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.13.0-4f8l51qr-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.13.0-p45l43ib-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.13.0-4f8l51qr-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.13.0-p45l43ib-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" From 5317ced5616a587baf0def049cc510458c6ead72 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 2 Jan 2024 15:04:14 +0000 Subject: [PATCH 3/7] chore: Update k8s stack yaml files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 0fe374382cd..fcf8f08b993 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.13.0-p45l43ib-SNAPSHOT + version: 8.13.0-42wme37p-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 740c873e0a4..04bee4b6306 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.13.0-p45l43ib-SNAPSHOT + version: 8.13.0-42wme37p-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index ed57d9af118..1c42c160fda 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.13.0-p45l43ib-SNAPSHOT + version: 8.13.0-42wme37p-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch From 52a6c37a4b19a719b94c79c174bdd14200dcff9f Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 2 Jan 2024 15:04:20 +0000 Subject: [PATCH 4/7] chore: Update docker-compose.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b9acdf5172e..ec392d98593 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-p45l43ib-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-42wme37p-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.13.0-p45l43ib-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.13.0-42wme37p-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.13.0-p45l43ib-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.13.0-42wme37p-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" From bad07d4990bd9c30abc168c9e1511703dbed50ff Mon Sep 17 00:00:00 2001 From: kruskal <99559985+kruskall@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:28:22 +0100 Subject: [PATCH 5/7] build: update notice year --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 8047f9493a0..52c9d8dfaf0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Elastic APM Server -Copyright 2014-2023 Elasticsearch BV +Copyright 2014-2024 Elasticsearch BV This product includes software developed by The Apache Software Foundation (http://www.apache.org/). From 1f0a448a0be129b650fe781857cc8ad76d2f15fe Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 3 Jan 2024 15:04:00 +0000 Subject: [PATCH 6/7] chore: Update docker-compose.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ec392d98593..c5166b23c38 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ x-logging: &default-logging max-size: "1g" services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-42wme37p-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-toucn398-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -41,7 +41,7 @@ services: logging: *default-logging kibana: - image: docker.elastic.co/kibana/kibana:8.13.0-42wme37p-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.13.0-toucn398-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -60,7 +60,7 @@ services: logging: *default-logging metricbeat: - image: docker.elastic.co/beats/metricbeat:8.13.0-42wme37p-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.13.0-toucn398-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" From fb20ce041cd28099f94931f3059638f0cd91680e Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 3 Jan 2024 15:04:07 +0000 Subject: [PATCH 7/7] chore: Update k8s stack yaml files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index fcf8f08b993..c034cf2f061 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -3,7 +3,7 @@ kind: ApmServer metadata: name: apm-server spec: - version: 8.13.0-42wme37p-SNAPSHOT + version: 8.13.0-toucn398-SNAPSHOT count: 1 http: tls: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 04bee4b6306..753a04e3c07 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.13.0-42wme37p-SNAPSHOT + version: 8.13.0-toucn398-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index 1c42c160fda..72a15b08936 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.13.0-42wme37p-SNAPSHOT + version: 8.13.0-toucn398-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch