Merge pull request #8613 from benley/prometheus

updates: prometheus-node-exporter, prometheus-alertmanager

pkgs/servers/monitoring/prometheus/alertmanager/default.nix

@@ -1,23 +1,23 @@
 { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
 
 goPackages.buildGoPackage rec {
-  name = "prometheus-alertmanager-${version}";
+  name = "prometheus-alertmanager-${rev}";
-  version = "0.0.1";
+  rev = "0.0.4";
   goPackagePath = "github.com/prometheus/alertmanager";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "alertmanager";
-    rev = "2b6c5caf89a492b013204e8d7db99fbb78c5dcd4";
+    inherit rev;
-    sha256 = "13rdqnvmx11ks305dlnzv9gwf8c4zjyi5fkwcd69xgjfars2m4f3";
+    sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
   };
 
   buildInputs = [
-    goPackages.glog
     goPackages.protobuf
     goPackages.fsnotify.v0
     goPackages.httprouter
     goPackages.prometheus.client_golang
+    goPackages.prometheus.log
     goPackages.pushover
     protobuf
     vim
@@ -25,7 +25,7 @@ goPackages.buildGoPackage rec {
 
   buildFlagsArray = ''
     -ldflags=
-        -X main.buildVersion ${version}
+        -X main.buildVersion ${rev}
         -X main.buildBranch master
         -X main.buildUser nix@nixpkgs
         -X main.buildDate 20150101-00:00:00

pkgs/servers/monitoring/prometheus/node_exporter/default.nix

@@ -4,22 +4,22 @@ with goPackages;
 
 buildGoPackage rec {
   name = "prometheus-node-exporter-${rev}";
-  rev = "0.8.1";
+  rev = "0.10.0";
   goPackagePath = "github.com/prometheus/node_exporter";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "node_exporter";
     inherit rev;
-    sha256 = "15vp88w0b7h6sryy61qk369yjr3p4qvpch1nbxd9rm51bdgsqyys";
+    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
   };
 
   buildInputs = [
-    glog
     go-runit
     ntp
     prometheus.client_golang
     prometheus.client_model
+    prometheus.log
     protobuf
   ];