From b2de6ccc8ed72194d1999e21eea7e7bfde77d396 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 23 May 2015 16:23:24 -0700 Subject: Update prometheus and its various helper packages Updates to: - prometheus - prometheus-alertmanager - prometheus-cli - prometheus-mesos-exporter - prometheus-node-exporter - prometheus-pushgateway - prometheus-statsd-bridge --- .../monitoring/prometheus/alertmanager/default.nix | 14 ++++++-------- pkgs/servers/monitoring/prometheus/cli/default.nix | 8 +++++--- pkgs/servers/monitoring/prometheus/default.nix | 18 ++++++++++-------- .../monitoring/prometheus/mesos_exporter/default.nix | 6 +++--- .../monitoring/prometheus/node_exporter/default.nix | 7 ++++--- .../monitoring/prometheus/pushgateway/default.nix | 12 ++++-------- .../monitoring/prometheus/statsd_bridge/default.nix | 10 +++++----- 7 files changed, 37 insertions(+), 38 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix index 06dfc1ef1c97..56fcee762786 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -1,23 +1,21 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: -with goPackages; - -buildGoPackage rec { +goPackages.buildGoPackage rec { name = "prometheus-alertmanager-${version}"; - version = "0.1.0"; + version = "0.0.1"; goPackagePath = "github.com/prometheus/alertmanager"; src = fetchFromGitHub { owner = "prometheus"; repo = "alertmanager"; - rev = "942cd35dea6dc406b106d7a57ffe7adbb3b978a5"; - sha256 = "1c14vgn9s0dn322ss8fs5b47blw1g8cxy9w4yjn0f7x2sdwplx1i"; + rev = "2b6c5caf89a492b013204e8d7db99fbb78c5dcd4"; + sha256 = "13rdqnvmx11ks305dlnzv9gwf8c4zjyi5fkwcd69xgjfars2m4f3"; }; buildInputs = [ goPackages.glog goPackages.protobuf - goPackages.fsnotify.v1 + goPackages.fsnotify.v0 goPackages.httprouter goPackages.prometheus.client_golang goPackages.pushover @@ -31,7 +29,7 @@ buildGoPackage rec { -X main.buildBranch master -X main.buildUser nix@nixpkgs -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} + -X main.goVersion ${lib.getVersion goPackages.go} ''; preBuild = '' diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix index f1f5ef9975c5..701ee46d4981 100644 --- a/pkgs/servers/monitoring/prometheus/cli/default.nix +++ b/pkgs/servers/monitoring/prometheus/cli/default.nix @@ -1,13 +1,15 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-cli-0.2.0"; + name = "prometheus-cli-${rev}"; + rev = "0.3.0"; goPackagePath = "github.com/prometheus/prometheus_cli"; + src = fetchFromGitHub { owner = "prometheus"; repo = "prometheus_cli"; - rev = "b36c21d2301cf686bff81953573a29a6d5a0a883"; - sha256 = "190dlc6fyrfgxab4xj3gaz4jwx33jhzg57d8h36xjx56gbvp7iyk"; + inherit rev; + sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 6e181c6ec9e4..8180d24aa9ee 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,23 +1,25 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: -with goPackages; - -buildGoPackage rec { +goPackages.buildGoPackage rec { name = "prometheus-${version}"; - version = "0.12.0"; + version = "0.13.4"; goPackagePath = "github.com/prometheus/prometheus"; - rev = "55dcb55498b43bafe94915a4de7907d6d66b4427"; + rev = "612da96c46f0b7ea6cc28a3fc614f14eae0189d0"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "17bbdk9axr91m2947ddbnzqwaap2vrzsbknbrlpdsmlsjhc8h7cb"; + sha256 = "1r3pcnxs1cdh18lmqd60r3nh614cw543wzd4slkr2nzr73pn5x4j"; }; buildInputs = [ - dns glog goleveldb prometheus.client_golang + 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 ]; @@ -30,7 +32,7 @@ buildGoPackage rec { -X main.buildBranch master -X main.buildUser nix@nixpkgs -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} + -X main.goVersion ${lib.getVersion goPackages.go} ''; preBuild = '' diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix index e816f346e53b..5a62a46823bc 100644 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-mesos-exporter-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "a4a6638d6db6b5137e130cd4903b30dd82b78e9a"; + name = "prometheus-mesos-exporter-${rev}"; + rev = "0.1.0"; goPackagePath = "github.com/prometheus/mesos_exporter"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "mesos_exporter"; - sha256 = "1h4yxfcr8l9i2m1s5ygk3slhxdrs4mvmpn3sq8m5s205abvp891q"; + sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; buildInputs = [ goPackages.mesos-stats ]; diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix index 97169a0e298b..c60985d3aa73 100644 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -3,14 +3,15 @@ with goPackages; buildGoPackage rec { - name = "prometheus-node-exporter-0.8.0"; + name = "prometheus-node-exporter-${rev}"; + rev = "0.8.1"; goPackagePath = "github.com/prometheus/node_exporter"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; - rev = "aaf01e52e25883671fd67234b415df7abd0e4eac"; - sha256 = "0j1qvgsc2hcv50l9lyfivkzsyjkjp3w1yyqvd1gzfybk7hi59dya"; + inherit rev; + sha256 = "15vp88w0b7h6sryy61qk369yjr3p4qvpch1nbxd9rm51bdgsqyys"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix index c16cb7a9408e..ae1e1e38902f 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -3,16 +3,15 @@ with goPackages; buildGoPackage rec { - name = "prometheus-pushgateway-${version}"; - version = "0.1.0"; + name = "prometheus-pushgateway-${rev}"; + rev = "0.1.1"; goPackagePath = "github.com/prometheus/pushgateway"; - rev = "3f1d42dade342ddb88381607358bae61a0a6b6c7"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "pushgateway"; - sha256 = "1wqxbl9rlnxszp9ylvdbx6f5lyj2z0if3x099fnjahbqmz8yhnf4"; + sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; }; buildInputs = [ @@ -25,7 +24,7 @@ buildGoPackage rec { buildFlagsArray = '' -ldflags= - -X main.buildVersion ${version} + -X main.buildVersion ${rev} -X main.buildRev ${rev} -X main.buildBranch master -X main.buildUser nix@nixpkgs @@ -37,9 +36,6 @@ buildGoPackage rec { ( cd "go/src/$goPackagePath" go-bindata ./resources/ - ${govers}/bin/govers -d -m github.com/matttproud/golang_protobuf_extensions/ext github.com/matttproud/golang_protobuf_extensions/pbutil - substituteInPlace handler/push.go \ - --replace ext.ReadDelimited pbutil.ReadDelimited ) ''; diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix index b6548b90f299..31acf79c8139 100644 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, goPackages, fetchFromGitHub }: goPackages.buildGoPackage rec { - name = "prometheus-statsd-bridge-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "9715b183150c7bed8a10affb23d33fb55c597180"; + name = "prometheus-statsd-bridge-${version}"; + version = "0.1.0"; goPackagePath = "github.com/prometheus/statsd_bridge"; src = fetchFromGitHub { - inherit rev; + rev = version; owner = "prometheus"; repo = "statsd_bridge"; - sha256 = "119024xb08qjwbhplpl5d94bjdfhn92w4ffn4kxr7aviri1gynfz"; + sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; }; buildInputs = with goPackages; [ - fsnotify.v1 + fsnotify.v0 prometheus.client_golang ]; -- cgit 1.4.1