From 9dfb7e42ad71c4415d3f8a638748eccbfb1f6652 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 26 Feb 2017 21:40:11 +0100 Subject: [PATCH 1/8] heartbeat: init at 5.2.1 --- pkgs/misc/logging/heartbeat/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/misc/logging/heartbeat/default.nix diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix new file mode 100644 index 00000000000..905fbf5fb75 --- /dev/null +++ b/pkgs/misc/logging/heartbeat/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "heartbeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/heartbeat/${name}-linux-x86_64.tar.gz"; + sha256 = "1sq3va0kbpqsjbd0bnziv2hwnp6nc2vk32hc9drjk7bhcxkp440l"; + }; + + # statically linked binary, no need to build anything + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp heartbeat $out/bin/ + ''; + + meta = { + description = "Lightweight shipper for uptime monitoring"; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e72eda08f5..37fe947468d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -944,6 +944,8 @@ with pkgs; gti = callPackage ../tools/misc/gti { }; + heartbeat = callPackage ../misc/logging/heartbeat { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; hexio = callPackage ../development/tools/hexio { }; From 9fce67264d8709bedb4ca86ba3752ca634933dc7 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 26 Feb 2017 21:37:05 +0100 Subject: [PATCH 2/8] metricbeat: init at 5.2.1 --- pkgs/misc/logging/metricbeat/default.nix | 33 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/misc/logging/metricbeat/default.nix diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix new file mode 100644 index 00000000000..c925dee7da9 --- /dev/null +++ b/pkgs/misc/logging/metricbeat/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "metricbeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/metricbeat/${name}-linux-x86_64.tar.gz"; + sha256 = "0shpyqgrqiiqv9anipqms1xy0wn5n2m11fvicdzr3x1v3jygm1ds"; + }; + + # statically linked binary, no need to build anything + dontBuild = true; + doCheck = false; + + # need to patch interpreter to be able to run on NixOS + patchPhase = '' + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) metricbeat + ''; + + installPhase = '' + mkdir -p $out/bin + cp metricbeat $out/bin/ + ''; + + meta = { + description = "Lightweight shipper for metrics"; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37fe947468d..6d1025b29f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -972,6 +972,8 @@ with pkgs; meson = callPackage ../development/tools/build-managers/meson { }; + metricbeat = callPackage ../misc/logging/metricbeat { }; + mp3fs = callPackage ../tools/filesystems/mp3fs { }; mpdcron = callPackage ../tools/audio/mpdcron { }; From 9fe3b0eb13405bd209527b8c2230170f229bd970 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 4 Dec 2016 19:59:46 +0100 Subject: [PATCH 3/8] filebeat: init at 5.2.1 --- pkgs/misc/logging/filebeat/default.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/misc/logging/filebeat/default.nix diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix new file mode 100644 index 00000000000..94d3c0d849f --- /dev/null +++ b/pkgs/misc/logging/filebeat/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "filebeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/filebeat/${name}-linux-x86_64.tar.gz"; + sha256 = "0kwkd3n6jmd0mwbvk2dng8843mxyq4mfvlm3hc8d1vd2m1m9wlhi"; + }; + + # statically linked binary, no need to build anything + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp filebeat $out/bin/ + ''; + + meta = { + description = "Lightweight shipper for logfiles"; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1025b29f8..289bfa010f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -902,6 +902,8 @@ with pkgs; fastJson = callPackage ../development/libraries/fastjson { }; + filebeat = callPackage ../misc/logging/filebeat { }; + filebench = callPackage ../tools/misc/filebench { }; fsmon = callPackage ../tools/misc/fsmon { }; From 8338506abe09be5135fcc29b13ac764e199c36b7 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 29 Nov 2016 22:07:13 +0100 Subject: [PATCH 4/8] packetbeat: init at 5.2.1 --- pkgs/misc/logging/packetbeat/default.nix | 38 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/misc/logging/packetbeat/default.nix diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix new file mode 100644 index 00000000000..bc871a4e278 --- /dev/null +++ b/pkgs/misc/logging/packetbeat/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "packetbeat-${version}"; + version = "5.2.1"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/beats/packetbeat/${name}-linux-x86_64.tar.gz"; + sha256 = "14ff466ban8pfsw750r8jkz1brczfrbcrwfhqvi5i8smfg56m9rl"; + }; + + dontBuild = true; + doCheck = false; + + # need to patch interpreter to be able to run on NixOS + patchPhase = '' + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) packetbeat + ''; + + installPhase = '' + mkdir -p $out/bin + cp packetbeat $out/bin/ + ''; + + meta = { + description = "Network packet analyzer that ships data to Elasticsearch"; + longDescription = '' + Packetbeat is an open source network packet analyzer that ships the data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more analytics features. + The Packetbeat shippers sniff the traffic between your application processes, parse on the fly protocols like HTTP, MySQL, PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + homepage = https://www.elastic.co/products/beats; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 289bfa010f6..1e089956fdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3326,6 +3326,8 @@ with pkgs; nix = nixUnstable; }; + packetbeat = callPackage ../misc/logging/packetbeat { }; + packetdrill = callPackage ../tools/networking/packetdrill { }; pakcs = callPackage ../development/compilers/pakcs {}; From a0d087b6fe8cf366a5b44a803f25ec350af21d97 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:54:35 +0100 Subject: [PATCH 5/8] filebeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/filebeat/default.nix | 31 ++++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix index 94d3c0d849f..c33f34c6dc4 100644 --- a/pkgs/misc/logging/filebeat/default.nix +++ b/pkgs/misc/logging/filebeat/default.nix @@ -1,28 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "filebeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/filebeat/${name}-linux-x86_64.tar.gz"; - sha256 = "0kwkd3n6jmd0mwbvk2dng8843mxyq4mfvlm3hc8d1vd2m1m9wlhi"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - # statically linked binary, no need to build anything - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - installPhase = '' - mkdir -p $out/bin - cp filebeat $out/bin/ - ''; + subPackages = [ "filebeat" ]; - meta = { + meta = with stdenv.lib; { description = "Lightweight shipper for logfiles"; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; } From 66d0c4b1bd2e947a95aa2795fb4a933429470219 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:54:59 +0100 Subject: [PATCH 6/8] heartbeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/heartbeat/default.nix | 31 +++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix index 905fbf5fb75..faa558589f2 100644 --- a/pkgs/misc/logging/heartbeat/default.nix +++ b/pkgs/misc/logging/heartbeat/default.nix @@ -1,28 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "heartbeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/heartbeat/${name}-linux-x86_64.tar.gz"; - sha256 = "1sq3va0kbpqsjbd0bnziv2hwnp6nc2vk32hc9drjk7bhcxkp440l"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - # statically linked binary, no need to build anything - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - installPhase = '' - mkdir -p $out/bin - cp heartbeat $out/bin/ - ''; + subPackages = [ "heartbeat" ]; - meta = { + meta = with stdenv.lib; { description = "Lightweight shipper for uptime monitoring"; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; } From 4d08d1aa8f44876b3c068384c5b03332aa134a29 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:55:13 +0100 Subject: [PATCH 7/8] metricbeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/metricbeat/default.nix | 36 +++++++++--------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix index c925dee7da9..fcb2376a93d 100644 --- a/pkgs/misc/logging/metricbeat/default.nix +++ b/pkgs/misc/logging/metricbeat/default.nix @@ -1,33 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "metricbeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/metricbeat/${name}-linux-x86_64.tar.gz"; - sha256 = "0shpyqgrqiiqv9anipqms1xy0wn5n2m11fvicdzr3x1v3jygm1ds"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - # statically linked binary, no need to build anything - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - # need to patch interpreter to be able to run on NixOS - patchPhase = '' - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) metricbeat - ''; + subPackages = [ "metricbeat" ]; - installPhase = '' - mkdir -p $out/bin - cp metricbeat $out/bin/ - ''; - - meta = { + meta = with stdenv.lib; { description = "Lightweight shipper for metrics"; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; } From 10239a084f2eaf63d63228dd7d3e4473c3489dfb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Mar 2017 22:55:19 +0100 Subject: [PATCH 8/8] packetbeat: 5.2.1 -> 5.2.2, build from source --- pkgs/misc/logging/packetbeat/default.nix | 44 +++++++++++------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix index bc871a4e278..d4445bec998 100644 --- a/pkgs/misc/logging/packetbeat/default.nix +++ b/pkgs/misc/logging/packetbeat/default.nix @@ -1,38 +1,36 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "packetbeat-${version}"; - version = "5.2.1"; + version = "5.2.2"; - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/beats/packetbeat/${name}-linux-x86_64.tar.gz"; - sha256 = "14ff466ban8pfsw750r8jkz1brczfrbcrwfhqvi5i8smfg56m9rl"; + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; }; - dontBuild = true; - doCheck = false; + goPackagePath = "github.com/elastic/beats"; - # need to patch interpreter to be able to run on NixOS - patchPhase = '' - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) packetbeat - ''; + subPackages = [ "packetbeat" ]; - installPhase = '' - mkdir -p $out/bin - cp packetbeat $out/bin/ - ''; + buildInputs = [ libpcap ]; - meta = { + meta = with stdenv.lib; { description = "Network packet analyzer that ships data to Elasticsearch"; longDescription = '' - Packetbeat is an open source network packet analyzer that ships the data to Elasticsearch. + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. - Think of it like a distributed real-time Wireshark with a lot more analytics features. - The Packetbeat shippers sniff the traffic between your application processes, parse on the fly protocols like HTTP, MySQL, PostgreSQL, Redis or Thrift and correlate the messages into transactions. + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. ''; homepage = https://www.elastic.co/products/beats; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.fadenb ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; }; }