b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

beats: upgrade default from v5 to v6

Browse source
This commit is contained in:
Jörg Thalheim 2018-08-03 11:45:06 +01:00
parent c3055ab3ce
commit d50253237e
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/misc/logging/beats/5.x.nix
View file

@ -23,10 +23,10 @@ let beat = package : extraArgs : buildGoPackage (rec {
}; };
} // extraArgs); } // extraArgs);
in { in {
filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; filebeat5 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";};
heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; heartbeat5 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";};
metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; metricbeat5 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";};
packetbeat = beat "packetbeat" { packetbeat5 = beat "packetbeat" {
buildInputs = [ libpcap ]; buildInputs = [ libpcap ];
meta.description = "Network packet analyzer that ships data to Elasticsearch"; meta.description = "Network packet analyzer that ships data to Elasticsearch";
meta.longDescription = '' meta.longDescription = ''

8
pkgs/misc/logging/beats/6.x.nix
View file

@ -23,10 +23,10 @@ let beat = package : extraArgs : buildGoPackage (rec {
}; };
} // extraArgs); } // extraArgs);
in { in {
filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";};
heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";};
metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";};
packetbeat = beat "packetbeat" { packetbeat6 = beat "packetbeat" {
buildInputs = [ libpcap ]; buildInputs = [ libpcap ];
meta.description = "Network packet analyzer that ships data to Elasticsearch"; meta.description = "Network packet analyzer that ships data to Elasticsearch";
meta.longDescription = '' meta.longDescription = ''

24
pkgs/top-level/all-packages.nix
View file

@ -841,23 +841,23 @@ with pkgs;
bchunk = callPackage ../tools/cd-dvd/bchunk { }; bchunk = callPackage ../tools/cd-dvd/bchunk { };
inherit (callPackages ../misc/logging/beats/5.x.nix { }) inherit (callPackages ../misc/logging/beats/6.x.nix { })
filebeat
heartbeat
metricbeat
packetbeat;
inherit (let beats6 = callPackages ../misc/logging/beats/6.x.nix { }; in {
filebeat6 = beats6.filebeat;
heartbeat6 = beats6.heartbeat;
metricbeat6 = beats6.metricbeat;
packetbeat6 = beats6.packetbeat;
})
filebeat6 filebeat6
heartbeat6 heartbeat6
metricbeat6 metricbeat6
packetbeat6; packetbeat6;
filebeat = filebeat6;
heartbeat = heartbeat6;
metricbeat = metricbeat6;
packetbeat = packetbeat6;
inherit (callPackages ../misc/logging/beats/5.x.nix { })
filebeat5
heartbeat5
metricbeat5
packetbeat5;
bfr = callPackage ../tools/misc/bfr { }; bfr = callPackage ../tools/misc/bfr { };
bibtool = callPackage ../tools/misc/bibtool { }; bibtool = callPackage ../tools/misc/bibtool { };