diff options
| -rw-r--r-- | nixos/tests/prometheus.nix | 7 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/webui-yarndeps.nix | 16 |
3 files changed, 18 insertions, 13 deletions
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index bce489168f9..af2aa66a552 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -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 | " diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 0b17f7801b6..7e729cd366f 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -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"; diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 7e9843dc98b..8b7d346e560 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -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"; }; } { |