From a3cf92fdba05742afe26ca1e0bb8bdc056181175 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sun, 5 Jun 2016 14:59:43 +0200 Subject: prometheus-collectd-exporter: extracted from goPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60c17c0be72bf..41c3f33fbb532 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10181,7 +10181,7 @@ in prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { }; - prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; }; prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; }; prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index e15da20cf3f92..a0f0bf0efc75a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2588,21 +2588,6 @@ let buildInputs = [ protobuf ]; }; - prometheus.collectd-exporter = buildFromGitHub { - rev = "0.1.0"; - owner = "prometheus"; - repo = "collectd_exporter"; - sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; - buildInputs = [ prometheus.client_golang ]; - meta = with stdenv.lib; { - description = "Relay server for exporting metrics from collectd to Prometheus"; - homepage = https://github.com/prometheus/alertmanager; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; - }; - prometheus.haproxy-exporter = buildFromGitHub { rev = "0.4.0"; owner = "prometheus"; -- cgit 1.4.1