summaryrefslogtreecommitdiffstats
path: root/nixos/doc
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2021-11-04 13:54:18 +0100
committerGitHub <noreply@github.com>2021-11-04 13:54:18 +0100
commit0140e239f34e858e5a29ec9df82a774f5c015053 (patch)
tree82104221d3caf842b3777dd687d56f978fa25eec /nixos/doc
parentc89bbe350652d0f87c5a4b17c1eab62cde629b87 (diff)
parentf12e976aded8113cb466efcdc2abc1932d9beb05 (diff)
Merge pull request #143147 from basvandijk/prometheus-reload
nixos/prometheus: optionally support reloading on config changes
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml8
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 10 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 39b17835482c..121d9e4ad4ba 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1748,6 +1748,14 @@ Superuser created successfully.
</listitem>
<listitem>
<para>
+ A new option
+ <literal>services.prometheus.enableReload</literal> has been
+ added which can be enabled to reload the prometheus service
+ when its config file changes instead of restarting.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Dokuwiki now supports caddy! However
</para>
<itemizedlist spacing="compact">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 51811f580121..0d114bbde870 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -495,6 +495,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `cawbird` Twitter client now uses its own API keys to count as different application than upstream builds. This is done to evade application-level rate limiting. While existing accounts continue to work, users may want to remove and re-register their account in the client to enjoy a better user experience and benefit from this change.
+- 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.
+
- Dokuwiki now supports caddy! However
- the nginx option has been removed, in the new configuration, please use the `dokuwiki.webserver = "nginx"` instead.
- The "${hostname}" option has been deprecated, please use `dokuwiki.sites = [ "${hostname}" ]` instead