Merge pull request #282963 from NukaDuka/prometheus-pve-exporter-update

prometheus-pve-exporter: 2.3.0 -> 3.2.1

authored by maxine and committed by GitHub 066ccb99 59fe145f

+34 -12
+32 -10
nixos/modules/services/monitoring/prometheus/exporters/pve.nix
··· 21 type = with types; nullOr path; 22 default = null; 23 example = "/etc/prometheus-pve-exporter/pve.env"; 24 - description = lib.mdDoc '' 25 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. 26 27 The environment file should NOT be stored in /nix/store as it contains passwords and/or keys in plain text. ··· 34 type = with types; nullOr path; 35 default = null; 36 example = "/etc/prometheus-pve-exporter/pve.yml"; 37 - description = lib.mdDoc '' 38 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. 39 40 The config file should NOT be stored in /nix/store as it will contain passwords and/or keys in plain text. ··· 45 ''; 46 }; 47 48 collectors = { 49 status = mkOption { 50 type = types.bool; 51 default = true; 52 - description = lib.mdDoc '' 53 Collect Node/VM/CT status 54 ''; 55 }; 56 version = mkOption { 57 type = types.bool; 58 default = true; 59 - description = lib.mdDoc '' 60 Collect PVE version info 61 ''; 62 }; 63 node = mkOption { 64 type = types.bool; 65 default = true; 66 - description = lib.mdDoc '' 67 Collect PVE node info 68 ''; 69 }; 70 cluster = mkOption { 71 type = types.bool; 72 default = true; 73 - description = lib.mdDoc '' 74 Collect PVE cluster info 75 ''; 76 }; 77 resources = mkOption { 78 type = types.bool; 79 default = true; 80 - description = lib.mdDoc '' 81 Collect PVE resources info 82 ''; 83 }; 84 config = mkOption { 85 type = types.bool; 86 default = true; 87 - description = lib.mdDoc '' 88 Collect PVE onboot status 89 ''; 90 }; ··· 102 --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \ 103 --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \ 104 --${optionalString (!cfg.collectors.config) "no-"}collector.config \ 105 - %d/configFile \ 106 - ${toString cfg.port} ${cfg.listenAddress} 107 ''; 108 } // optionalAttrs (cfg.environmentFile != null) { 109 EnvironmentFile = cfg.environmentFile;
··· 21 type = with types; nullOr path; 22 default = null; 23 example = "/etc/prometheus-pve-exporter/pve.env"; 24 + description = '' 25 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. 26 27 The environment file should NOT be stored in /nix/store as it contains passwords and/or keys in plain text. ··· 34 type = with types; nullOr path; 35 default = null; 36 example = "/etc/prometheus-pve-exporter/pve.yml"; 37 + description = '' 38 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. 39 40 The config file should NOT be stored in /nix/store as it will contain passwords and/or keys in plain text. ··· 45 ''; 46 }; 47 48 + server = { 49 + keyFile = mkOption { 50 + type = with types; nullOr path; 51 + default = null; 52 + example = "/var/lib/prometheus-pve-exporter/privkey.key"; 53 + description = '' 54 + Path to a SSL private key file for the server 55 + ''; 56 + }; 57 + 58 + certFile = mkOption { 59 + type = with types; nullOr path; 60 + default = null; 61 + example = "/var/lib/prometheus-pve-exporter/full-chain.pem"; 62 + description = '' 63 + Path to a SSL certificate file for the server 64 + ''; 65 + }; 66 + }; 67 + 68 collectors = { 69 status = mkOption { 70 type = types.bool; 71 default = true; 72 + description = '' 73 Collect Node/VM/CT status 74 ''; 75 }; 76 version = mkOption { 77 type = types.bool; 78 default = true; 79 + description = '' 80 Collect PVE version info 81 ''; 82 }; 83 node = mkOption { 84 type = types.bool; 85 default = true; 86 + description = '' 87 Collect PVE node info 88 ''; 89 }; 90 cluster = mkOption { 91 type = types.bool; 92 default = true; 93 + description = '' 94 Collect PVE cluster info 95 ''; 96 }; 97 resources = mkOption { 98 type = types.bool; 99 default = true; 100 + description = '' 101 Collect PVE resources info 102 ''; 103 }; 104 config = mkOption { 105 type = types.bool; 106 default = true; 107 + description = '' 108 Collect PVE onboot status 109 ''; 110 }; ··· 122 --${optionalString (!cfg.collectors.cluster) "no-"}collector.cluster \ 123 --${optionalString (!cfg.collectors.resources) "no-"}collector.resources \ 124 --${optionalString (!cfg.collectors.config) "no-"}collector.config \ 125 + ${optionalString (cfg.server.keyFile != null) "--server.keyfile ${cfg.server.keyFile}"} \ 126 + ${optionalString (cfg.server.certFile != null) "--server.certfile ${cfg.server.certFile}"} \ 127 + --config.file %d/configFile \ 128 + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} 129 ''; 130 } // optionalAttrs (cfg.environmentFile != null) { 131 EnvironmentFile = cfg.environmentFile;
+2 -2
pkgs/servers/monitoring/prometheus/pve-exporter.nix
··· 6 7 python3.pkgs.buildPythonApplication rec { 8 pname = "prometheus-pve-exporter"; 9 - version = "2.3.0"; 10 11 src = fetchPypi { 12 inherit pname version; 13 - sha256 = "sha256-hL1+vP+/Xi3od+17906YARgg4APlFhRkdOCnRxDHJmM="; 14 }; 15 16 propagatedBuildInputs = with python3.pkgs; [
··· 6 7 python3.pkgs.buildPythonApplication rec { 8 pname = "prometheus-pve-exporter"; 9 + version = "3.2.1"; 10 11 src = fetchPypi { 12 inherit pname version; 13 + sha256 = "sha256-ruJGp/juRxFJwnd0A7/qWgeJHFg9oIKekjWIe3kiUa4="; 14 }; 15 16 propagatedBuildInputs = with python3.pkgs; [