diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix deleted file mode 100644 index 127dc752e14..00000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ goPackages, lib, fetchFromGitHub }: - -let self = goPackages.buildGoPackage rec { - name = "prometheus-mysqld-exporter-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/mysqld_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "mysqld_exporter"; - inherit rev; - sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; - }; - - buildInputs = with goPackages; [ - mysql - prometheus.client_golang - ]; - - meta = with lib; { - description = "Prometheus exporter for MySQL server metrics"; - homepage = https://github.com/prometheus/mysqld_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 796150da673..5a483fa2429 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9203,9 +9203,8 @@ let prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin; 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-mysqld-exporter = - callPackage ../servers/monitoring/prometheus/mysqld_exporter { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx_exporter { }; prometheus-node-exporter = diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 31a9c8b3a93..6dfa5192176 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2090,6 +2090,21 @@ let }; }; + prometheus.mysqld-exporter = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "mysqld_exporter"; + sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; + buildInputs = [ mysql prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Prometheus exporter for MySQL server metrics"; + homepage = https://github.com/prometheus/mysqld_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + prometheus.procfs = buildFromGitHub { rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; date = "2015-06-16";