Skip to content

Commit

Permalink
Merge pull request #1103 from morucci/bump-elastic-version
Browse files Browse the repository at this point in the history
elastic - bump to latest 7.17.16
  • Loading branch information
mergify[bot] authored Jan 6, 2024
2 parents 4548a0c + b179c07 commit 3793977
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Runs Elasticsearch
uses: "elastic/elastic-github-actions/elasticsearch@master"
with:
stack-version: '7.17.5'
stack-version: "7.17.16"
- name: Display indexes
run: curl -s -I -X GET http://localhost:9200/_cat/indices
- name: Build the env
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
- [api] The API no longer dumps large decoding error to the stdout.
Exceptions from the elastic API are now intercepted and displayed in a nicer format.
In a future change, such errors will be indexed for proper debugging.
- [compose] Bumped Elasticsearch to 7.17.16.

### Removed

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16
restart: unless-stopped
ulimits:
nofile:
Expand Down
2 changes: 1 addition & 1 deletion k8s/elastic-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
value: -Xms512m -Xmx512m
- name: discovery.type
value: single-node
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.5
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16
livenessProbe:
httpGet:
path: /_cluster/health
Expand Down
9 changes: 4 additions & 5 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,16 @@ in rec {
hExtend = haskellExtend;

# DB
elk7Version = "7.17.5";
info = pkgs.lib.splitString "-" pkgs.stdenv.hostPlatform.system;
arch = pkgs.lib.elemAt info 0;
plat = pkgs.lib.elemAt info 1;
elasticsearch = pkgsNonFree.elasticsearch7.overrideAttrs (old: rec {
version = elk7Version;
version = "7.17.16";
name = "elasticsearch-${version}";
src = pkgs.fetchurl {
url =
"https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz";
sha256 = "ocz3CJFf+diThmocrgSnhWW/fjuRLLyCxwUKl3Cm7WA=";
sha256 = "o0ftRysyy1xp5M9bkKUZaQ2OvAnyHr6zCmoIPY0adZY=";
};
});
elasticsearch-home = "~/.local/share/monocle/elasticsearch-home";
Expand All @@ -128,7 +127,7 @@ in rec {
export ES_HOME=${elasticsearch-home}
mkdir -p $ES_HOME/logs $ES_HOME/data $ES_HOME/modules $ES_HOME/plugins
${pkgs.rsync}/bin/rsync -a ${elasticsearch}/config/ $ES_HOME/config/
${pkgs.rsync}/bin/rsync -a ${elasticsearch}/modules/ $ES_HOME/modules/
${pkgs.rsync}/bin/rsync -a --delete ${elasticsearch}/modules/ $ES_HOME/modules/
find $ES_HOME -type f | xargs chmod 0600
find $ES_HOME -type d | xargs chmod 0700
find $ES_HOME/modules -type f | xargs chmod 0700
Expand All @@ -137,7 +136,7 @@ in rec {
'';
# DB Companion
kibana = pkgsNonFree.kibana7.overrideAttrs (old: rec {
version = elk7Version;
version = "7.17.5";
name = "kibana-${version}";
src = pkgs.fetchurl {
url =
Expand Down

0 comments on commit 3793977

Please sign in to comment.