Unverified Commit f9afc634 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #191768 from KFearsoff/grafana-rfc42 

nixos/grafana: refactor for RFC42
parents ac119316 dfdff2b9

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+28 −0
Original line number Diff line number Diff line
@@ -873,6 +873,34 @@ 
          has been hardened.

        </para>

      </listitem>

      <listitem>

        <para>

          The <literal>services.grafana</literal> options were converted

          to a

          <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC

          0042</link> configuration.

        </para>

      </listitem>

      <listitem>

        <para>

          The <literal>services.grafana.provision.datasources</literal>

          and <literal>services.grafana.provision.dashboards</literal>

          options were converted to a

          <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC

          0042</link> configuration. They also now support specifying

          the provisioning YAML file with <literal>path</literal>

          option.

        </para>

      </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

nixos/doc/manual/release-notes/rl-2211.section.md

+6 −0
Original line number Diff line number Diff line
@@ -282,6 +282,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). 


- The `services.matrix-synapse` systemd unit has been hardened.



- The `services.grafana` options were converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.



- 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.

nixos/modules/services/monitoring/grafana-image-renderer.nix

+3 −3
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ in { 
      }

    ];



    services.grafana.extraOptions = mkIf cfg.provisionGrafana {

      RENDERING_SERVER_URL = "http://localhost:${toString cfg.settings.service.port}/render";

      RENDERING_CALLBACK_URL = "http://localhost:${toString config.services.grafana.port}";

    services.grafana.settings.rendering = mkIf cfg.provisionGrafana {

      url = "http://localhost:${toString cfg.settings.service.port}/render";

      callback_url = "http://localhost:${toString config.services.grafana.port}";

    };



    services.grafana-image-renderer.chromium = mkDefault pkgs.chromium;

nixos/modules/services/monitoring/grafana.nix

+1015 −536

File changed.

Preview size limit exceeded, changes collapsed.

nixos/modules/services/network-filesystems/litestream/litestream.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  <para>

   Litestream service is managed by a dedicated user named <literal>litestream</literal>

   which needs permission to the database file. Here's an example config which gives

   required permissions to access <link linkend="opt-services.grafana.database.path">

   required permissions to access <link linkend="opt-services.grafana.settings.database.path">

   grafana database</link>:

<programlisting>

{ pkgs, ... }: