gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #191768 from KFearsoff/grafana-rfc42

Browse Source 
nixos/grafana: refactor for RFC42
This commit is contained in:
Maximilian Bosch
2022-10-23 13:28:25 +02:00
committed by GitHub
parent ac1193160d dfdff2b946
commit f9afc634e3
17 changed files with 1418 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/monitoring/grafana-image-renderer.nix
View File

@@ -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;

1569
nixos/modules/services/monitoring/grafana.nix
View File

File diff suppressed because it is too large Load Diff

2
nixos/modules/services/network-filesystems/litestream/litestream.xml
View File

@@ -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, ... }: