diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json index 5e2e37a858f..68d1283f9e4 100644 --- a/pkgs/development/go-modules/libs.json +++ b/pkgs/development/go-modules/libs.json @@ -1195,5 +1195,14 @@ "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" } + }, + { + "goPackagePath": "github.com/antonlindstrom/mesos_stats", + "fetch": { + "type": "git", + "url": "https://github.com/antonlindstrom/mesos_stats", + "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920", + "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4" + } } ] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix new file mode 100644 index 00000000000..a06c9671f81 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -0,0 +1,28 @@ +# This file was generated by go2nix. +{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; + +buildGoPackage rec { + name = "mesos_exporter-${version}"; + version = "0.1.0"; + rev = version; + + goPackagePath = "github.com/prometheus/mesos_exporter"; + + src = fetchgit { + inherit rev; + url = "https://github.com/prometheus/mesos_exporter"; + sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; + }; + + goDeps = ./mesos-exporter_deps.json; + + meta = with stdenv.lib; { + description = "Export Mesos metrics to Prometheus"; + homepage = https://github.com/prometheus/mesos_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json new file mode 100644 index 00000000000..c250fb0495e --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json @@ -0,0 +1,16 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/golang/glog", + "github.com/prometheus/client_golang", + "github.com/prometheus/client_model", + "github.com/antonlindstrom/mesos_stats", + "github.com/beorn7/perks", + "github.com/golang/protobuf", + "github.com/matttproud/golang_protobuf_extensions", + "github.com/prometheus/procfs", + "bitbucket.org/ww/goautoneg" + ] + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae05d14076e..98344946a2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10183,7 +10183,7 @@ in prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; - prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; }; prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin // { outputs = [ "bin" ]; }; prometheus-node-exporter = goPackages.prometheus.node-exporter.bin // { outputs = [ "bin" ]; }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index b221cc2dd04..389a90dca60 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2184,18 +2184,6 @@ let propagatedBuildInputs = [ ugorji.go armon.go-metrics ]; }; - mesos-stats = buildGoPackage rec { - rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; - name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/antonlindstrom/mesos_stats"; - src = fetchFromGitHub { - inherit rev; - owner = "antonlindstrom"; - repo = "mesos_stats"; - sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; - }; - }; - mgo = buildFromGitHub { rev = "r2015.06.03"; owner = "go-mgo"; @@ -2597,21 +2585,6 @@ let propagatedBuildInputs = [ logrus ]; }; - prometheus.mesos-exporter = buildFromGitHub { - rev = "0.1.0"; - owner = "prometheus"; - repo = "mesos_exporter"; - sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; - buildInputs = [ mesos-stats prometheus.client_golang glog ]; - meta = with stdenv.lib; { - description = "Export Mesos metrics to Prometheus"; - homepage = https://github.com/prometheus/mesos_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; - }; - prometheus.mysqld-exporter = buildFromGitHub { rev = "0.1.0"; owner = "prometheus";