From 003f72f0740989601d4b8fc0d966deb6761b66e0 Mon Sep 17 00:00:00 2001 From: "Eric J. Smith" Date: Sat, 6 Apr 2024 17:05:48 -0500 Subject: [PATCH] Update elasticsearch --- .devcontainer/docker-compose.yml | 4 ++-- Dockerfile | 4 ++-- build/docker/elasticsearch/7.x/Dockerfile | 2 +- build/docker/elasticsearch/8.x/Dockerfile | 2 +- docker/docker-compose.7x.yml | 4 ++-- 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/ex-prod-tasks.ps1 | 6 +++--- k8s/ex-setup.ps1 | 4 ++-- k8s/exceptionless/values.yaml | 2 +- samples/docker-compose.all-in-one.yml | 2 +- samples/docker-compose.yml | 4 ++-- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 82c7522fec..2be2aa4bda 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.11.1 + image: exceptionless/elasticsearch:8.13.1 environment: node.name: elasticsearch cluster.name: exceptionless @@ -38,7 +38,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.11.1 + image: docker.elastic.co/kibana/kibana:8.13.1 environment: xpack.security.enabled: "false" ports: diff --git a/Dockerfile b/Dockerfile index aed38c8b5f..2d33dece21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"] # completely self-contained -FROM exceptionless/elasticsearch:8.11.1 AS exceptionless +FROM exceptionless/elasticsearch:8.13.1 AS exceptionless WORKDIR /app COPY --from=job-publish /app/src/Exceptionless.Job/out ./ @@ -157,7 +157,7 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"] # completely self-contained 7.x -FROM exceptionless/elasticsearch:7.17.18 AS exceptionless7 +FROM exceptionless/elasticsearch:7.17.19 AS exceptionless7 WORKDIR /app COPY --from=job-publish /app/src/Exceptionless.Job/out ./ diff --git a/build/docker/elasticsearch/7.x/Dockerfile b/build/docker/elasticsearch/7.x/Dockerfile index e2466c47f5..5b3c3b791d 100644 --- a/build/docker/elasticsearch/7.x/Dockerfile +++ b/build/docker/elasticsearch/7.x/Dockerfile @@ -1,5 +1,5 @@ # https://www.docker.elastic.co/ -FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.18 +FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.19 RUN elasticsearch-plugin install -b mapper-size RUN elasticsearch-plugin install -b repository-azure diff --git a/build/docker/elasticsearch/8.x/Dockerfile b/build/docker/elasticsearch/8.x/Dockerfile index 9459b8b95a..03efc823c7 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.12.1 +FROM docker.elastic.co/elasticsearch/elasticsearch:8.13.1 RUN elasticsearch-plugin install -b mapper-size RUN elasticsearch-plugin install -b repository-azure diff --git a/docker/docker-compose.7x.yml b/docker/docker-compose.7x.yml index 34defbfea3..296a4b8477 100644 --- a/docker/docker-compose.7x.yml +++ b/docker/docker-compose.7x.yml @@ -2,7 +2,7 @@ version: "2.2" services: elasticsearch: - image: exceptionless/elasticsearch:7.17.18 + image: exceptionless/elasticsearch:7.17.19 environment: discovery.type: single-node xpack.security.enabled: "false" @@ -16,7 +16,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:7.17.18 + image: docker.elastic.co/kibana/kibana:7.17.19 ports: - 5601:5601 diff --git a/docker/docker-compose.apm.yml b/docker/docker-compose.apm.yml index 3c86ddfaaf..404b7c9a0c 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.12.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1 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.12.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1 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.12.1 + image: docker.elastic.co/kibana/kibana:8.13.1 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.12.1 + image: docker.elastic.co/apm/apm-server:8.13.1 volumes: - certs:/usr/share/apm-server/certs ports: diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index d28db781fa..15e7491883 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.12.1 + image: exceptionless/elasticsearch:8.13.1 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.12.1 + image: docker.elastic.co/kibana/kibana:8.13.1 ports: - 5601:5601 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a0dff4f19d..59712d45d6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.9" services: elasticsearch: - image: exceptionless/elasticsearch:8.12.1 + image: exceptionless/elasticsearch:8.13.1 environment: node.name: elasticsearch cluster.name: exceptionless @@ -18,7 +18,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.12.1 + image: docker.elastic.co/kibana/kibana:8.13.1 environment: xpack.security.enabled: "false" ports: diff --git a/k8s/elastic-monitor.yaml b/k8s/elastic-monitor.yaml index 65676ac5cc..d7054cb787 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.11.1 + version: 8.13.1 nodeSets: - name: main count: 3 @@ -50,7 +50,7 @@ metadata: name: kibana-monitor namespace: elastic-system spec: - version: 8.11.1 + version: 8.13.1 count: 1 elasticsearchRef: name: elastic-monitor @@ -144,7 +144,7 @@ metadata: name: fleet-server namespace: elastic-system spec: - version: 8.11.1 + version: 8.13.1 kibanaRef: name: kibana-monitor elasticsearchRefs: @@ -168,7 +168,7 @@ metadata: name: elastic-agent namespace: elastic-system spec: - version: 8.11.1 + version: 8.13.1 kibanaRef: name: kibana-monitor fleetServerRef: diff --git a/k8s/ex-dev-elasticsearch.yaml b/k8s/ex-dev-elasticsearch.yaml index 14ea649fe3..c73b17e077 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.11.1 - image: exceptionless/elasticsearch:8.11.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch + version: 8.13.1 + image: exceptionless/elasticsearch:8.13.1 # 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.11.1 + version: 8.13.1 count: 1 elasticsearchRef: name: ex-dev diff --git a/k8s/ex-prod-elasticsearch.yaml b/k8s/ex-prod-elasticsearch.yaml index cf21212913..26a345c1f2 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.11.1 - image: exceptionless/elasticsearch:8.11.1 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch + version: 8.13.1 + image: exceptionless/elasticsearch:8.13.1 # 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.11.1 + version: 8.13.1 count: 1 elasticsearchRef: name: ex-prod diff --git a/k8s/ex-prod-tasks.ps1 b/k8s/ex-prod-tasks.ps1 index 11b3a38846..5bb88eb01d 100644 --- a/k8s/ex-prod-tasks.ps1 +++ b/k8s/ex-prod-tasks.ps1 @@ -79,9 +79,9 @@ helm upgrade vpa fairwinds-stable/vpa --namespace vpa -f vpa-values.yaml --reset # upgrade elasticsearch operator # https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html # https://github.com/elastic/cloud-on-k8s/releases -kubectl replace -f https://download.elastic.co/downloads/eck/2.10.0/crds.yaml -kubectl create -f https://download.elastic.co/downloads/eck/2.10.0/crds.yaml -kubectl apply -f https://download.elastic.co/downloads/eck/2.10.0/operator.yaml +kubectl replace -f https://download.elastic.co/downloads/eck/2.12.1/crds.yaml +kubectl create -f https://download.elastic.co/downloads/eck/2.12.1/crds.yaml +kubectl apply -f https://download.elastic.co/downloads/eck/2.12.1/operator.yaml # upgrade elasticsearch kubectl apply --namespace ex-prod -f ex-prod-elasticsearch.yaml diff --git a/k8s/ex-setup.ps1 b/k8s/ex-setup.ps1 index 62e1466f2b..a115133ac5 100644 --- a/k8s/ex-setup.ps1 +++ b/k8s/ex-setup.ps1 @@ -60,8 +60,8 @@ kubectl config set-context --current --namespace=ex-$ENV # setup elasticsearch operator # https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-quickstart.html # https://github.com/elastic/cloud-on-k8s/releases -kubectl create -f https://download.elastic.co/downloads/eck/2.10.0/crds.yaml -kubectl apply -f https://download.elastic.co/downloads/eck/2.10.0/operator.yaml +kubectl create -f https://download.elastic.co/downloads/eck/2.12.1/crds.yaml +kubectl apply -f https://download.elastic.co/downloads/eck/2.12.1/operator.yaml # view ES operator logs kubectl -n elastic-system logs -f statefulset.apps/elastic-operator diff --git a/k8s/exceptionless/values.yaml b/k8s/exceptionless/values.yaml index d21b6fc440..9be1f19cb1 100644 --- a/k8s/exceptionless/values.yaml +++ b/k8s/exceptionless/values.yaml @@ -51,7 +51,7 @@ elasticsearch: connectionString: image: repository: exceptionless/elasticsearch - tag: 8.11.1 + tag: 8.13.1 pullPolicy: IfNotPresent redis: diff --git a/samples/docker-compose.all-in-one.yml b/samples/docker-compose.all-in-one.yml index f0f7bf8e93..02142e7eb4 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.11.1 + image: docker.elastic.co/kibana/kibana:8.13.1 ports: - 5601:5601 diff --git a/samples/docker-compose.yml b/samples/docker-compose.yml index d4da7f9732..bbe545948b 100644 --- a/samples/docker-compose.yml +++ b/samples/docker-compose.yml @@ -44,7 +44,7 @@ services: - ex_appdata:/app/storage elasticsearch: - image: exceptionless/elasticsearch:8.11.1 + image: exceptionless/elasticsearch:8.13.1 environment: discovery.type: single-node xpack.security.enabled: "false" @@ -58,7 +58,7 @@ services: kibana: depends_on: - elasticsearch - image: docker.elastic.co/kibana/kibana:8.11.1 + image: docker.elastic.co/kibana/kibana:8.13.1 ports: - 5601:5601