diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix deleted file mode 100644 index 2aff12a42a4b..000000000000 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -let self = buildGoPackage rec { - name = "prometheus-node-exporter-${rev}"; - rev = "0.10.0"; - goPackagePath = "github.com/prometheus/node_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "node_exporter"; - inherit rev; - sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p"; - }; - - buildInputs = [ - go-runit - ntp - prometheus.client_golang - prometheus.client_model - prometheus.log - protobuf - ]; - - meta = with lib; { - description = "Prometheus exporter for machine metrics"; - homepage = https://github.com/prometheus/node_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 9a623ecb45a2..11067e8ed35a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9205,9 +9205,8 @@ let prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin; prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin; prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin; + prometheus-node-exporter = goPackages.prometheus.node-exporter.bin; - prometheus-node-exporter = - callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway { }; prometheus-statsd-bridge = diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 508862007320..3a70e93db323 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2121,6 +2121,30 @@ let }; }; + prometheus.node-exporter = buildFromGitHub { + rev = "0.10.0"; + owner = "prometheus"; + repo = "node_exporter"; + sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p"; + + buildInputs = [ + go-runit + ntp + prometheus.client_golang + prometheus.client_model + prometheus.log + protobuf + ]; + + meta = with stdenv.lib; { + description = "Prometheus exporter for machine metrics"; + homepage = https://github.com/prometheus/node_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + prometheus.procfs = buildFromGitHub { rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; date = "2015-06-16";