summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2019-04-16 09:47:45 +0200
committerBas van Dijk <v.dijk.bas@gmail.com>2019-04-16 09:47:45 +0200
commite7fadde7a77758a37a0f61e1eaafb44f23f6644a (patch)
treecede1d57925aee7582b73b866818c8d8d7655f4d /nixos/doc
parente138020e8dab3af5fdc3cc062e3ea87a9a6d1968 (diff)
downloadnixpkgs-e7fadde7a77758a37a0f61e1eaafb44f23f6644a.tar
nixpkgs-e7fadde7a77758a37a0f61e1eaafb44f23f6644a.tar.gz
nixpkgs-e7fadde7a77758a37a0f61e1eaafb44f23f6644a.tar.bz2
nixpkgs-e7fadde7a77758a37a0f61e1eaafb44f23f6644a.tar.lz
nixpkgs-e7fadde7a77758a37a0f61e1eaafb44f23f6644a.tar.xz
nixpkgs-e7fadde7a77758a37a0f61e1eaafb44f23f6644a.tar.zst
nixpkgs-e7fadde7a77758a37a0f61e1eaafb44f23f6644a.zip
nixos/doc: remove prometheus2 notes from the 19.09 release notes
prometheus2 has been backported to 19.03 so it won't be new for 19.09.
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml39
1 files changed, 0 insertions, 39 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 0a0228cdffb..2dc2dc41ff2 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -35,26 +35,6 @@
    The following new services were added since the last release:
   </para>
 
-  <itemizedlist>
-   <listitem>
-    <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>
-   <listitem>
-    <para>
-      There is a new <option>services.tox-node</option> module for running tox bootstrap nodes.
-    </para>
-   </listitem>
-  </itemizedlist>
  </section>
 
  <section xmlns="http://docbook.org/ns/docbook"
@@ -89,25 +69,6 @@
    </listitem>
    <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>
-   <listitem>
-    <para>
       The options <option>services.prometheus.alertmanager.user</option> and
       <option>services.prometheus.alertmanager.group</option> have been removed
       because the alertmanager service is now using systemd's <link