nixos/promtheus-nextcloud-exporter: update module and test
Use new command-line flags of release 0.3.0 and always answer with the expected XML in the VM test instead of using a test-specific fixed path. Co-authored-by: ajs124 <git@ajs124.de>
This commit is contained in:
parent
1c224b957f
commit
254b510ce7
|
@ -46,11 +46,11 @@ in
|
||||||
DynamicUser = false;
|
DynamicUser = false;
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \
|
${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \
|
||||||
-a ${cfg.listenAddress}:${toString cfg.port} \
|
--addr ${cfg.listenAddress}:${toString cfg.port} \
|
||||||
-u ${cfg.username} \
|
--username ${cfg.username} \
|
||||||
-t ${cfg.timeout} \
|
--timeout ${cfg.timeout} \
|
||||||
-l ${cfg.url} \
|
--server ${cfg.url} \
|
||||||
-p ${escapeShellArg "@${cfg.passwordFile}"} \
|
--password ${escapeShellArg "@${cfg.passwordFile}"} \
|
||||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
|
@ -423,7 +423,7 @@ let
|
||||||
exporterConfig = {
|
exporterConfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
passwordFile = "/var/nextcloud-pwfile";
|
passwordFile = "/var/nextcloud-pwfile";
|
||||||
url = "http://localhost/negative-space.xml";
|
url = "http://localhost";
|
||||||
};
|
};
|
||||||
metricProvider = {
|
metricProvider = {
|
||||||
systemd.services.nc-pwfile = let
|
systemd.services.nc-pwfile = let
|
||||||
|
@ -441,6 +441,7 @@ let
|
||||||
basicAuth.nextcloud-exporter = "snakeoilpw";
|
basicAuth.nextcloud-exporter = "snakeoilpw";
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
root = "${pkgs.prometheus-nextcloud-exporter.src}/serverinfo/testdata";
|
root = "${pkgs.prometheus-nextcloud-exporter.src}/serverinfo/testdata";
|
||||||
|
tryFiles = "/negative-space.xml =404";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue