commit 4e7f20ade9b036e43df103192312ce5b4740d69c · pyrox.dev/nixpkgs

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

···

       878
       878
        
                 been fixed to allow more than one plugin in the path.

     

       879
       879
        
               </para>

     

       880
       880
        
             </listitem>

     

       881
       881
       +
             <listitem>

     

       882
       882
       +
               <para>

     

       883
       883
       +
                 The option

     

       884
       884
       +
                 <literal>services.prometheus.exporters.pihole.interval</literal>

     

       885
       885
       +
                 does not exist anymore and has been removed.

     

       886
       886
       +
               </para>

     

       887
       887
       +
             </listitem>

     

       881
       888
        
           </itemizedlist>

     

       882
       889
        
         </section>

     

       883
       890
        
       </section>

nixos/doc/manual/release-notes/rl-2305.section.md

···

       218
       218
        
       - `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision

     

       219
       219
        
       

     

       220
       220
        
       - The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path.

     

       221
       221
       +
       

     

       222
       222
       +
       - The option `services.prometheus.exporters.pihole.interval` does not exist anymore and has been removed.

+20 -16

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

···

       6
       6
        
         cfg = config.services.prometheus.exporters.pihole;

     

       7
       7
        
       in

     

       8
       8
        
       {

     

       9
       9
       +
         imports = [

     

       10
       10
       +
           (mkRemovedOptionModule [ "interval"] "This option has been removed.")

     

       11
       11
       +
           ({ options.warnings = options.warnings; options.assertions = options.assertions; })

     

       12
       12
       +
         ];

     

       13
       13
       +
       

     

       9
       14
        
         port = 9617;

     

       10
       15
        
         extraOpts = {

     

       11
       16
        
           apiToken = mkOption {

     
···

       13
       18
        
             default = "";

     

       14
       19
        
             example = "580a770cb40511eb85290242ac130003580a770cb40511eb85290242ac130003";

     

       15
       20
        
             description = lib.mdDoc ''

     

       16
       16
       -
               pi-hole API token which can be used instead of a password

     

       17
       17
       -
             '';

     

       18
       18
       -
           };

     

       19
       19
       -
           interval = mkOption {

     

       20
       20
       -
             type = types.str;

     

       21
       21
       -
             default = "10s";

     

       22
       22
       -
             example = "30s";

     

       23
       23
       -
             description = lib.mdDoc ''

     

       24
       24
       -
               How often to scrape new data

     

       21
       21
       +
               Pi-Hole API token which can be used instead of a password

     

       25
       22
        
             '';

     

       26
       23
        
           };

     

       27
       24
        
           password = mkOption {

     
···

       29
       26
        
             default = "";

     

       30
       27
        
             example = "password";

     

       31
       28
        
             description = lib.mdDoc ''

     

       32
       32
       -
               The password to login into pihole. An api token can be used instead.

     

       29
       29
       +
               The password to login into Pi-Hole. An api token can be used instead.

     

       33
       30
        
             '';

     

       34
       31
        
           };

     

       35
       32
        
           piholeHostname = mkOption {

     
···

       37
       34
        
             default = "pihole";

     

       38
       35
        
             example = "127.0.0.1";

     

       39
       36
        
             description = lib.mdDoc ''

     

       40
       40
       -
               Hostname or address where to find the pihole webinterface

     

       37
       37
       +
               Hostname or address where to find the Pi-Hole webinterface

     

       41
       38
        
             '';

     

       42
       39
        
           };

     

       43
       40
        
           piholePort = mkOption {

     
···

       45
       42
        
             default = 80;

     

       46
       43
        
             example = 443;

     

       47
       44
        
             description = lib.mdDoc ''

     

       48
       48
       -
               The port pihole webinterface is reachable on

     

       45
       45
       +
               The port Pi-Hole webinterface is reachable on

     

       49
       46
        
             '';

     

       50
       47
        
           };

     

       51
       48
        
           protocol = mkOption {

     
···

       53
       50
        
             default = "http";

     

       54
       51
        
             example = "https";

     

       55
       52
        
             description = lib.mdDoc ''

     

       56
       56
       -
               The protocol which is used to connect to pihole

     

       53
       53
       +
               The protocol which is used to connect to Pi-Hole

     

       54
       54
       +
             '';

     

       55
       55
       +
           };

     

       56
       56
       +
           timeout = mkOption {

     

       57
       57
       +
             type = types.str;

     

       58
       58
       +
             default = "5s";

     

       59
       59
       +
             description = lib.mdDoc ''

     

       60
       60
       +
               Controls the timeout to connect to a Pi-Hole instance

     

       57
       61
        
             '';

     

       58
       62
        
           };

     

       59
       63
        
         };

     

       60
       64
        
         serviceOpts = {

     

       61
       65
        
           serviceConfig = {

     

       62
       66
        
             ExecStart = ''

     

       63
       63
       -
               ${pkgs.bash}/bin/bash -c "${pkgs.prometheus-pihole-exporter}/bin/pihole-exporter \

     

       64
       64
       -
                 -interval ${cfg.interval} \

     

       67
       67
       +
               ${pkgs.prometheus-pihole-exporter}/bin/pihole-exporter \

     

       65
       68
        
                 ${optionalString (cfg.apiToken != "") "-pihole_api_token ${cfg.apiToken}"} \

     

       66
       69
        
                 -pihole_hostname ${cfg.piholeHostname} \

     

       67
       70
        
                 ${optionalString (cfg.password != "") "-pihole_password ${cfg.password}"} \

     

       68
       71
        
                 -pihole_port ${toString cfg.piholePort} \

     

       69
       72
        
                 -pihole_protocol ${cfg.protocol} \

     

       70
       70
       -
                 -port ${toString cfg.port}"

     

       73
       73
       +
                 -port ${toString cfg.port} \

     

       74
       74
       +
                 -timeout ${cfg.timeout}

     

       71
       75
        
             '';

     

       72
       76
        
           };

     

       73
       77
        
         };