commit 44a3d91e5fb706202f33e2d4180c99dd4a288203 · pyrox.dev/nixpkgs

+30 -26

nixos/modules/services/monitoring/collectd.nix

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.collectd;

     

       7
       7
        
       

     

       8
       8
       -
         unvalidated_conf = pkgs.writeText "collectd-unvalidated.conf" ''

     

       9
       9
       -
           BaseDir "${cfg.dataDir}"

     

       10
       10
       -
           AutoLoadPlugin ${boolToString cfg.autoLoadPlugin}

     

       11
       11
       -
           Hostname "${config.networking.hostName}"

     

       12
       12
       -
       

     

       13
       13
       -
           LoadPlugin syslog

     

       14
       14
       -
           <Plugin "syslog">

     

       15
       15
       -
             LogLevel "info"

     

       16
       16
       -
             NotifyLevel "OKAY"

     

       17
       17
       -
           </Plugin>

     

       18
       18
       -
       

     

       19
       19
       -
           ${concatStrings (mapAttrsToList (plugin: pluginConfig: ''

     

       20
       20
       -
             LoadPlugin ${plugin}

     

       21
       21
       -
             <Plugin "${plugin}">

     

       22
       22
       -
             ${pluginConfig}

     

       23
       23
       -
             </Plugin>

     

       24
       24
       -
           '') cfg.plugins)}

     

       25
       25
       -
       

     

       26
       26
       -
           ${concatMapStrings (f: ''

     

       27
       27
       -
             Include "${f}"

     

       28
       28
       -
           '') cfg.include}

     

       29
       29
       -
       

     

       30
       30
       -
           ${cfg.extraConfig}

     

       31
       31
       -
         '';

     

       8
       8
       +
         baseDirLine = ''BaseDir "${cfg.dataDir}"'';

     

       9
       9
       +
         unvalidated_conf = pkgs.writeText "collectd-unvalidated.conf" cfg.extraConfig;

     

       32
       10
        
       

     

       33
       11
        
         conf = if cfg.validateConfig then

     

       34
       12
        
           pkgs.runCommand "collectd.conf" {} ''

     

       35
       13
        
             echo testing ${unvalidated_conf}

     

       14
       14
       +
             cp ${unvalidated_conf} collectd.conf

     

       36
       15
        
             # collectd -t fails if BaseDir does not exist.

     

       37
       37
       -
             sed '1s/^BaseDir.*$/BaseDir "."/' ${unvalidated_conf} > collectd.conf

     

       16
       16
       +
             substituteInPlace collectd.conf --replace ${lib.escapeShellArgs [ baseDirLine ]} 'BaseDir "."'

     

       38
       17
        
             ${package}/bin/collectd -t -C collectd.conf

     

       39
       18
        
             cp ${unvalidated_conf} $out

     

       40
       19
        
           '' else unvalidated_conf;

     
···

       123
       102
        
           extraConfig = mkOption {

     

       124
       103
        
             default = "";

     

       125
       104
        
             description = ''

     

       126
       126
       -
               Extra configuration for collectd.

     

       105
       105
       +
               Extra configuration for collectd. Use mkBefore to add lines before the

     

       106
       106
       +
               default config, and mkAfter to add them below.

     

       127
       107
        
             '';

     

       128
       108
        
             type = lines;

     

       129
       109
        
           };

     
···

       131
       111
        
         };

     

       132
       112
        
       

     

       133
       113
        
         config = mkIf cfg.enable {

     

       114
       114
       +
           # 1200 is after the default (1000) but before mkAfter (1500).

     

       115
       115
       +
           services.collectd.extraConfig = lib.mkOrder 1200 ''

     

       116
       116
       +
             ${baseDirLine}

     

       117
       117
       +
             AutoLoadPlugin ${boolToString cfg.autoLoadPlugin}

     

       118
       118
       +
             Hostname "${config.networking.hostName}"

     

       119
       119
       +
       

     

       120
       120
       +
             LoadPlugin syslog

     

       121
       121
       +
             <Plugin "syslog">

     

       122
       122
       +
               LogLevel "info"

     

       123
       123
       +
               NotifyLevel "OKAY"

     

       124
       124
       +
             </Plugin>

     

       125
       125
       +
       

     

       126
       126
       +
             ${concatStrings (mapAttrsToList (plugin: pluginConfig: ''

     

       127
       127
       +
               LoadPlugin ${plugin}

     

       128
       128
       +
               <Plugin "${plugin}">

     

       129
       129
       +
               ${pluginConfig}

     

       130
       130
       +
               </Plugin>

     

       131
       131
       +
             '') cfg.plugins)}

     

       132
       132
       +
       

     

       133
       133
       +
             ${concatMapStrings (f: ''

     

       134
       134
       +
               Include "${f}"

     

       135
       135
       +
             '') cfg.include}

     

       136
       136
       +
           '';

     

       137
       137
       +
       

     

       134
       138
        
           systemd.tmpfiles.rules = [

     

       135
       139
        
             "d '${cfg.dataDir}' - ${cfg.user} - - -"

     

       136
       140
        
           ];

+6 -1

nixos/tests/collectd.nix

···

       3
       3
        
         meta = { };

     

       4
       4
        
       

     

       5
       5
        
         nodes.machine =

     

       6
       6
       -
           { pkgs, ... }:

     

       6
       6
       +
           { pkgs, lib, ... }:

     

       7
       7
        
       

     

       8
       8
        
           {

     

       9
       9
        
             services.collectd = {

     

       10
       10
        
               enable = true;

     

       11
       11
       +
               extraConfig = lib.mkBefore ''

     

       12
       12
       +
                 Interval 30

     

       13
       13
       +
               '';

     

       11
       14
        
               plugins = {

     

       12
       15
        
                 rrdtool = ''

     

       13
       16
        
                   DataDir "/var/lib/collectd/rrd"

     
···

       26
       29
        
           machine.succeed(f"rrdinfo {file} | logger")

     

       27
       30
        
           # check that this file contains a shortterm metric

     

       28
       31
        
           machine.succeed(f"rrdinfo {file} | grep -F 'ds[shortterm].min = '")

     

       32
       32
       +
           # check that interval was set before the plugins

     

       33
       33
       +
           machine.succeed(f"rrdinfo {file} | grep -F 'step = 30'")

     

       29
       34
        
           # check that there are frequent updates

     

       30
       35
        
           machine.succeed(f"cp {file} before")

     

       31
       36
        
           machine.wait_until_fails(f"cmp before {file}")