From 77bfc5e672229631a6e00792b6b2e9952df57f6c Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Mon, 16 Dec 2024 17:34:12 -0600 Subject: [PATCH] Update to Elasticsearch 8.17.0 --- .devcontainer/docker-compose.yml | 4 ++-- Dockerfile | 2 +- build/docker/elasticsearch/8.x/Dockerfile | 2 +- docker/docker-compose.apm.yml | 8 ++++---- docker/docker-compose.dev.yml | 4 ++-- docker/docker-compose.yml | 4 ++-- k8s/elastic-monitor.yaml | 8 ++++---- k8s/ex-dev-elasticsearch.yaml | 6 +++--- k8s/ex-prod-elasticsearch.yaml | 6 +++--- k8s/exceptionless/values.yaml | 2 +- samples/docker-compose.all-in-one.yml | 2 +- samples/docker-compose.yml | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f5a314384..515b5c06d 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -22,7 +22,7 @@ services: # (Adding the "ports" property to this file will not forward from a Codespace.) elasticsearch: - image: exceptionless/elasticsearch:8.16.1 + image: exceptionless/elasticsearch:8.17.0 environment: node.name: elasticsearch cluster.name: exceptionless @@ -38,7 +38,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.16.1 + image: docker.elastic.co/kibana/kibana:8.17.0 environment: xpack.security.enabled: "false" ports: diff --git a/Dockerfile b/Dockerfile index 6e1576f77..cae57a7fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"] # completely self-contained -FROM exceptionless/elasticsearch:8.16.1 AS exceptionless +FROM exceptionless/elasticsearch:8.17.0 AS exceptionless WORKDIR /app COPY --from=job-publish /app/src/Exceptionless.Job/out ./ diff --git a/build/docker/elasticsearch/8.x/Dockerfile b/build/docker/elasticsearch/8.x/Dockerfile index 29277a8e5..32641cd75 100644 --- a/build/docker/elasticsearch/8.x/Dockerfile +++ b/build/docker/elasticsearch/8.x/Dockerfile @@ -1,5 +1,5 @@ # https://www.docker.elastic.co/ -FROM docker.elastic.co/elasticsearch/elasticsearch:8.16.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:8.17.0 RUN elasticsearch-plugin install -b mapper-size diff --git a/docker/docker-compose.apm.yml b/docker/docker-compose.apm.yml index 0a1bc5a5d..5a70989f2 100644 --- a/docker/docker-compose.apm.yml +++ b/docker/docker-compose.apm.yml @@ -2,7 +2,7 @@ version: "2.2" services: setup: - image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 volumes: - certs:/usr/share/elasticsearch/config/certs user: "0" @@ -53,7 +53,7 @@ services: depends_on: setup: condition: service_healthy - image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 volumes: - certs:/usr/share/elasticsearch/config/certs - esdata:/usr/share/elasticsearch/data @@ -98,7 +98,7 @@ services: depends_on: elasticsearch: condition: service_healthy - image: docker.elastic.co/kibana/kibana:8.16.1 + image: docker.elastic.co/kibana/kibana:8.17.0 volumes: - certs:/usr/share/kibana/config/certs ports: @@ -124,7 +124,7 @@ services: depends_on: elasticsearch: condition: service_healthy - image: docker.elastic.co/apm/apm-server:8.16.1 + image: docker.elastic.co/apm/apm-server:8.17.0 volumes: - certs:/usr/share/apm-server/certs ports: diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index afc7f5fa2..1418177d0 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -50,7 +50,7 @@ services: - appdata:/app/storage elasticsearch: - image: exceptionless/elasticsearch:8.16.1 + image: exceptionless/elasticsearch:8.17.0 environment: discovery.type: single-node xpack.security.enabled: "false" @@ -64,7 +64,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.16.1 + image: docker.elastic.co/kibana/kibana:8.17.0 ports: - 5601:5601 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 965df5930..e3df9cf51 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: exceptionless/elasticsearch:8.16.1 + image: exceptionless/elasticsearch:8.17.0 environment: node.name: elasticsearch cluster.name: exceptionless @@ -16,7 +16,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.16.1 + image: docker.elastic.co/kibana/kibana:8.17.0 environment: xpack.security.enabled: "false" ports: diff --git a/k8s/elastic-monitor.yaml b/k8s/elastic-monitor.yaml index 168e486c7..912222dd4 100644 --- a/k8s/elastic-monitor.yaml +++ b/k8s/elastic-monitor.yaml @@ -4,7 +4,7 @@ metadata: name: elastic-monitor namespace: elastic-system spec: - version: 8.16.1 + version: 8.17.0 podDisruptionBudget: {} nodeSets: - name: main @@ -51,7 +51,7 @@ metadata: name: kibana-monitor namespace: elastic-system spec: - version: 8.16.1 + version: 8.17.0 count: 1 elasticsearchRef: name: elastic-monitor @@ -145,7 +145,7 @@ metadata: name: fleet-server namespace: elastic-system spec: - version: 8.16.1 + version: 8.17.0 kibanaRef: name: kibana-monitor elasticsearchRefs: @@ -169,7 +169,7 @@ metadata: name: elastic-agent namespace: elastic-system spec: - version: 8.16.1 + version: 8.17.0 kibanaRef: name: kibana-monitor fleetServerRef: diff --git a/k8s/ex-dev-elasticsearch.yaml b/k8s/ex-dev-elasticsearch.yaml index 5a66c9ece..6e671e0b6 100644 --- a/k8s/ex-dev-elasticsearch.yaml +++ b/k8s/ex-dev-elasticsearch.yaml @@ -4,8 +4,8 @@ metadata: name: ex-dev namespace: ex-dev spec: - version: 8.16.1 - image: exceptionless/elasticsearch:8.16.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch + version: 8.17.0 + image: exceptionless/elasticsearch:8.17.0 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch secureSettings: - secretName: ex-dev-snapshots http: @@ -57,7 +57,7 @@ metadata: name: ex-dev namespace: ex-dev spec: - version: 8.16.1 + version: 8.17.0 count: 1 elasticsearchRef: name: ex-dev diff --git a/k8s/ex-prod-elasticsearch.yaml b/k8s/ex-prod-elasticsearch.yaml index 319971765..a55a76937 100644 --- a/k8s/ex-prod-elasticsearch.yaml +++ b/k8s/ex-prod-elasticsearch.yaml @@ -4,8 +4,8 @@ metadata: name: ex-prod namespace: ex-prod spec: - version: 8.16.1 - image: exceptionless/elasticsearch:8.16.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch + version: 8.17.0 + image: exceptionless/elasticsearch:8.17.0 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch monitoring: metrics: elasticsearchRefs: @@ -68,7 +68,7 @@ metadata: name: ex-prod namespace: ex-prod spec: - version: 8.16.1 + version: 8.17.0 count: 1 elasticsearchRef: name: ex-prod diff --git a/k8s/exceptionless/values.yaml b/k8s/exceptionless/values.yaml index bf6d1af55..b8ff2884f 100644 --- a/k8s/exceptionless/values.yaml +++ b/k8s/exceptionless/values.yaml @@ -51,7 +51,7 @@ elasticsearch: connectionString: image: repository: exceptionless/elasticsearch - tag: 8.16.1 + tag: 8.17.0 pullPolicy: IfNotPresent redis: diff --git a/samples/docker-compose.all-in-one.yml b/samples/docker-compose.all-in-one.yml index fac6b62e1..1d379bf22 100644 --- a/samples/docker-compose.all-in-one.yml +++ b/samples/docker-compose.all-in-one.yml @@ -20,7 +20,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.16.1 + image: docker.elastic.co/kibana/kibana:8.17.0 ports: - 5601:5601 diff --git a/samples/docker-compose.yml b/samples/docker-compose.yml index 312c5388e..9685e310d 100644 --- a/samples/docker-compose.yml +++ b/samples/docker-compose.yml @@ -44,11 +44,11 @@ services: - ex_appdata:/app/storage elasticsearch: - image: exceptionless/elasticsearch:8.16.1 + image: exceptionless/elasticsearch:8.17.0 environment: discovery.type: single-node xpack.security.enabled: "false" - ES_JAVA_OPTS: -Xms1g -Xmx1g + ES_JAVA_OPTS: -XX:UseSVE=0 -Xms1g -Xmx1g ports: - 9200:9200 - 9300:9300 @@ -58,7 +58,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.16.1 + image: docker.elastic.co/kibana/kibana:8.17.0 ports: - 5601:5601