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

prometheus: 2.17.2 -> 2.18.1

Browse Source
This commit is contained in:
Sergey Lukjanov 2020-05-07 12:02:48 -07:00
parent f5e9e0347a
commit 742e5bff36
4 changed files with 632 additions and 697 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/prometheus.nix
View File

@ -179,7 +179,7 @@ in import ./make-test-python.nix {
s3.succeed( s3.succeed(
"mc config host add minio " "mc config host add minio "
+ "http://localhost:${toString minioPort} " + "http://localhost:${toString minioPort} "
+ "${s3.accessKey} ${s3.secretKey} S3v4", + "${s3.accessKey} ${s3.secretKey} --api s3v4",
"mc mb minio/thanos-bucket", "mc mb minio/thanos-bucket",
) )

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

@ -1,13 +1,13 @@
{ lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }:
let let
version = "2.17.2"; version = "2.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "prometheus"; owner = "prometheus";
repo = "prometheus"; repo = "prometheus";
sha256 = "1q89c98rdypfcw8sqzipwlmxg8vrm4b9vdryygnacxv4am7bxsia"; sha256 = "0ixgjp3j9dkdb0vv5n83h8w48xgi70m83im660z97y7mflr5s2cf";
}; };
webui = mkYarnPackage { webui = mkYarnPackage {

3
pkgs/servers/monitoring/prometheus/webui-package.json
View File

@ -34,7 +34,7 @@
"react-copy-to-clipboard": "^5.0.1", "react-copy-to-clipboard": "^5.0.1",
"react-dom": "^16.7.0", "react-dom": "^16.7.0",
"react-resize-detector": "^4.2.1", "react-resize-detector": "^4.2.1",
"react-scripts": "^3.4.0", "react-scripts": "3.4.0",
"react-test-renderer": "^16.9.0", "react-test-renderer": "^16.9.0",
"reactstrap": "^8.0.1", "reactstrap": "^8.0.1",
"sanitize-html": "^1.20.1", "sanitize-html": "^1.20.1",
@ -71,7 +71,6 @@
"@types/sinon": "^7.5.0", "@types/sinon": "^7.5.0",
"@typescript-eslint/eslint-plugin": "2.x", "@typescript-eslint/eslint-plugin": "2.x",
"@typescript-eslint/parser": "2.x", "@typescript-eslint/parser": "2.x",
"babel-eslint": "10.x",
"enzyme": "^3.10.0", "enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1", "enzyme-adapter-react-16": "^1.15.1",
"eslint": "6.x", "eslint": "6.x",

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

File diff suppressed because it is too large Load Diff