movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-11-08 18:01:24 +00:00 • committed by GitHub
commit f14d7cb2f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 877 additions and 474 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nixos/tests/prometheus.nix
View file

@ -130,14 +130,10 @@ in import ./make-test-python.nix {
# This configuration just adds a new prometheus job
# to scrape the node_exporter metrics of the s3 machine.
# We also use an environmentFile to test if that works correctly.
services.prometheus = {
environmentFile = pkgs.writeText "prometheus-config-env-file" ''
JOB_NAME=s3-node_exporter
'';
scrapeConfigs = [
{
job_name = "$JOB_NAME";
job_name = "s3-node_exporter";
static_configs = [
{
targets = [ "s3:9100" ];
@ -232,11 +228,6 @@ in import ./make-test-python.nix {
# Check if prometheus responds to requests:
prometheus.wait_for_unit("prometheus.service")
# Check if prometheus' config file is correctly locked down because it could contain secrets.
prometheus.succeed(
"stat -c '%a %U' /var/lib/prometheus2/prometheus-substituted.yaml | grep '600 prometheus'"
)
prometheus.wait_for_open_port(${toString queryPort})
prometheus.succeed("curl -sf http://127.0.0.1:${toString queryPort}/metrics")