Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

elastic - bump from 7.17.16 to 7.17.26 #1136

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/mkCI.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
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.16"
stack-version: '7.17.26'
- name: Display indexes
run: curl -s -I -X GET http://localhost:9200/_cat/indices
- name: Build the env
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

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.16
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.26
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.16
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.26
livenessProbe:
httpGet:
path: /_cluster/health
Expand Down
12 changes: 4 additions & 8 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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 ];
Expand Down
Loading