diff options
| author | KFears <kfearsoff@gmail.com> | 2022-11-30 01:27:03 +0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-04 21:54:42 +0000 |
| commit | b47d56efb1759139cc0af3ca888878093ddc566c (patch) | |
| tree | a213970ee073c701449969c066f4948d7293580b | |
| parent | tmuxPlugins.copy-toolkit: init at 1.1 (diff) | |
| download | nixpkgs-origin/backport-203665-to-release-22.11.tar.gz | |
nixos/grafana: fix 22.11 release notesorigin/backport-203665-to-release-22.11
(cherry picked from commit 79d19d6c9c42d6620de218125faebeaaf368f04e)
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 20 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 20 |
2 files changed, 20 insertions, 20 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 32db72f3b13e..b47808dc2087 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 @@ -1124,9 +1124,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ <listitem> <para> Previously, the options - <xref linkend="opt-services.grafana.provision.datasources" /> + <link linkend="opt-services.grafana.provision.datasources">services.grafana.provision.datasources</link> and - <xref linkend="opt-services.grafana.provision.dashboards" /> + <link linkend="opt-services.grafana.provision.dashboards">services.grafana.provision.dashboards</link> expected lists of datasources or dashboards for the <link xlink:href="https://grafana.com/docs/grafana/latest/administration/provisioning/">declarative provisioning</link>. @@ -1139,14 +1139,14 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ <para> <emphasis role="strong">datasources</emphasis>, please rename your declarations to - <xref linkend="opt-services.grafana.provision.datasources.settings.datasources" />. + <link linkend="opt-services.grafana.provision.datasources.settings.datasources">services.grafana.provision.datasources.settings.datasources</link>. </para> </listitem> <listitem> <para> <emphasis role="strong">dashboards</emphasis>, please rename your declarations to - <xref linkend="opt-services.grafana.provision.dashboards.settings.providers" />. + <link linkend="opt-services.grafana.provision.dashboards.settings.providers">services.grafana.provision.dashboards.settings.providers</link>. </para> </listitem> </itemizedlist> @@ -1159,9 +1159,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ It’s possible to declare the <literal>apiVersion</literal> of your dashboards and datasources by - <xref linkend="opt-services.grafana.provision.datasources.settings.apiVersion" /> + <link linkend="opt-services.grafana.provision.datasources.settings.apiVersion">services.grafana.provision.datasources.settings.apiVersion</link> (or - <xref linkend="opt-services.grafana.provision.dashboards.settings.apiVersion" />). + <link linkend="opt-services.grafana.provision.dashboards.settings.apiVersion">services.grafana.provision.dashboards.settings.apiVersion</link>). </para> </listitem> <listitem> @@ -1169,9 +1169,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Instead of declaring datasources and dashboards in pure Nix, it’s also possible to specify configuration files (or directories) with YAML instead using - <xref linkend="opt-services.grafana.provision.datasources.path" /> + <link linkend="opt-services.grafana.provision.datasources.path">services.grafana.provision.datasources.path</link> (or - <xref linkend="opt-services.grafana.provision.dashboards.path" />. + <link linkend="opt-services.grafana.provision.dashboards.path">services.grafana.provision.dashboards.path</link>. This is useful when having provisioning files from non-NixOS Grafana instances that you also want to deploy to NixOS. @@ -1186,9 +1186,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ </listitem> <listitem> <para> - <xref linkend="opt-services.grafana.provision.notifiers" /> + <link linkend="opt-services.grafana.provision.notifiers">services.grafana.provision.notifiers</link> is not affected by this change because this feature is - deprecated by Grafana and will probably removed in + deprecated by Grafana and will probably be removed in Grafana 10. It’s recommended to use <literal>services.grafana.provision.alerting.contactPoints</literal> instead. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 5ab7038cae3a..cbede784f069 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -340,32 +340,32 @@ In addition to numerous new and upgraded packages, this release includes the fol Alternatively you can also set all your values from `extraOptions` to `systemd.services.grafana.environment`, make sure you don't forget to add the `GF_` prefix though! - - Previously, the options [](#opt-services.grafana.provision.datasources) and - [](#opt-services.grafana.provision.dashboards) expected lists of datasources + - Previously, the options [services.grafana.provision.datasources](#opt-services.grafana.provision.datasources) and + [services.grafana.provision.dashboards](#opt-services.grafana.provision.dashboards) expected lists of datasources or dashboards for the [declarative provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/). To declare lists of - - **datasources**, please rename your declarations to [](#opt-services.grafana.provision.datasources.settings.datasources). - - **dashboards**, please rename your declarations to [](#opt-services.grafana.provision.dashboards.settings.providers). + - **datasources**, please rename your declarations to [services.grafana.provision.datasources.settings.datasources](#opt-services.grafana.provision.datasources.settings.datasources). + - **dashboards**, please rename your declarations to [services.grafana.provision.dashboards.settings.providers](#opt-services.grafana.provision.dashboards.settings.providers). This change was made to support more features for that: - It's possible to declare the `apiVersion` of your dashboards and datasources - by [](#opt-services.grafana.provision.datasources.settings.apiVersion) (or - [](#opt-services.grafana.provision.dashboards.settings.apiVersion)). + by [services.grafana.provision.datasources.settings.apiVersion](#opt-services.grafana.provision.datasources.settings.apiVersion) (or + [services.grafana.provision.dashboards.settings.apiVersion](#opt-services.grafana.provision.dashboards.settings.apiVersion)). - Instead of declaring datasources and dashboards in pure Nix, it's also possible to specify configuration files (or directories) with YAML instead using - [](#opt-services.grafana.provision.datasources.path) (or - [](#opt-services.grafana.provision.dashboards.path). This is useful when having + [services.grafana.provision.datasources.path](#opt-services.grafana.provision.datasources.path) (or + [services.grafana.provision.dashboards.path](#opt-services.grafana.provision.dashboards.path). This is useful when having provisioning files from non-NixOS Grafana instances that you also want to deploy to NixOS. __Note:__ secrets from these files will be leaked into the store unless you use a [**file**-provider or env-var](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#file-provider) for secrets! - - [](#opt-services.grafana.provision.notifiers) is not affected by this change because - this feature is deprecated by Grafana and will probably removed in Grafana 10. + - [services.grafana.provision.notifiers](#opt-services.grafana.provision.notifiers) is not affected by this change because + this feature is deprecated by Grafana and will probably be removed in Grafana 10. It's recommended to use `services.grafana.provision.alerting.contactPoints` instead. - 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. |
