From 79d19d6c9c42d6620de218125faebeaaf368f04e Mon Sep 17 00:00:00 2001 From: KFears Date: Wed, 30 Nov 2022 01:27:03 +0400 Subject: [PATCH] nixos/grafana: fix 22.11 release notes --- .../from_md/release-notes/rl-2211.section.xml | 20 +++++++++---------- .../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 b72c4326004c..f337c4c90427 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 @@ -1127,9 +1127,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ Previously, the options - + services.grafana.provision.datasources and - + services.grafana.provision.dashboards expected lists of datasources or dashboards for the declarative provisioning. @@ -1142,14 +1142,14 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ datasources, please rename your declarations to - . + services.grafana.provision.datasources.settings.datasources. dashboards, please rename your declarations to - . + services.grafana.provision.dashboards.settings.providers. @@ -1162,9 +1162,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ It’s possible to declare the apiVersion of your dashboards and datasources by - + services.grafana.provision.datasources.settings.apiVersion (or - ). + services.grafana.provision.dashboards.settings.apiVersion). @@ -1172,9 +1172,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 - + services.grafana.provision.datasources.path (or - . + 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. @@ -1189,9 +1189,9 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ - + services.grafana.provision.notifiers 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 services.grafana.provision.alerting.contactPoints instead. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index e0aef342c1ac..0e42d6f757b7 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -341,32 +341,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.