about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2019-05-10 15:39:11 +0200
committerBas van Dijk <v.dijk.bas@gmail.com>2019-05-10 18:50:44 +0200
commit504be3a9bbfe6d83519f1c9d714e745809dc6d27 (patch)
tree5fd7a7c4b1b5be831a1d6539521a68e43ea41074 /pkgs/top-level
parent25c0ce11c8aadaf2ddca8c9baa7adae378fa8fa4 (diff)
journalbeat: make journalbeat6 the default
Version 6.x is also the default for the other beats.

(cherry picked from commit a662f991392effcc5679d391ca5fcc373f225a2e)
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdbe4ddad2df4..b443784f943ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -936,6 +936,8 @@ in
     metricbeat5
     packetbeat5;
 
+  journalbeat5 = callPackage ../tools/system/journalbeat { };
+
   inherit (callPackages ../misc/logging/beats/6.x.nix {
     # XXX: this is failing with Go 1.12. Error is related to cgo, an
     # update to this package might fix it.
@@ -962,6 +964,7 @@ in
   heartbeat = heartbeat6;
   metricbeat = metricbeat6;
   packetbeat = packetbeat6;
+  journalbeat = journalbeat6;
 
   bfr = callPackage ../tools/misc/bfr { };
 
@@ -3638,8 +3641,6 @@ in
 
   john = callPackage ../tools/security/john { };
 
-  journalbeat = callPackage ../tools/system/journalbeat { };
-
   journaldriver = callPackage ../tools/misc/journaldriver { };
 
   jp = callPackage ../development/tools/jp { };