diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix deleted file mode 100644 index b716bdd17227..000000000000 --- a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -let self = goPackages.buildGoPackage rec { - name = "prometheus-nginx-exporter-${version}"; - version = "git-2015-06-01"; - goPackagePath = "github.com/discordianfish/nginx_exporter"; - - src = fetchFromGitHub { - owner = "discordianfish"; - repo = "nginx_exporter"; - rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; - sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; - }; - - buildInputs = [ - goPackages.prometheus.client_golang - goPackages.prometheus.log - ]; - - meta = with lib; { - description = "Metrics relay from nginx stats to Prometheus"; - homepage = https://github.com/discordianfish/nginx_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 5a483fa24293..9a623ecb45a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9204,9 +9204,8 @@ let prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin; 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-nginx-exporter = - callPackage ../servers/monitoring/prometheus/nginx_exporter { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node_exporter { }; prometheus-pushgateway = diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6dfa51921769..508862007320 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2105,6 +2105,22 @@ let }; }; + prometheus.nginx-exporter = buildFromGitHub { + rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; + date = "2015-06-01"; + owner = "discordianfish"; + repo = "nginx_exporter"; + sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; + buildInputs = [ prometheus.client_golang prometheus.log ]; + meta = with stdenv.lib; { + description = "Metrics relay from nginx stats to Prometheus"; + homepage = https://github.com/discordianfish/nginx_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + prometheus.procfs = buildFromGitHub { rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; date = "2015-06-16";