Skip to content

Commit

Permalink
nixos/prometheus-snmp-exporter: add config check
Browse files Browse the repository at this point in the history
This is introduced and enabled by default because the config syntax for
the exporter changed with release 0.23.0.

This should make the breaking config change obvious before services are
deployed with an incompatible old config.

The check is based on the check present in the blackbox-exporter module.
  • Loading branch information
WilliButz committed Jan 17, 2024
1 parent a8ea9fe commit bb9c776
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 3 deletions.
4 changes: 4 additions & 0 deletions nixos/doc/manual/release-notes/rl-2405.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `security.pam.enableSSHAgentAuth` now requires `services.openssh.authorizedKeysFiles` to be non-empty,
which is the case when `services.openssh.enable` is true. Previously, `pam_ssh_agent_auth` silently failed to work.

- The configuration format for `services.prometheus.exporters.snmp` changed with release 0.23.0.
The module now includes an optional config check, that is enabled by default, to make the change obvious before any deployment.
More information about the configuration syntax change is available in the [upstream repository](https://github.com/prometheus/snmp_exporter/blob/b75fc6b839ee3f3ccbee68bee55f1ae99555084a/auth-split-migration.md).

## Other Notable Changes {#sec-release-24.05-notable-changes}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
Expand Down
39 changes: 36 additions & 3 deletions nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@ with lib;

let
cfg = config.services.prometheus.exporters.snmp;

# This ensures that we can deal with string paths, path types and
# store-path strings with context.
coerceConfigFile = file:
if (builtins.isPath file) || (lib.isStorePath file) then
file
else
(lib.warn ''
${logPrefix}: configuration file "${file}" is being copied to the nix-store.

This comment has been minimized.

Copy link
@zopieux

zopieux Jan 27, 2024

Contributor

@WilliButz AFAICT, logPrefix is not defined there, causing a build issue when this branch is taken.

This comment has been minimized.

Copy link
@WilliButz

WilliButz Jan 27, 2024

Author Member

Thank you! I didn't notice this when I copied it from the blackbox exporter module

This comment has been minimized.

Copy link
@WilliButz

WilliButz Jan 27, 2024

Author Member
If you would like to avoid that, please set enableConfigCheck to false.
'' /. + file);

checkConfig = file:
pkgs.runCommandLocal "checked-snmp-exporter-config.yml" {
nativeBuildInputs = [ pkgs.buildPackages.prometheus-snmp-exporter ];
} ''
ln -s ${coerceConfigFile file} $out
snmp_exporter --dry-run --config.file $out
'';
in
{
port = 9116;
Expand Down Expand Up @@ -31,6 +50,16 @@ in
};
};

enableConfigCheck = mkOption {
type = types.bool;
default = true;
description = lib.mdDoc ''
Whether to run a correctness check for the configuration file. This depends
on the configuration file residing in the nix-store. Paths passed as string will
be copied to the store.
'';
};

logFormat = mkOption {
type = types.enum ["logfmt" "json"];
default = "logfmt";
Expand All @@ -48,9 +77,13 @@ in
};
};
serviceOpts = let
configFile = if cfg.configurationPath != null
then cfg.configurationPath
else "${pkgs.writeText "snmp-exporter-conf.yml" (builtins.toJSON cfg.configuration)}";
uncheckedConfigFile = if cfg.configurationPath != null
then cfg.configurationPath
else "${pkgs.writeText "snmp-exporter-conf.yml" (builtins.toJSON cfg.configuration)}";
configFile = if cfg.enableConfigCheck then
checkConfig uncheckedConfigFile
else
uncheckedConfigFile;
in {
serviceConfig = {
ExecStart = ''
Expand Down

0 comments on commit bb9c776

Please sign in to comment.