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