diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-09 16:38:35 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-09 16:38:35 +0200 |
commit | d108b49168e25d87ac0dcdc707c6f830310543c5 (patch) | |
tree | 1a51ee56a64ed1966a5920d4dde05c87989db6a0 /nixos/doc/manual | |
parent | acedc516fe6a561ff740976db3c1836a0aae9616 (diff) | |
parent | 6e9f6a63a2d4fd30676b5e88696d3bf6104e843f (diff) | |
download | nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.gz nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.bz2 nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.lz nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.xz nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.tar.zst nixlib-d108b49168e25d87ac0dcdc707c6f830310543c5.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1903.xml | 7 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 47 |
2 files changed, 53 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 7c94f6e9473e..574206982ae0 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -534,6 +534,13 @@ Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option. </para> </listitem> + <listitem> + <para> + <literal>nodejs-6_x</literal> is end-of-life. + <literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and + <literal>nodePackages_6_x</literal> are removed. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 6685751d0d12..45531a3567ed 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -37,7 +37,52 @@ <itemizedlist> <listitem> - <para /> + <para> + Besides the existing <option>services.prometheus</option> module which + targets Prometheus-1 a new <option>services.prometheus2</option> module + has been added which targets Prometheus-2. + </para> + <para> + Both modules can be enabled at the same time. In fact + <link xlink:href="https://prometheus.io/docs/prometheus/latest/migration/#storage"> + this is needed for upgrading existing Prometheus-1 data to Prometheus-2 + </link>. + </para> + </listitem> + </itemizedlist> + </section> + + <section xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="sec-release-19.09-incompatibilities"> + <title>Backward Incompatibilities</title> + + <para> + When upgrading from a previous release, please be aware of the following + incompatible changes: + </para> + + <itemizedlist> + <listitem> + <para> + The directory where Prometheus will store its metric data is now + managed by systemd's StateDirectory mechanism. It still defaults + to <literal>/var/lib/prometheus</literal>. + </para> + <para> + Its location can be specified by the new + <option>services.prometheus.stateDir</option> option which + defaults to <literal>prometheus</literal>. Note that this should + be a directory relative to <literal>/var/lib/</literal>. + </para> + <para> + The option <option>services.prometheus.dataDir</option> has been + deprecated. You can still set it but it's now required to have + <literal>/var/lib/</literal> as a prefix and you can't set + <option>services.prometheus.stateDir</option> at the same time. + </para> </listitem> </itemizedlist> </section> |