commit 3b5cf35e8bc5198cbd9f2e34a6df9c971947a7e8 · pyrox.dev/nixpkgs

+3 -1

nixos/modules/services/monitoring/prometheus/exporters.nix

···

       205
       205
        
                 or `services.prometheus.exporters.snmp.configurationPath' set!

     

       206
       206
        
             '';

     

       207
       207
        
           } {

     

       208
       208
       -
             assertion = (cfg.mail.configFile == null) != (cfg.mail.configuration == {});

     

       208
       208
       +
             assertion = cfg.mail.enable -> (

     

       209
       209
       +
               (cfg.mail.configFile == null) != (cfg.mail.configuration == null)

     

       210
       210
       +
             );

     

       209
       211
        
             message = ''

     

       210
       212
        
               Please specify either 'services.prometheus.exporters.mail.configuration'

     

       211
       213
        
                 or 'services.prometheus.exporters.mail.configFile'.

+3 -3

nixos/modules/services/monitoring/prometheus/exporters/mail.nix

···

       127
       127
        
             '';

     

       128
       128
        
           };

     

       129
       129
        
           configuration = mkOption {

     

       130
       130
       -
             type = types.submodule exporterOptions;

     

       131
       131
       -
             default = {};

     

       130
       130
       +
             type = types.nullOr (types.submodule exporterOptions);

     

       131
       131
       +
             default = null;

     

       132
       132
        
             description = ''

     

       133
       133
        
               Specify the mailexporter configuration file to use.

     

       134
       134
        
             '';

     
···

       148
       148
        
               ${pkgs.prometheus-mail-exporter}/bin/mailexporter \

     

       149
       149
        
                 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

     

       150
       150
        
                 --config.file ${

     

       151
       151
       -
                   if cfg.configuration != {} then configurationFile else (escapeShellArg cfg.configFile)

     

       151
       151
       +
                   if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile)

     

       152
       152
        
                 } \

     

       153
       153
        
                 ${concatStringsSep " \\\n  " cfg.extraFlags}

     

       154
       154
        
             '';