ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17305 from hiberno/update-elk-stack

Browse Source 
Update elk stack
This commit is contained in:
Rok Garbas 2016-07-27 18:42:08 +02:00 committed by GitHub
commit 14e8071921
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/logging/logstash.nix
View File

@ -51,12 +51,6 @@ in
description = "Logging verbosity level."; description = "Logging verbosity level.";
}; };
watchdogTimeout = mkOption {
type = types.int;
default = 10;
description = "Set watchdog timeout value in seconds.";
};
filterWorkers = mkOption { filterWorkers = mkOption {
type = types.int; type = types.int;
default = 1; default = 1;
@ -140,7 +134,6 @@ in
"-w ${toString cfg.filterWorkers} " + "-w ${toString cfg.filterWorkers} " +
ops havePluginPath "--pluginpath ${pluginPath} " + ops havePluginPath "--pluginpath ${pluginPath} " +
"${verbosityFlag} " + "${verbosityFlag} " +
"--watchdog-timeout ${toString cfg.watchdogTimeout} " +
"-f ${writeText "logstash.conf" '' "-f ${writeText "logstash.conf" ''
input { input {
${cfg.inputConfig} ${cfg.inputConfig}

4
pkgs/development/tools/misc/kibana/default.nix
View File

@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kibana-${version}"; name = "kibana-${version}";
version = "4.5.1"; version = "4.5.2";
src = fetchurl { src = fetchurl {
url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz"; url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
sha256 = "0k9pmzx2sa3026yw29f2h2lddxdkhyn3jvdf3si8scz70ncwylj9"; sha256 = "1na8xh525znxaqjhxfvpx0q3rj85cjb6l9zlzd44dl31a9l117y4";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];

4
pkgs/servers/search/elasticsearch/2.x.nix
View File

@ -3,12 +3,12 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.3.1"; version = "2.3.4";
name = "elasticsearch-${version}"; name = "elasticsearch-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz";
sha256 = "1fqf24bv4jfxai507jh91zm94dp1j8kmygljvpy7414f0drjw2gh"; sha256 = "0vphyqhna510y8bcihlmz3awzszgyfpmzrfcy548a2pd9mghq7ip";
}; };
patches = [ ./es-home-2.x.patch ]; patches = [ ./es-home-2.x.patch ];

4
pkgs/tools/misc/logstash/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.5.3"; version = "2.3.4";
name = "logstash-${version}"; name = "logstash-${version}";
src = fetchurl { src = fetchurl {
url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz";
sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b"; sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz";
}; };
dontBuild = true; dontBuild = true;