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

Merge pull request #95845 from WilliButz/update/prometheus-2.20.1

Browse Source 
prometheus: 2.19.3 -> 2.20.1, fix thanos test
This commit is contained in:
Maximilian Bosch 2020-08-22 21:22:38 +02:00 committed by GitHub
commit 0436b98753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/tests/prometheus.nix
View File

@ -158,7 +158,10 @@ in import ./make-test-python.nix {
s3 = { pkgs, ... } : {
# Minio requires at least 1GiB of free disk space to run.
virtualisation.diskSize = 2 * 1024;
virtualisation = {
diskSize = 2 * 1024;
memorySize = 1024;
};
networking.firewall.allowedTCPPorts = [ minioPort ];
services.minio = {
@ -235,7 +238,7 @@ in import ./make-test-python.nix {
# Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket
# and check if the blocks have the correct labels:
store.succeed(
"thanos bucket ls "
"thanos tools bucket ls "
+ "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} "
+ "--output=json | "
+ "jq .thanos.labels.some_label | "

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

@ -1,13 +1,13 @@
{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }:
{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }:
let
version = "2.19.3";
version = "2.20.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "prometheus";
repo = "prometheus";
sha256 = "0dlvhbxahdq0x0qa0gv1rc4y5dp6lx44w280rbm9279nv1nplffh";
sha256 = "0svhx08pbz55nhn6g9pn79zbhyvr394k5w3ny1mq3wp382h62r5j";
};
webui = mkYarnPackage {
@ -61,6 +61,8 @@ in buildGoPackage rec {
doCheck = true;
passthru.tests = { inherit (nixosTests) prometheus; };
meta = with lib; {
description = "Service monitoring system and time series database";
homepage = "https://prometheus.io";

16
pkgs/servers/monitoring/prometheus/webui-yarndeps.nix
View File

@ -4122,11 +4122,11 @@
};
}
{
name = "elliptic___elliptic_6.5.2.tgz";
name = "elliptic___elliptic_6.5.3.tgz";
path = fetchurl {
name = "elliptic___elliptic_6.5.2.tgz";
url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz";
sha1 = "05c5678d7173c049d8ca433552224a495d0e3762";
name = "elliptic___elliptic_6.5.3.tgz";
url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz";
sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6";
};
}
{
@ -11698,11 +11698,11 @@
};
}
{
name = "websocket_extensions___websocket_extensions_0.1.3.tgz";
name = "websocket_extensions___websocket_extensions_0.1.4.tgz";
path = fetchurl {
name = "websocket_extensions___websocket_extensions_0.1.3.tgz";
url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29";
name = "websocket_extensions___websocket_extensions_0.1.4.tgz";
url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz";
sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42";
};
}
{