diff --git a/.github/workflows/mkCI.dhall b/.github/workflows/mkCI.dhall index f3e5fe544..01b74c30d 100644 --- a/.github/workflows/mkCI.dhall +++ b/.github/workflows/mkCI.dhall @@ -39,7 +39,7 @@ in { GithubActions , GithubActions.Step::{ , name = Some "Runs Elasticsearch" , uses = Some "elastic/elastic-github-actions/elasticsearch@master" - , `with` = Some (toMap { stack-version = "7.17.5" }) + , `with` = Some (toMap { stack-version = "7.17.26" }) } , GithubActions.Step::{ , name = Some "Display indexes" diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index 87777d446..e75c64ed6 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -20,7 +20,7 @@ jobs: - name: Runs Elasticsearch uses: "elastic/elastic-github-actions/elasticsearch@master" with: - stack-version: "7.17.16" + stack-version: '7.17.26' - name: Display indexes run: curl -s -I -X GET http://localhost:9200/_cat/indices - name: Build the env diff --git a/CHANGELOG.md b/CHANGELOG.md index bc02fdec3..9ab465c21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file. ### Added ### Changed + +- [compose] Bumped Elasticsearch to 7.17.26. + ### Removed ### Fixed diff --git a/docker-compose.yml b/docker-compose.yml index d42d1ab56..d9bcee767 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: retries: 6 test: "curl --silent --fail localhost:9200/_cluster/health || exit 1" timeout: "60s" - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.26 restart: unless-stopped ulimits: nofile: diff --git a/k8s/elastic-deployment.yaml b/k8s/elastic-deployment.yaml index 9551ca7a8..bd3c99010 100644 --- a/k8s/elastic-deployment.yaml +++ b/k8s/elastic-deployment.yaml @@ -28,7 +28,7 @@ spec: value: -Xms512m -Xmx512m - name: discovery.type value: single-node - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.26 livenessProbe: httpGet: path: /_cluster/health diff --git a/nix/default.nix b/nix/default.nix index bf419e40a..416d7b4f8 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -105,12 +105,12 @@ in rec { arch = pkgs.lib.elemAt info 0; plat = pkgs.lib.elemAt info 1; elasticsearch = pkgsNonFree.elasticsearch7.overrideAttrs (old: rec { - version = "7.17.16"; + version = "7.17.26"; name = "elasticsearch-${version}"; src = pkgs.fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; - sha256 = "o0ftRysyy1xp5M9bkKUZaQ2OvAnyHr6zCmoIPY0adZY="; + sha256 = "lUI+cWZMQ5Rm20Pj+bXH+62pQdf2+li3wrOgmpncYWE="; }; }); elasticsearch-home = "~/.local/share/monocle/elasticsearch-home"; @@ -355,12 +355,8 @@ in rec { exec ${pkgs.nodejs}/bin/npm start ''; - services-req = [ - kibanaStart - elasticsearchStart - monocleReplStart - monocleWebStart - ]; + services-req = + [ kibanaStart elasticsearchStart monocleReplStart monocleWebStart ]; # define the base requirements base-req = [ pkgs.bashInteractive hspkgs.coreutils pkgs.gnumake ];