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: 0c2b9e6eacf6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e6fb350cf646
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 14, 2019

  1. nixos/riemann-tools: Add ExtraArgs Config Option 

    Added option "extraArgs" to forward any switches to riemann-tools.
    Tim Digel committed Aug 14, 2019
    Copy the full SHA
    5bbde1e View commit details

Commits on Aug 18, 2019

  1. Merge pull request #66606 from DerTim1/riemann-config 

    nixos/riemann-tools: Add ExtraArgs Config Option
    @mmahut
    mmahut authored Aug 18, 2019
    Copy the full SHA
    e6fb350 View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 nixos/modules/services/monitoring/riemann-tools.nix
12 changes: 10 additions & 2 deletions nixos/modules/services/monitoring/riemann-tools.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ let

healthLauncher = writeScriptBin "riemann-health" ''
#!/bin/sh
exec ${pkgs.riemann-tools}/bin/riemann-health --host ${riemannHost}
exec ${pkgs.riemann-tools}/bin/riemann-health ${builtins.concatStringsSep " " cfg.extraArgs} --host ${riemannHost}
'';


@@ -34,8 +34,16 @@ in {
Address of the host riemann node. Defaults to localhost.
'';
};
extraArgs = mkOption {
type = types.listOf types.string;
default = [];
description = ''
A list of commandline-switches forwarded to a riemann-tool.
See for example `riemann-health --help` for available options.
'';
example = ["-p 5555" "--timeout=30" "--attribute=myattribute=42"];
};
};

};

config = mkIf cfg.enableHealth {