summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorKFears <kfearsoff@gmail.com>2022-09-26 17:47:02 +0400
committerKFears <kfearsoff@gmail.com>2022-10-22 23:54:32 +0400
commit7908ef062ff8e66180dc9ccc784a5c6e2d937a3f (patch)
treea469a6de4e87d3ed5431eabcc34548c54fb967ee /nixos/doc/manual
parent34c2ea6750b976ad85410ea3964184567aaecec0 (diff)
downloadnixpkgs-7908ef062ff8e66180dc9ccc784a5c6e2d937a3f.tar
nixpkgs-7908ef062ff8e66180dc9ccc784a5c6e2d937a3f.tar.gz
nixpkgs-7908ef062ff8e66180dc9ccc784a5c6e2d937a3f.tar.bz2
nixpkgs-7908ef062ff8e66180dc9ccc784a5c6e2d937a3f.tar.lz
nixpkgs-7908ef062ff8e66180dc9ccc784a5c6e2d937a3f.tar.xz
nixpkgs-7908ef062ff8e66180dc9ccc784a5c6e2d937a3f.tar.zst
nixpkgs-7908ef062ff8e66180dc9ccc784a5c6e2d937a3f.zip
nixos/grafana: add alerting
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2211.section.xml9
-rw-r--r--nixos/doc/manual/release-notes/rl-2211.section.md2
2 files changed, 11 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 808f1b5a682..0c5ca3cae2e 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -846,6 +846,15 @@
       </listitem>
       <listitem>
         <para>
+          The <literal>services.grafana.provision.alerting</literal>
+          option was added. It includes suboptions for every
+          alerting-related objects (with the exception of
+          <literal>notifiers</literal>), which means it’s now possible
+          to configure modern Grafana alerting declaratively.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Matrix Synapse now requires entries in the
           <literal>state_group_edges</literal> table to be unique, in
           order to prevent accidentally introducing duplicate
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 447fe19878e..29b6b128d0c 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -274,6 +274,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
 
 - The `services.grafana.provision.datasources` and `services.grafana.provision.dashboards` options were converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. They also now support specifying the provisioning YAML file with `path` option.
 
+- The `services.grafana.provision.alerting` option was added. It includes suboptions for every alerting-related objects (with the exception of `notifiers`), which means it's now possible to configure modern Grafana alerting declaratively.
+
 - Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
 
 - The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details.