public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36782 from mbode/prometheus_2_1_0

Browse Source 
prometheus: add 2.1.0
This commit is contained in:
Matthew Justin Bauer 2018-03-19 12:25:52 -05:00 committed by GitHub
commit ac037da8e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -1,17 +1,20 @@
{ stdenv, go, buildGoPackage, fetchFromGitHub }: { stdenv, go, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { let
name = "prometheus-${version}";
version = "1.8.1";
rev = "v${version}";
goPackagePath = "github.com/prometheus/prometheus"; goPackagePath = "github.com/prometheus/prometheus";
generic = { version, sha256, ... }@attrs:
let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in
buildGoPackage ({
name = "prometheus-${version}";
inherit goPackagePath;
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; rev = "v${version}";
owner = "prometheus"; owner = "prometheus";
repo = "prometheus"; repo = "prometheus";
sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4"; inherit sha256;
}; };
docheck = true; docheck = true;
@ -39,4 +42,15 @@ buildGoPackage rec {
maintainers = with maintainers; [ benley fpletz ]; maintainers = with maintainers; [ benley fpletz ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} // attrs');
in rec {
prometheus_1 = generic {
version = "1.8.1";
sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
};
prometheus_2 = generic {
version = "2.1.0";
sha256 = "01pbqfp43qrqcgyidyg2lw9jnjdrv140vnmqmm49z0vhlkxkwlvw";
};
} }

7
pkgs/top-level/all-packages.nix
View File

@ -12596,8 +12596,13 @@ with pkgs;
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
inherit (callPackage ../servers/monitoring/prometheus {})
prometheus_1
prometheus_2
;
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus = prometheus_1;
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };