colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/prometheus/exporters: Remove all with lib; usage

Browse Source 
Fixes issues described in #208242 for this part of the nixpkgs tree.

There are no behavioral changes in this, it only adjusts the code so
that it is easier to understand.
This commit is contained in:
Pyrox 2024-04-24 14:41:17 -04:00
parent 9d9758f548
commit ae359d1ef2
No known key found for this signature in database
GPG Key ID: 8CDF3F7CAA53A0F5
65 changed files with 307 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.apcupsd;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9162;

3
nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.artifactory;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9531;

3
nixos/modules/services/monitoring/prometheus/exporters/bind.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.bind;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9119;

8
nixos/modules/services/monitoring/prometheus/exporters/bird.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.bird;
inherit (lib)
mkOption
types
concatStringsSep
singleton
;
in
{
port = 9324;

3
nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.bitcoin;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9332;

8
nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
View File

@ -1,10 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
logPrefix = "services.prometheus.exporter.blackbox";
cfg = config.services.prometheus.exporters.blackbox;
inherit (lib)
mkOption
types
concatStringsSep
escapeShellArg
;
# This ensures that we can deal with string paths, path types and
# store-path strings with context.

9
nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.buildkite-agent;
inherit (lib)
mkOption
types
concatStringsSep
optionalString
literalExpression
;
in
{
port = 9876;

10
nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
View File

@ -1,9 +1,15 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.collectd;
inherit (lib)
mkOption
mkEnableOption
types
optionalString
concatStringsSep
escapeShellArg
;
in
{
port = 9103;

3
nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.dmarc;
inherit (lib) mkOption types optionalString;
json = builtins.toJSON {
inherit (cfg) folders port;

8
nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.dnsmasq;
inherit (lib)
mkOption
types
concatStringsSep
escapeShellArg
;
in
{
port = 9153;

3
nixos/modules/services/monitoring/prometheus/exporters/domain.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.domain;
inherit (lib) concatStringsSep;
in
{
port = 9222;

8
nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.dovecot;
inherit (lib)
mkOption
types
escapeShellArg
concatStringsSep
;
in
{
port = 9166;

9
nixos/modules/services/monitoring/prometheus/exporters/flow.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.flow;
inherit (lib)
mkOption
types
literalExpression
concatStringsSep
optionalString
;
in {
port = 9590;
extraOpts = {

3
nixos/modules/services/monitoring/prometheus/exporters/fritzbox.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.fritzbox;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9133;

2
nixos/modules/services/monitoring/prometheus/exporters/idrac.nix
View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.idrac;
inherit (lib) mkOption types;
configFile = if cfg.configurationPath != null
then cfg.configurationPath

11
nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix
View File

@ -1,7 +1,5 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.imap-mailstat;
valueToString = value:
@ -13,6 +11,15 @@ let
else "XXX ${toString value}"
)
);
inherit (lib)
mkOption
types
concatStrings
concatStringsSep
attrValues
mapAttrs
optionalString
;
createConfigFile = accounts:
# unfortunately on toTOML yet
# https://github.com/NixOS/nix/issues/3929

3
nixos/modules/services/monitoring/prometheus/exporters/influxdb.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.influxdb;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9122;

9
nixos/modules/services/monitoring/prometheus/exporters/ipmi.nix
View File

@ -1,10 +1,15 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
logPrefix = "services.prometheus.exporter.ipmi";
cfg = config.services.prometheus.exporters.ipmi;
inherit (lib)
mkOption
types
concatStringsSep
optionals
escapeShellArg
;
in {
port = 9290;

8
nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.jitsi;
inherit (lib)
mkOption
types
escapeShellArg
concatStringsSep
;
in
{
port = 9700;

9
nixos/modules/services/monitoring/prometheus/exporters/json.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.json;
inherit (lib)
mkOption
types
escapeShellArg
concatStringsSep
mkRemovedOptionModule
;
in
{
port = 7979;

9
nixos/modules/services/monitoring/prometheus/exporters/junos-czerwonk.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.junos-czerwonk;
inherit (lib)
mkOption
types
escapeShellArg
mkIf
concatStringsSep
;
configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configurationFile);

8
nixos/modules/services/monitoring/prometheus/exporters/kea.nix
View File

@ -5,10 +5,14 @@
, ...
}:
with lib;
let
cfg = config.services.prometheus.exporters.kea;
inherit (lib)
mkOption
types
mkRenamedOptionModule
literalExpression
;
in {
imports = [
(mkRenamedOptionModule [ "controlSocketPaths" ] [ "targets" ])

3
nixos/modules/services/monitoring/prometheus/exporters/keylight.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.keylight;
inherit (lib) concatStringsSep;
in
{
port = 9288;

8
nixos/modules/services/monitoring/prometheus/exporters/knot.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.knot;
inherit (lib)
mkOption
types
literalExpression
concatStringsSep
;
in {
port = 9433;
extraOpts = {

3
nixos/modules/services/monitoring/prometheus/exporters/lnd.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.lnd;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9092;

14
nixos/modules/services/monitoring/prometheus/exporters/mail.nix
View File

@ -1,9 +1,19 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.mail;
inherit (lib)
mkOption
types
mapAttrs'
nameValuePair
toLower
filterAttrs
escapeShellArg
literalExpression
mkIf
concatStringsSep
;
configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile);

9
nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.mikrotik;
inherit (lib)
mkOption
types
literalExpression
concatStringsSep
escapeShellArg
;
in
{
port = 9436;

9
nixos/modules/services/monitoring/prometheus/exporters/minio.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.minio;
inherit (lib)
mkOption
types
optionalString
concatStringsSep
escapeShellArg
;
in
{
port = 9290;

3
nixos/modules/services/monitoring/prometheus/exporters/modemmanager.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.modemmanager;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9539;

12
nixos/modules/services/monitoring/prometheus/exporters/mongodb.nix
View File

@ -1,9 +1,17 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.mongodb;
inherit (lib)
mkOption
types
optionalString
getExe
length
concatStringsSep
concatMapStringsSep
escapeShellArgs
;
in
{
port = 9216;

5
nixos/modules/services/monitoring/prometheus/exporters/nats.nix
View File

@ -1,11 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.nats;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 7777;

8
nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.nextcloud;
inherit (lib)
mkOption
types
escapeShellArg
concatStringsSep
;
in
{
port = 9205;

11
nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
View File

@ -1,9 +1,16 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.nginx;
inherit (lib)
mkOption
types
mkMerge
mkRemovedOptionModule
mkRenamedOptionModule
mkIf
concatStringsSep
;
in
{
port = 9113;

3
nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.nginxlog;
inherit (lib) mkOption types;
in {
port = 9117;
extraOpts = {

10
nixos/modules/services/monitoring/prometheus/exporters/node.nix
View File

@ -1,9 +1,15 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.node;
inherit (lib)
mkOption
types
concatStringsSep
concatMapStringsSep
any
optionals
;
collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors;
collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors;
in

8
nixos/modules/services/monitoring/prometheus/exporters/nut.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.nut;
inherit (lib)
mkOption
types
optionalString
concatStringsSep
;
in
{
port = 9199;

3
nixos/modules/services/monitoring/prometheus/exporters/openldap.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.openldap;
inherit (lib) mkOption types concatStringsSep;
in {
port = 9330;
extraOpts = {

9
nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.pgbouncer;
inherit (lib)
mkOption
types
optionals
escapeShellArg
concatStringsSep
;
in
{
port = 9127;

8
nixos/modules/services/monitoring/prometheus/exporters/pihole.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.pihole;
inherit (lib)
mkOption
types
mkRemovedOptionModule
optionalString
;
in
{
imports = [

2
nixos/modules/services/monitoring/prometheus/exporters/ping.nix
View File

@ -1,9 +1,9 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.ping;
inherit (lib) mkOption types concatStringsSep;
settingsFormat = pkgs.formats.yaml {};
configFile = settingsFormat.generate "config.yml" cfg.settings;

10
nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
View File

@ -1,9 +1,15 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.postfix;
inherit (lib)
mkOption
types
mkIf
escapeShellArg
concatStringsSep
optional
;
in
{
port = 9154;

9
nixos/modules/services/monitoring/prometheus/exporters/postgres.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.postgres;
inherit (lib)
mkOption
types
mkIf
mkForce
concatStringsSep
;
in
{
port = 9187;

8
nixos/modules/services/monitoring/prometheus/exporters/process.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.process;
inherit (lib)
mkOption
types
literalExpression
concatStringsSep
;
configFile = pkgs.writeText "process-exporter.yaml" (builtins.toJSON cfg.settings);
in
{

8
nixos/modules/services/monitoring/prometheus/exporters/pve.nix
View File

@ -1,8 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.pve;
inherit (lib)
mkOption
types
mkPackageOption
optionalString
optionalAttrs
;
# pve exporter requires a config file so create an empty one if configFile is not provided
emptyConfigFile = pkgs.writeTextFile {

3
nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.py-air-control;
inherit (lib) mkOption types;
workingDir = "/var/lib/${cfg.stateDir}";

3
nixos/modules/services/monitoring/prometheus/exporters/redis.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.redis;
inherit (lib) concatStringsSep;
in
{
port = 9121;

13
nixos/modules/services/monitoring/prometheus/exporters/restic.nix
View File

@ -1,9 +1,18 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.restic;
inherit (lib)
mkOption
types
concatStringsSep
mkIf
mapAttrs'
splitString
toUpper
optionalAttrs
nameValuePair
;
in
{
port = 9753;

11
nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix
View File

@ -1,9 +1,16 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.rspamd;
inherit (lib)
mkOption
types
replaceStrings
mkRemovedOptionModule
recursiveUpdate
concatStringsSep
literalExpression
;
mkFile = conf:
pkgs.writeText "rspamd-exporter-config.yml" (builtins.toJSON conf);

8
nixos/modules/services/monitoring/prometheus/exporters/script.nix
View File

@ -1,9 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.script;
inherit (lib)
mkOption
types
literalExpression
concatStringsSep
;
configFile = pkgs.writeText "script-exporter.yaml" (builtins.toJSON cfg.settings);
in
{

3
nixos/modules/services/monitoring/prometheus/exporters/shelly.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.shelly;
inherit (lib) mkOption types;
in
{
port = 9784;

3
nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.smartctl;
inherit (lib) mkOption types literalExpression;
args = lib.escapeShellArgs ([
"--web.listen-address=${cfg.listenAddress}:${toString cfg.port}"
"--smartctl.path=${pkgs.smartmontools}/bin/smartctl"

3
nixos/modules/services/monitoring/prometheus/exporters/smokeping.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.smokeping;
inherit (lib) mkOption types concatStringsSep;
goDuration = types.mkOptionType {
name = "goDuration";
description = "Go duration (https://golang.org/pkg/time/#ParseDuration)";

9
nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
View File

@ -1,10 +1,15 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
logPrefix = "services.prometheus.exporters.snmp";
cfg = config.services.prometheus.exporters.snmp;
inherit (lib)
mkOption
types
literalExpression
escapeShellArg
concatStringsSep
;
# This ensures that we can deal with string paths, path types and
# store-path strings with context.

8
nixos/modules/services/monitoring/prometheus/exporters/sql.nix
View File

@ -1,7 +1,13 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.sql;
inherit (lib)
mkOption
types
mapAttrs
mapAttrsToList
concatStringsSep
;
cfgOptions = {
options = with types; {
jobs = mkOption {

3
nixos/modules/services/monitoring/prometheus/exporters/statsd.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.statsd;
inherit (lib) concatStringsSep;
in
{
port = 9102;

3
nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.surfboard;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9239;

7
nixos/modules/services/monitoring/prometheus/exporters/systemd.nix
View File

@ -1,9 +1,8 @@
{ config, pkgs, lib, ... }:
with lib;
let cfg = config.services.prometheus.exporters.systemd;
let
cfg = config.services.prometheus.exporters.systemd;
inherit (lib) concatStringsSep;
in {
port = 9558;

3
nixos/modules/services/monitoring/prometheus/exporters/tor.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.tor;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9130;

11
nixos/modules/services/monitoring/prometheus/exporters/unbound.nix
View File

@ -5,10 +5,17 @@
, ...
}:
with lib;
let
cfg = config.services.prometheus.exporters.unbound;
inherit (lib)
mkOption
types
mkRemovedOptionModule
optionalAttrs
optionalString
mkMerge
mkIf
;
in
{
imports = [

9
nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.unifi;
inherit (lib)
mkOption
types
escapeShellArg
optionalString
concatStringsSep
;
in
{
port = 9130;

3
nixos/modules/services/monitoring/prometheus/exporters/unpoller.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.unpoller;
inherit (lib) mkEnableOption generators;
configFile = pkgs.writeText "prometheus-unpoller-exporter.json" (generators.toJSON {} {
poller = { inherit (cfg.log) debug quiet; };

3
nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix
View File

@ -1,9 +1,8 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.v2ray;
inherit (lib) mkOption types concatStringsSep;
in
{
port = 9299;

10
nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
View File

@ -1,9 +1,15 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.varnish;
inherit (lib)
mkOption
types
mkDefault
optional
escapeShellArg
concatStringsSep
;
in
{
port = 9131;

10
nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
View File

@ -1,9 +1,15 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.wireguard;
inherit (lib)
mkOption
types
mkRenamedOptionModule
mkEnableOption
optionalString
escapeShellArg
;
in {
port = 9586;
imports = [

7
nixos/modules/services/monitoring/prometheus/exporters/zfs.nix
View File

@ -1,9 +1,14 @@
{ config, lib, pkgs, options, ... }:
with lib;
let
cfg = config.services.prometheus.exporters.zfs;
inherit (lib)
mkOption
types
concatStringsSep
concatMapStringsSep
;
in
{
port = 9134;