From 6d68a1fbf3ce6837b01d6ed6b74d5b7a49ef2ca9 Mon Sep 17 00:00:00 2001
From: Christian Lask <christian@hiberno.net>
Date: Wed, 27 Jul 2016 17:45:38 +0200
Subject: [PATCH 1/3] logstash: 1.5.3 -> 2.3.4

Note: the option to configure the watchdog timeout seems to be gone
in the 2.3 series of Logstash. It complains about an unknown option
and it is not in the source anymore. I am thus removing this
configuration option to adjust the service to these changes, too.
---
 nixos/modules/services/logging/logstash.nix | 7 -------
 pkgs/tools/misc/logstash/default.nix        | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 2c3016d27df8..62f6e187ea07 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -51,12 +51,6 @@ in
         description = "Logging verbosity level.";
       };
 
-      watchdogTimeout = mkOption {
-        type = types.int;
-        default = 10;
-        description = "Set watchdog timeout value in seconds.";
-      };
-
       filterWorkers = mkOption {
         type = types.int;
         default = 1;
@@ -140,7 +134,6 @@ in
           "-w ${toString cfg.filterWorkers} " +
           ops havePluginPath "--pluginpath ${pluginPath} " +
           "${verbosityFlag} " +
-          "--watchdog-timeout ${toString cfg.watchdogTimeout} " +
           "-f ${writeText "logstash.conf" ''
             input {
               ${cfg.inputConfig}
diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix
index 289d57f88c06..e8f3ccf747d6 100644
--- a/pkgs/tools/misc/logstash/default.nix
+++ b/pkgs/tools/misc/logstash/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.3";
+  version = "2.3.4";
   name = "logstash-${version}";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz";
-    sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b";
+    sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz";
   };
 
   dontBuild         = true;

From 87b93d2ff7bb19f3c5e5f77f4c3c42cd6bd84f37 Mon Sep 17 00:00:00 2001
From: Christian Lask <christian@hiberno.net>
Date: Wed, 27 Jul 2016 17:47:03 +0200
Subject: [PATCH 2/3] Kibana: 4.5.1 -> 4.5.2

---
 pkgs/development/tools/misc/kibana/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index ca3d33624915..f356827a93a2 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kibana-${version}";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchurl {
     url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
-    sha256 = "0k9pmzx2sa3026yw29f2h2lddxdkhyn3jvdf3si8scz70ncwylj9";
+    sha256 = "1na8xh525znxaqjhxfvpx0q3rj85cjb6l9zlzd44dl31a9l117y4";
   };
 
   buildInputs = [ makeWrapper ];

From b2d989779d96915f2697b8400d08aeec6540d40f Mon Sep 17 00:00:00 2001
From: Christian Lask <christian@hiberno.net>
Date: Wed, 27 Jul 2016 17:47:16 +0200
Subject: [PATCH 3/3] elasticsearch2: 2.3.1 -> 2.3.4

---
 pkgs/servers/search/elasticsearch/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index 9495106ea00a..a9f125941884 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.3.1";
+  version = "2.3.4";
   name = "elasticsearch-${version}";
 
   src = fetchurl {
     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 ];