diff options
author | maxine <35892750+amaxine@users.noreply.github.com> | 2024-01-25 21:17:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-25 21:17:19 +0100 |
commit | 066ccb996b252de54bbfd04a42fd1486e2971a92 (patch) | |
tree | 3c32df9ecea74493f159563bd68c2dc9e324a2c4 /nixos/modules/services/monitoring | |
parent | 59fe145f4010e406d141eaf55930e073723f8e14 (diff) | |
parent | dde72e969eedf1b7de268cf41ca7b67842b326b8 (diff) | |
download | nixlib-066ccb996b252de54bbfd04a42fd1486e2971a92.tar nixlib-066ccb996b252de54bbfd04a42fd1486e2971a92.tar.gz nixlib-066ccb996b252de54bbfd04a42fd1486e2971a92.tar.bz2 nixlib-066ccb996b252de54bbfd04a42fd1486e2971a92.tar.lz nixlib-066ccb996b252de54bbfd04a42fd1486e2971a92.tar.xz nixlib-066ccb996b252de54bbfd04a42fd1486e2971a92.tar.zst nixlib-066ccb996b252de54bbfd04a42fd1486e2971a92.zip |
Merge pull request #282963 from NukaDuka/prometheus-pve-exporter-update
prometheus-pve-exporter: 2.3.0 -> 3.2.1
Diffstat (limited to 'nixos/modules/services/monitoring')
-rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/pve.nix | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix index 20ee2e4b3238..83e740320df2 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -21,7 +21,7 @@ in type = with types; nullOr path; default = null; example = "/etc/prometheus-pve-exporter/pve.env"; - description = lib.mdDoc '' + description = '' Path to the service's environment file. This path can either be a computed path in /nix/store or a path in the local filesystem. The environment file should NOT be stored in /nix/store as it contains passwords and/or keys in plain text. @@ -34,7 +34,7 @@ in type = with types; nullOr path; default = null; example = "/etc/prometheus-pve-exporter/pve.yml"; - description = lib.mdDoc '' + description = '' Path to the service's config file. This path can either be a computed path in /nix/store or a path in the local filesystem. The config file should NOT be stored in /nix/store as it will contain passwords and/or keys in plain text. @@ -45,46 +45,66 @@ in ''; }; + server = { + keyFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/var/lib/prometheus-pve-exporter/privkey.key"; + description = '' + Path to a SSL private key file for the server + ''; + }; + + certFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/var/lib/prometheus-pve-exporter/full-chain.pem"; + description = '' + Path to a SSL certificate file for the server + ''; + }; + }; + collectors = { status = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Collect Node/VM/CT status ''; }; version = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Collect PVE version info ''; }; node = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Collect PVE node info ''; }; cluster = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Collect PVE cluster info ''; }; resources = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Collect PVE resources info ''; }; config = mkOption { type = types.bool; default = true; - description = lib.mdDoc '' + description = '' Collect PVE onboot status ''; }; @@ -102,8 +122,10 @@ in --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \ --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \ --${optionalString (!cfg.collectors.config) "no-"}collector.config \ - %d/configFile \ - ${toString cfg.port} ${cfg.listenAddress} + ${optionalString (cfg.server.keyFile != null) "--server.keyfile ${cfg.server.keyFile}"} \ + ${optionalString (cfg.server.certFile != null) "--server.certfile ${cfg.server.certFile}"} \ + --config.file %d/configFile \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ''; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; |