Merge pull request #162777 from amarshall/prom-deprecated-opt
nixos/prometheus: Remove upstream-deprecated alertManagerTimeout
This commit is contained in:
commit
807b226542
|
@ -517,6 +517,13 @@
|
||||||
}
|
}
|
||||||
</programlisting>
|
</programlisting>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<literal>services.prometheus.alertManagerTimeout</literal> has
|
||||||
|
been removed as it has been deprecated upstream and has no
|
||||||
|
effect.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The DHCP server (<literal>services.dhcpd4</literal>,
|
The DHCP server (<literal>services.dhcpd4</literal>,
|
||||||
|
|
|
@ -173,6 +173,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
- `services.prometheus.alertManagerTimeout` has been removed as it has been deprecated upstream and has no effect.
|
||||||
|
|
||||||
- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
|
- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
|
||||||
The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
|
The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
|
||||||
The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
|
The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
|
||||||
|
|
|
@ -74,7 +74,6 @@ let
|
||||||
}"
|
}"
|
||||||
"--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"
|
"--web.listen-address=${cfg.listenAddress}:${builtins.toString cfg.port}"
|
||||||
"--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
|
"--alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
|
||||||
"--alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
|
|
||||||
] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"
|
] ++ optional (cfg.webExternalUrl != null) "--web.external-url=${cfg.webExternalUrl}"
|
||||||
++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}";
|
++ optional (cfg.retentionTime != null) "--storage.tsdb.retention.time=${cfg.retentionTime}";
|
||||||
|
|
||||||
|
@ -1563,6 +1562,8 @@ in
|
||||||
(mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])
|
(mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])
|
||||||
(mkRemovedOptionModule [ "services" "prometheus" "environmentFile" ]
|
(mkRemovedOptionModule [ "services" "prometheus" "environmentFile" ]
|
||||||
"It has been removed since it was causing issues (https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files, i.e. `basic_auth.password_file` and `authorization.credentials_file`.")
|
"It has been removed since it was causing issues (https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files, i.e. `basic_auth.password_file` and `authorization.credentials_file`.")
|
||||||
|
(mkRemovedOptionModule [ "services" "prometheus" "alertmanagerTimeout" ]
|
||||||
|
"Deprecated upstream and no longer had any effect")
|
||||||
];
|
];
|
||||||
|
|
||||||
options.services.prometheus = {
|
options.services.prometheus = {
|
||||||
|
@ -1719,14 +1720,6 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
alertmanagerTimeout = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 10;
|
|
||||||
description = ''
|
|
||||||
Alert manager HTTP API timeout (in seconds).
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
webExternalUrl = mkOption {
|
webExternalUrl = mkOption {
|
||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
default = null;
|
default = null;
|
||||||
|
|
Loading…
Reference in a new issue