movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/prometheus: throw a helpful error when services.prometheus.environmentFile is defined

Browse source
This commit is contained in:
Bas van Dijk 2021-11-07 19:04:24 +00:00
parent 0e4abb0df7
commit 7f7780daa5
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View file

@ -1809,7 +1809,9 @@ Superuser created successfully.
<literal>services.prometheus.environmentFile</literal> has
been removed since it was causing
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/126083">issues</link>
and Prometheus now has native support for secret files.
and Prometheus now has native support for secret files, i.e.
<literal>basic_auth.password_file</literal> and
<literal>authorization.credentials_file</literal>.
</para>
</listitem>
<listitem>

2
nixos/doc/manual/release-notes/rl-2111.section.md
View file

@ -508,7 +508,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- A new option `services.prometheus.enableReload` has been added which can be enabled to reload the prometheus service when its config file changes instead of restarting.
- The option `services.prometheus.environmentFile` has been removed since it was causing [issues](https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files.
- The option `services.prometheus.environmentFile` 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`.
- Dokuwiki now supports caddy! However
- the nginx option has been removed, in the new configuration, please use the `dokuwiki.webserver = "nginx"` instead.

2
nixos/modules/services/monitoring/prometheus/default.nix
View file

@ -1554,6 +1554,8 @@ in
imports = [
(mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])
(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`.")
];
options.services.prometheus = {