Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c36b8c57c2b4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b665c387bca5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 6, 2019

  1. nixos/tests/munin: port to python

    @x123 @flokli
    x123 authored and flokli committed Dec 6, 2019
    Copy the full SHA
    2cda20c View commit details

Commits on Dec 7, 2019

  1. Merge pull request #74935 from x123/x123-munin-test-python 

    nixos/tests/munin: port to python
    @flokli
    flokli authored Dec 7, 2019
    Copy the full SHA
    b665c38 View commit details
Showing with 22 additions and 22 deletions.
  1. +22 −22 nixos/tests/munin.nix
44 changes: 22 additions & 22 deletions nixos/tests/munin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This test runs basic munin setup with node and cron job running on the same
# machine.

import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "munin";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ domenkozar eelco ];
@@ -12,33 +12,33 @@ import ./make-test.nix ({ pkgs, ...} : {
{ config, ... }:
{
services = {
munin-node = {
munin-node = {
enable = true;
# disable a failing plugin to prevent irrelevant error message, see #23049
disabledPlugins = [ "apc_nis" ];
};
munin-cron = {
enable = true;
# disable a failing plugin to prevent irrelevant error message, see #23049
disabledPlugins = [ "apc_nis" ];
};
munin-cron = {
enable = true;
hosts = ''
[${config.networking.hostName}]
address localhost
'';
};
hosts = ''
[${config.networking.hostName}]
address localhost
'';
};
};
# long timeout to prevent hydra failure on high load
systemd.services.munin-node.serviceConfig.TimeoutStartSec = "10min";

# increase the systemd timer interval so it fires more often
systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.stdenv.lib.mkForce "*:*:0/10";
};
};

testScript = ''
startAll;
start_all()
$one->waitForUnit("munin-node.service");
# make sure the node is actually listening
$one->waitForOpenPort(4949);
$one->succeed('systemctl start munin-cron');
# wait for munin-cron output
$one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
$one->waitForFile("/var/www/munin/one/index.html");
with subtest("ensure munin-node starts and listens on 4949"):
one.wait_for_unit("munin-node.service")
one.wait_for_open_port(4949)
with subtest("ensure munin-cron output is correct"):
one.wait_for_file("/var/lib/munin/one/one-uptime-uptime-g.rrd")
one.wait_for_file("/var/www/munin/one/index.html")
'';
})