From b423b73adc8cb0d8ea815ad46de20fdb6fc266b5 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 9 Apr 2019 10:00:05 +0200
Subject: [PATCH] nixos/doc: add Prometheus stateDir handling to rl-1909.xml

---
 nixos/doc/manual/release-notes/rl-1909.xml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 40203904f47..7fa322bb462 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -66,12 +66,22 @@
 
   <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
-      removed. The directory where Prometheus will store its metric data will
-      now always be set to <literal>/var/lib/prometheus</literal> and to
-      <literal>/var/lib/prometheus2</literal> when using
-      <option>services.prometheus2</option>.
+      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>