git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68208 from adisbladis/elk-bumps

Bump elasticsearch 6/7 versions

commit07fa0411403ac3e0aefed5de78541f639488baec authoradisbladis <adisbladis@gmail.com> dateSat 7 Sep 2019, 13:58 (7 years ago) parent735e3d188a70c9
12 files changed+52−43
nixos/modules/services/search/kibana.nix+1−1 pkgs/development/python-modules/elasticsearch-curator/default.nix+4 pkgs/development/tools/misc/kibana/6.x.nix+4−4 pkgs/development/tools/misc/kibana/7.x.nix+6−6 pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch+19 pkgs/misc/logging/beats/6.x.nix+1−1 pkgs/misc/logging/beats/7.x.nix+1−1 pkgs/servers/search/elasticsearch/6.x.nix+2−2 pkgs/servers/search/elasticsearch/7.x.nix+5−5 pkgs/tools/misc/logstash/6.x.nix+2−2 pkgs/tools/misc/logstash/7.x.nix+2−2 pkgs/top-level/all-packages.nix+5−19
nixos/modules/services/search/kibana.nix+1−1
@@ -9,7 +9,7 @@ let
99 lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0;
1010
1111 cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
12− (filterAttrsRecursive (n: v: v != null) ({
12+ (filterAttrsRecursive (n: v: v != null && v != []) ({
1313 server.host = cfg.listenAddress;
1414 server.port = cfg.port;
1515 server.ssl.certificate = cfg.cert;
pkgs/development/python-modules/elasticsearch-curator/default.nix+4
@@ -45,6 +45,10 @@ buildPythonPackage rec {
4545 funcsigs
4646 ];
4747
48+ postPatch = ''
49+ sed -i s/pyyaml==3.12/pyyaml==${pyyaml.version}/ setup.cfg setup.py
50+ '';
51+
4852 meta = with stdenv.lib; {
4953 homepage = https://github.com/elastic/curator;
5054 description = "Curate, or manage, your Elasticsearch indices and snapshots";
pkgs/development/tools/misc/kibana/6.x.nix+4−4
@@ -18,12 +18,12 @@ let
1818 shas =
1919 if enableUnfree
2020 then {
21− x86_64-linux = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn";
22− x86_64-darwin = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c";
21+ "x86_64-linux" = "1xwklhqxk5rmdrgy2simwvijzq29kyq5w2w3hy53xh2i1zlnyvq3";
22+ "x86_64-darwin" = "1qpdn28mrpggd55khzqqld6r89l0hb870rigxcw2i8p2yx3jv106";
2323 }
2424 else {
25− x86_64-linux = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk";
26− x86_64-darwin = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk";
25+ "x86_64-linux" = "1wpnwal2rq5v2bsp5qil9j6dplif7ql5394sy4ia5ghp2fzifxmf";
26+ "x86_64-darwin" = "12z8i0wbw10c097glbpdy350p0h3957433f51qfx2p0ghgkzkhzv";
2727 };
2828
2929in stdenv.mkDerivation rec {
pkgs/development/tools/misc/kibana/7.x.nix+6−6
@@ -18,12 +18,12 @@ let
1818 shas =
1919 if enableUnfree
2020 then {
21− x86_64-linux = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8";
22− x86_64-darwin = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7";
21+ "x86_64-linux" = "0sc5709k3z7lb8qcjpj49s6vfv69ds2wc8319ag9x776nyz1pqxi";
22+ "x86_64-darwin" = "0zh4q46vfdwaihs838ck8fap92i3b4x10wbpmx8mcwyfk5v0fkch";
2323 }
2424 else {
25− x86_64-linux = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38";
26− x86_64-darwin = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2";
25+ "x86_64-linux" = "1pq17fasryharvw4byybvmcf5172hcmy6cp0m8bxhkxagwilprba";
26+ "x86_64-darwin" = "11crpx2qs2nzkzv6fvs1gqn9v4zalxkzsc5br0fy1y02lzm26zbm";
2727 };
2828
2929in stdenv.mkDerivation rec {
@@ -32,14 +32,14 @@ in stdenv.mkDerivation rec {
3232
3333 src = fetchurl {
3434 url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
35− sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
35+ sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
3636 };
3737
3838 patches = [
3939 # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3.
4040 # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just
4141 # disable the version check.
42− ./disable-nodejs-version-check.patch
42+ ./disable-nodejs-version-check-7.patch
4343 ];
4444
4545 buildInputs = [ makeWrapper ];
pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patchnew file+19
@@ -0,0 +1,19 @@
1+diff --git a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js
2+index 3f611e5a..f5c60c85 100644
3+--- a/src/setup_node_env/node_version_validator.js
4++++ b/src/setup_node_env/node_version_validator.js
5+@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This is written in ES5 so we c
6+ var currentVersion = process && process.version || null;
7+ var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null;
8+ var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion;
9+-var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
10++var isVersionValid = !!currentVersion && !!requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts.
11+
12+ if (!isVersionValid) {
13+ var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit.
14+
15+ console.error(errorMessage);
16+ process.exit(1);
17+-}
18+\ No newline at end of file
19++}
pkgs/misc/logging/beats/6.x.nix+1−1
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
88 owner = "elastic";
99 repo = "beats";
1010 rev = "v${version}";
11− sha256 = "0if08dxibdnqpsxs8f6hvw147j0j8bavhcm11scn28j9id65absq";
11+ sha256 = "0jkiz5dfdi9zsji04ipcmcj7pml9294v455y7s2c22k24gyzbaw8";
1212 };
1313
1414 goPackagePath = "github.com/elastic/beats";
pkgs/misc/logging/beats/7.x.nix+1−1
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
88 owner = "elastic";
99 repo = "beats";
1010 rev = "v${version}";
11− sha256 = "1ca6a4zm062jpqwhmd8ivvzha1cvrw7mg5342vnmn99xdlr1pk9j";
11+ sha256 = "0715fgqw6mqms4zld8wyf6appvvpfb1hglcmcn852c66a8zwr2r2";
1212 };
1313
1414 goPackagePath = "github.com/elastic/beats";
pkgs/servers/search/elasticsearch/6.x.nix+2−2
@@ -19,8 +19,8 @@ stdenv.mkDerivation (rec {
1919 url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
2020 sha256 =
2121 if enableUnfree
22− then "1a88yyl0x4bsx92m3wjsz1fgm76gbfdzcd4bzp2x652rha667vfh"
23− else "04fa0fk25d5yxcjdj0bwqvdrswgwj31fwjvbq4gpg66c6bqwzcn6";
22+ then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42"
23+ else "0s04xz3j4psyhawvy503sp2nl5s0gswmpd9wfvwnavgcrr23wk39";
2424 };
2525
2626 patches = [ ./es-home-6.x.patch ];
pkgs/servers/search/elasticsearch/7.x.nix+5−5
@@ -17,12 +17,12 @@ let
1717 shas =
1818 if enableUnfree
1919 then {
20− x86_64-linux = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik";
21− x86_64-darwin = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18";
20+ "x86_64-linux" = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9";
21+ "x86_64-darwin" = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz";
2222 }
2323 else {
24− x86_64-linux = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10";
25− x86_64-darwin = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2";
24+ "x86_64-linux" = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg";
25+ "x86_64-darwin" = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf";
2626 };
2727in
2828stdenv.mkDerivation (rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
3131
3232 src = fetchurl {
3333 url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz";
34− sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
34+ sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture");
3535 };
3636
3737 patches = [ ./es-home-6.x.patch ];
pkgs/tools/misc/logstash/6.x.nix+2−2
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
1717 sha256 =
1818 if enableUnfree
19− then "178shgxwc9kw9w9vwsvwxp8m8r6lssaw1i32vvmx9na01b4w5m4p"
20− else "0gyq97qsg7fys9cc5yj4kpcf3xxvdd5qgzal368yg9swps37g5yj";
19+ then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053"
20+ else "0spxgqsyh72n0l0xh6rljp0lbqz46xmr02sqz25ybycr4qkxdhgk";
2121 };
2222
2323 dontBuild = true;
pkgs/tools/misc/logstash/7.x.nix+2−2
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
1717 sha256 =
1818 if enableUnfree
19− then "0ls7ia4ldyb7kslmjqhszb30bkammdm5nydc5y7r41zl1zjlhfgc"
20− else "1mpmfnc57vpjk8x3vibamz8lgq163msf20m1bail4hbwhwsmms9i";
19+ then "1mw053bx2zh5320p545ax8fnydzqj28r239l7a4m1d2shi89w6s8"
20+ else "0d57ahak4chxmd0pmgkbmig2wacprv120pwmjlx63sxf5vw72yap";
2121 };
2222
2323 dontBuild = true;
pkgs/top-level/all-packages.nix+5−19
@@ -1066,22 +1066,14 @@ in
10661066
10671067 bchunk = callPackage ../tools/cd-dvd/bchunk { };
10681068
1069− inherit (callPackages ../misc/logging/beats/6.x.nix {
1070− # XXX: this is failing with Go 1.12. Error is related to cgo, an
1071− # update to this package might fix it.
1072− buildGoPackage = buildGo111Package;
1073− })
1069+ inherit (callPackages ../misc/logging/beats/6.x.nix { })
10741070 filebeat6
10751071 heartbeat6
10761072 metricbeat6
10771073 packetbeat6
10781074 journalbeat6;
10791075
1080− inherit (callPackages ../misc/logging/beats/7.x.nix {
1081− # XXX: this is failing with Go 1.12. Error is related to cgo, an
1082− # update to this package might fix it.
1083− buildGoPackage = buildGo111Package;
1084− })
1076+ inherit (callPackages ../misc/logging/beats/7.x.nix { })
10851077 filebeat7
10861078 heartbeat7
10871079 metricbeat7
@@ -2873,8 +2865,8 @@ in
28732865 evemu = callPackage ../tools/system/evemu { };
28742866
28752867 # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
2876− elk6Version = "6.7.2";
2877− elk7Version = "7.0.1";
2868+ elk6Version = "6.8.3";
2869+ elk7Version = "7.3.1";
28782870
28792871 elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
28802872 utillinux = utillinuxMinimal;
@@ -2914,13 +2906,7 @@ in
29142906 sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
29152907 };
29162908 });
2917− pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
2918− version = "3.12";
2919− src = oldAttrs.src.override {
2920− inherit version;
2921− sha256 = "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr";
2922− };
2923− });
2909+ pyyaml = super.pyyaml_3;
29242910 };
29252911 }).pkgs; toPythonApplication elasticsearch-curator;
29262912