Prometheus: update to 0.14.0

2 files changed, 78 insertions, 55 deletions

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 8180d24aa9ee..4b8d1cdbe56b 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,58 +1,55 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
+{ stdenv, lib, goPackages, fetchFromGitHub, vim }:
 
 goPackages.buildGoPackage rec {
-   name = "prometheus-${version}";
-   version = "0.13.4";
-   goPackagePath = "github.com/prometheus/prometheus";
-   rev = "612da96c46f0b7ea6cc28a3fc614f14eae0189d0";
+  name = "prometheus-${version}";
+  version = "0.14.0";
+  goPackagePath = "github.com/prometheus/prometheus";
+  rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430";
 
-   src = fetchFromGitHub {
-     inherit rev;
-     owner = "prometheus";
-     repo = "prometheus";
-     sha256 = "1r3pcnxs1cdh18lmqd60r3nh614cw543wzd4slkr2nzr73pn5x4j";
-   };
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "prometheus";
+    repo = "prometheus";
+    sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9";
+  };
 
-   buildInputs = [
-     goPackages.dns
-     goPackages.glog
-     goPackages.protobuf
-     goPackages.goleveldb
-     goPackages.net
-     goPackages.prometheus.client_golang
-     protobuf  # the non-golang package, for protoc
-     vim  # for xxd, used in embed-static.sh
-   ];
+  buildInputs = [
+    goPackages.consul
+    goPackages.dns
+    goPackages.fsnotify.v1
+    goPackages.goleveldb
+    goPackages.logrus
+    goPackages.net
+    goPackages.prometheus.client_golang
+    goPackages.prometheus.log
+    goPackages.yaml-v2
+    vim  # for xxd, used in embed-static.sh
+  ];
 
-   # Metadata that gets embedded into the binary
-   buildFlagsArray = ''
-     -ldflags=
-         -X main.buildVersion ${version}
-         -X main.buildRevision ${builtins.substring 0 6 rev}
-         -X main.buildBranch master
-         -X main.buildUser nix@nixpkgs
-         -X main.buildDate 20150101-00:00:00
-         -X main.goVersion ${lib.getVersion goPackages.go}
-   '';
+  # Metadata that gets embedded into the binary
+  buildFlagsArray = ''
+    -ldflags=
+        -X main.buildVersion ${version}
+        -X main.buildRevision ${builtins.substring 0 6 rev}
+        -X main.buildBranch master
+        -X main.buildUser nix@nixpkgs
+        -X main.buildDate 20150101-00:00:00
+        -X main.goVersion ${lib.getVersion goPackages.go}
+  '';
 
-   preBuild = ''
-   (
-     cd "go/src/$goPackagePath"
-     protoc --proto_path=./config \
-            --go_out=./config/generated/ \
-            ./config/config.proto
+  preBuild = ''
+  (
+    cd "go/src/$goPackagePath/web"
+    ${stdenv.shell} ../utility/embed-static.sh static templates \
+      | gofmt > blob/files.go
+  )
+  '';
 
-     cd web
-     ${stdenv.shell} ../utility/embed-static.sh static templates \
-       | gofmt > blob/files.go
-   )
-   '';
-
-   meta = with lib; {
-     description = "Service monitoring system and time series database";
-     homepage = http://prometheus.github.io;
-     license = licenses.asl20;
-     maintainers = with maintainers; [ benley ];
-     platforms = platforms.unix;
-   };
+  meta = with lib; {
+    description = "Service monitoring system and time series database";
+    homepage = http://prometheus.io;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 9af04081000d..1181d8e2b607 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1991,6 +1991,19 @@ let
     buildInputs = [ protobuf ];
   };
 
+  prometheus.log = buildGoPackage rec {
+    name = "prometheus-log-${version}";
+    version = "git-2015-05-29";
+    goPackagePath = "github.com/prometheus/log";
+    src = fetchFromGitHub {
+      rev = "439e5db48fbb50ebbaf2c816030473a62f505f55";
+      owner = "prometheus";
+      repo = "log";
+      sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
+    };
+    propagatedBuildInputs = [ logrus ];
+  };
+
   prometheus.procfs = buildGoPackage rec {
     rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d";
     name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2413,16 +2426,29 @@ let
   };
 
   yaml-v1 = buildGoPackage rec {
-    rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a";
-    name = "yaml-v1-${stdenv.lib.strings.substring 0 7 rev}";
+    name = "yaml-v1-${version}";
+    version = "git-2015-05-01";
     goPackagePath = "gopkg.in/yaml.v1";
-    src = fetchgit {
-      inherit rev;
-      url = "https://github.com/go-yaml/yaml.git";
+    src = fetchFromGitHub {
+      rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a";
+      owner = "go-yaml";
+      repo = "yaml";
       sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy";
     };
   };
 
+  yaml-v2 = buildGoPackage rec {
+    name = "yaml-v2-${version}";
+    version = "git-2015-05-19";
+    goPackagePath = "gopkg.in/yaml.v2";
+    src = fetchFromGitHub {
+      rev = "c1cd2254a6dd314c9d73c338c12688c9325d85c6";
+      owner = "go-yaml";
+      repo = "yaml";
+      sha256 = "0xhv0i700hh8lczrwxhn3c99npqma7k4337qrh6k36falm0jpp4s";
+    };
+  };
+
   yamux = buildGoPackage rec {
     rev = "b2e55852ddaf823a85c67f798080eb7d08acd71d";
     name = "yamux-${stdenv.lib.strings.substring 0 7 rev}";