Unverified Commit 008a4657 authored by Defelo's avatar Defelo
Browse files

nixos/tests/prometheus: migrate to runTest

parent 9f489ef1

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ in 
  private-gpt = handleTest ./private-gpt.nix { };

  privatebin = runTest ./privatebin.nix;

  privoxy = handleTest ./privoxy.nix { };

  prometheus = handleTest ./prometheus { };

  prometheus = import ./prometheus { inherit runTest; };

  prometheus-exporters = handleTest ./prometheus-exporters.nix { };

  prosody = handleTest ./xmpp/prosody.nix { };

  prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { };

nixos/tests/prometheus/alertmanager.nix

+131 −145
Original line number Diff line number Diff line 
import ../make-test-python.nix (

  { lib, pkgs, ... }:

{ pkgs, ... }:



{

  name = "prometheus-alertmanager";
@@ -20,11 +19,7 @@ import ../make-test-python.nix ( 
            {

              scheme = "http";

              static_configs = [

                  {

                    targets = [

                      "alertmanager:${toString config.services.prometheus.alertmanager.port}"

                    ];

                  }

                { targets = [ "alertmanager:${toString config.services.prometheus.alertmanager.port}" ]; }

              ];

            }

          ];
@@ -48,21 +43,13 @@ import ../make-test-python.nix ( 
            {

              job_name = "alertmanager";

              static_configs = [

                  {

                    targets = [

                      "alertmanager:${toString config.services.prometheus.alertmanager.port}"

                    ];

                  }

                { targets = [ "alertmanager:${toString config.services.prometheus.alertmanager.port}" ]; }

              ];

            }

            {

              job_name = "node";

              static_configs = [

                  {

                    targets = [

                      "node:${toString config.services.prometheus.exporters.node.port}"

                    ];

                  }

                { targets = [ "node:${toString config.services.prometheus.exporters.node.port}" ]; }

              ];

            }

          ];
@@ -157,4 +144,3 @@ import ../make-test-python.nix ( 
    alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'"))

  '';

}
 
)

nixos/tests/prometheus/config-reload.nix

+89 −101
Original line number Diff line number Diff line 
import ../make-test-python.nix (

  { lib, pkgs, ... }:



{

  name = "prometheus-config-reload";
@@ -19,13 +16,7 @@ import ../make-test-python.nix ( 
          scrapeConfigs = [

            {

              job_name = "prometheus";

                static_configs = [

                  {

                    targets = [

                      "prometheus:${toString config.services.prometheus.port}"

                    ];

                  }

                ];

              static_configs = [ { targets = [ "prometheus:${toString config.services.prometheus.port}" ]; } ];

            }

          ];

        };
@@ -42,9 +33,7 @@ import ../make-test-python.nix ( 
                  {

                    job_name = "node";

                    static_configs = [

                        {

                          targets = [ "node:${toString config.services.prometheus.exporters.node.port}" ];

                        }

                      { targets = [ "node:${toString config.services.prometheus.exporters.node.port}" ]; }

                    ];

                  }

                ];
@@ -117,4 +106,3 @@ import ../make-test-python.nix ( 
      )

  '';

}
 
)

nixos/tests/prometheus/default.nix

+7 −11
Original line number Diff line number Diff line 
{

  system ? builtins.currentSystem,

  config ? { },

  pkgs ? import ../../.. { inherit system config; },

}:

{ runTest }:



{

  alertmanager = import ./alertmanager.nix { inherit system pkgs; };

  config-reload = import ./config-reload.nix { inherit system pkgs; };

  federation = import ./federation.nix { inherit system pkgs; };

  prometheus-pair = import ./prometheus-pair.nix { inherit system pkgs; };

  pushgateway = import ./pushgateway.nix { inherit system pkgs; };

  remote-write = import ./remote-write.nix { inherit system pkgs; };

  alertmanager = runTest ./alertmanager.nix;

  config-reload = runTest ./config-reload.nix;

  federation = runTest ./federation.nix;

  prometheus-pair = runTest ./prometheus-pair.nix;

  pushgateway = runTest ./pushgateway.nix;

  remote-write = runTest ./remote-write.nix;

}

nixos/tests/prometheus/federation.nix

+190 −214
Original line number Diff line number Diff line 
import ../make-test-python.nix (

  { lib, pkgs, ... }:



{

  name = "prometheus-federation";
@@ -116,22 +113,12 @@ import ../make-test-python.nix ( 
            {

              job_name = "node";

              static_configs = [

                  {

                    targets = [

                      "node1:${toString config.services.prometheus.exporters.node.port}"

                    ];

                  }

                { targets = [ "node1:${toString config.services.prometheus.exporters.node.port}" ]; }

              ];

            }

            {

              job_name = "prometheus";

                static_configs = [

                  {

                    targets = [

                      "prometheus1:${toString config.services.prometheus.port}"

                    ];

                  }

                ];

              static_configs = [ { targets = [ "prometheus1:${toString config.services.prometheus.port}" ]; } ];

            }

          ];

        };
@@ -152,22 +139,12 @@ import ../make-test-python.nix ( 
            {

              job_name = "node";

              static_configs = [

                  {

                    targets = [

                      "node2:${toString config.services.prometheus.exporters.node.port}"

                    ];

                  }

                { targets = [ "node2:${toString config.services.prometheus.exporters.node.port}" ]; }

              ];

            }

            {

              job_name = "prometheus";

                static_configs = [

                  {

                    targets = [

                      "prometheus2:${toString config.services.prometheus.port}"

                    ];

                  }

                ];

              static_configs = [ { targets = [ "prometheus2:${toString config.services.prometheus.port}" ]; } ];

            }

          ];

        };
@@ -224,4 +201,3 @@ import ../make-test-python.nix ( 
      )

  '';

}
 
)