Merge pull request #282963 from NukaDuka/prometheus-pve-exporter-update (066ccb99) · Commits · nix / nixpkgs

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

+32 −10

Original line number	Diff line number	Diff line
		@@ -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;

pkgs/servers/monitoring/prometheus/pve-exporter.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,11 +6,11 @@

		python3.pkgs.buildPythonApplication rec {
		pname = "prometheus-pve-exporter";
		version = "2.3.0";
		version = "3.2.1";

		src = fetchPypi {
		inherit pname version;
		sha256 = "sha256-hL1+vP+/Xi3od+17906YARgg4APlFhRkdOCnRxDHJmM=";
		sha256 = "sha256-ruJGp/juRxFJwnd0A7/qWgeJHFg9oIKekjWIe3kiUa4=";
		};

		propagatedBuildInputs = with python3.pkgs; [

Admin message