mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Code Issues Wiki Activity

Merge pull request #220461 from SuperSandro2000/prometheus

Browse source 
prometheus: 2.41.0 -> 2.42.0, split outputs, other cleanups
This commit is contained in:
Franz Pletz 2023-03-14 05:28:59 +01:00 committed by GitHub
parent ba6524a706 ddd7321df0
commit bc0a1dd982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/monitoring/prometheus/default.nix
View file

@ -31,7 +31,7 @@ let
if checkConfigEnabled then
pkgs.runCommandLocal
"${name}-${replaceStrings [" "] [""] what}-checked"
{ buildInputs = [ cfg.package ]; } ''
{ buildInputs = [ cfg.package.cli ]; } ''
ln -s ${file} $out
promtool ${what} $out
'' else file;

91
pkgs/servers/monitoring/prometheus/default.nix
View file

@ -21,6 +21,7 @@
, enableMoby ? true
, enableNomad ? true
, enableOpenstack ? true
, enableOVHCloud ? true
, enablePuppetDB ? true
, enableScaleway ? true
, enableTriton ? true
@ -31,24 +32,26 @@
}:
let
version = "2.41.0";
version = "2.42.0";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
sha256 = "sha256-0EFeAuhQUu+4TCoHsWHTbWTGJLjS37POacP1K42sGqI=";
sha256 = "sha256-QOnt8YZkq+/cmoaI8ZOrVbgVh5MnaKpDBVtPTckl4+A=";
};
in
buildGoModule rec {
pname = "prometheus";
inherit version;
outputs = [ "out" "doc" "cli" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "prometheus";
repo = "prometheus";
sha256 = "sha256-J3KDN02m639bUGrnUrqeCLferrqIHaJ2VEBjIqfm/GY=";
rev = "v${version}";
sha256 = "sha256-UwowidKKn3fp2z/MSbwESpl2E4IIioEC0oV1QRE7ViQ=";
};
vendorSha256 = "sha256-4Of1euBp5Lka6Bb2UJYUQuRa7t2/B1HaXCWSOqCASYw=";
vendorSha256 = "sha256-wUniz7E9l/5ldgPHo+wZkKaZuAH5kvjT0VDl4qkcoNs=";
excludedPackages = [ "documentation/prometheus-mixin" ];
@ -59,51 +62,30 @@ buildGoModule rec {
# Enable only select service discovery to shrink binaries.
(
true # prevent bash syntax error when all plugins are disabled
${lib.optionalString (enableAWS)
"echo - github.com/prometheus/prometheus/discovery/aws"}
${lib.optionalString (enableAzure)
"echo - github.com/prometheus/prometheus/discovery/azure"}
${lib.optionalString (enableConsul)
"echo - github.com/prometheus/prometheus/discovery/consul"}
${lib.optionalString (enableDigitalOcean)
"echo - github.com/prometheus/prometheus/discovery/digitalocean"}
${lib.optionalString (enableDNS)
"echo - github.com/prometheus/prometheus/discovery/dns"}
${lib.optionalString (enableEureka)
"echo - github.com/prometheus/prometheus/discovery/eureka"}
${lib.optionalString (enableGCE)
"echo - github.com/prometheus/prometheus/discovery/gce"}
${lib.optionalString (enableHetzner)
"echo - github.com/prometheus/prometheus/discovery/hetzner"}
${lib.optionalString (enableIONOS)
"echo - github.com/prometheus/prometheus/discovery/ionos"}
${lib.optionalString (enableKubernetes)
"echo - github.com/prometheus/prometheus/discovery/kubernetes"}
${lib.optionalString (enableLinode)
"echo - github.com/prometheus/prometheus/discovery/linode"}
${lib.optionalString (enableMarathon)
"echo - github.com/prometheus/prometheus/discovery/marathon"}
${lib.optionalString (enableMoby)
"echo - github.com/prometheus/prometheus/discovery/moby"}
${lib.optionalString (enableNomad)
"echo - github.com/prometheus/prometheus/discovery/nomad"}
${lib.optionalString (enableOpenstack)
"echo - github.com/prometheus/prometheus/discovery/openstack"}
${lib.optionalString (enablePuppetDB)
"echo - github.com/prometheus/prometheus/discovery/puppetdb"}
${lib.optionalString (enableScaleway)
"echo - github.com/prometheus/prometheus/discovery/scaleway"}
${lib.optionalString (enableTriton)
"echo - github.com/prometheus/prometheus/discovery/triton"}
${lib.optionalString (enableUyuni)
"echo - github.com/prometheus/prometheus/discovery/uyuni"}
${lib.optionalString (enableVultr)
"echo - github.com/prometheus/prometheus/discovery/vultr"}
${lib.optionalString (enableXDS)
"echo - github.com/prometheus/prometheus/discovery/xds"}
${lib.optionalString (enableZookeeper)
"echo - github.com/prometheus/prometheus/discovery/zookeeper"}
true # prevent bash syntax error when all plugins are disabled
${lib.optionalString enableAWS "echo - github.com/prometheus/prometheus/discovery/aws"}
${lib.optionalString enableAzure "echo - github.com/prometheus/prometheus/discovery/azure"}
${lib.optionalString enableConsul "echo - github.com/prometheus/prometheus/discovery/consul"}
${lib.optionalString enableDigitalOcean "echo - github.com/prometheus/prometheus/discovery/digitalocean"}
${lib.optionalString enableDNS "echo - github.com/prometheus/prometheus/discovery/dns"}
${lib.optionalString enableEureka "echo - github.com/prometheus/prometheus/discovery/eureka"}
${lib.optionalString enableGCE "echo - github.com/prometheus/prometheus/discovery/gce"}
${lib.optionalString enableHetzner "echo - github.com/prometheus/prometheus/discovery/hetzner"}
${lib.optionalString enableIONOS "echo - github.com/prometheus/prometheus/discovery/ionos"}
${lib.optionalString enableKubernetes "echo - github.com/prometheus/prometheus/discovery/kubernetes"}
${lib.optionalString enableLinode "echo - github.com/prometheus/prometheus/discovery/linode"}
${lib.optionalString enableMarathon "echo - github.com/prometheus/prometheus/discovery/marathon"}
${lib.optionalString enableMoby "echo - github.com/prometheus/prometheus/discovery/moby"}
${lib.optionalString enableNomad "echo - github.com/prometheus/prometheus/discovery/nomad"}
${lib.optionalString enableOpenstack "echo - github.com/prometheus/prometheus/discovery/openstack"}
${lib.optionalString enableOVHCloud "echo - github.com/prometheus/prometheus/discovery/ovhcloud"}
${lib.optionalString enablePuppetDB "echo - github.com/prometheus/prometheus/discovery/puppetdb"}
${lib.optionalString enableScaleway "echo - github.com/prometheus/prometheus/discovery/scaleway"}
${lib.optionalString enableTriton "echo - github.com/prometheus/prometheus/discovery/triton"}
${lib.optionalString enableUyuni "echo - github.com/prometheus/prometheus/discovery/uyuni"}
${lib.optionalString enableVultr "echo - github.com/prometheus/prometheus/discovery/vultr"}
${lib.optionalString enableXDS "echo - github.com/prometheus/prometheus/discovery/xds"}
${lib.optionalString enableZookeeper "echo - github.com/prometheus/prometheus/discovery/zookeeper"}
) > plugins.yml
'';
@ -118,6 +100,8 @@ buildGoModule rec {
t = "github.com/prometheus/common/version";
in
[
"-s"
"-w"
"-X ${t}.Version=${version}"
"-X ${t}.Revision=unknown"
"-X ${t}.Branch=unknown"
@ -132,6 +116,10 @@ buildGoModule rec {
cp -a $src/console_libraries $src/consoles $out/etc/prometheus
'';
postInstall = ''
moveToOutput bin/promtool $cli
'';
doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1
passthru.tests = { inherit (nixosTests) prometheus; };
@ -140,7 +128,6 @@ buildGoModule rec {
description = "Service monitoring system and time series database";
homepage = "https://prometheus.io";
license = licenses.asl20;
maintainers = with maintainers; [ benley fpletz globin willibutz Frostman ];
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz willibutz Frostman ];
};
}