diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix deleted file mode 100644 index 8ea0677d163..00000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -let self = goPackages.buildGoPackage rec { - name = "prometheus-haproxy-exporter-0.4.0"; - goPackagePath = "github.com/prometheus/haproxy_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "haproxy_exporter"; - rev = "6ee6d1df3e68ed73df37c9794332b2594e4da45d"; - sha256 = "0lbwv6jsdfjd9ihiky3lq7d5rkxqjh7xfaziw8i3w34a38japlpr"; - }; - - buildInputs = [ goPackages.prometheus.client_golang ]; - - meta = with lib; { - description = "HAProxy Exporter for the Prometheus monitoring system"; - homepage = https://github.com/prometheus/haproxy_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -}; - -in self.bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74b58353e63..18ada8231dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9201,9 +9201,8 @@ let prometheus-alertmanager = goPackages.prometheus.alertmanager.bin; prometheus-cli = goPackages.prometheus.cli.bin; prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin; + prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin; - prometheus-haproxy-exporter = - callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos_exporter { }; prometheus-mysqld-exporter = diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index f1fdb6a3a1d..33aa17b5979 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2051,6 +2051,21 @@ let }; }; + prometheus.haproxy-exporter = buildFromGitHub { + rev = "0.4.0"; + owner = "prometheus"; + repo = "haproxy_exporter"; + sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr"; + buildInputs = [ prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "HAProxy Exporter for the Prometheus monitoring system"; + homepage = https://github.com/prometheus/haproxy_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + prometheus.log = buildFromGitHub { rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; date = "2015-05-29";