ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

flake: bump inputs

Browse source 
And migrate to the new RFC42 grafana options.
This commit is contained in:
Bruno BELANYI 2022-10-26 14:15:34 +02:00
parent 3c3e56002f
commit 30ce88f42f
3 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/services/monitoring/default.nix
View file

@ -49,19 +49,25 @@ in
config = lib.mkIf cfg.enable {
services.grafana = {
enable = true;
domain = "monitoring.${config.networking.domain}";
port = cfg.grafana.port;
addr = "127.0.0.1"; # Proxied through Nginx
security = {
adminUser = cfg.grafana.username;
adminPasswordFile = cfg.grafana.passwordFile;
settings = {
server = {
domain = "monitoring.${config.networking.domain}";
root_url = "https://monitoring.${config.networking.domain}/";
http_port = cfg.grafana.port;
http_addr = "127.0.0.1"; # Proxied through Nginx
};
security = {
admin_user = cfg.grafana.username;
admin_password = "$__file{${cfg.grafana.passwordFile}}";
};
};
provision = {
enable = true;
datasources = [
datasources.settings.datasources = [
{
name = "Prometheus";
type = "prometheus";
@ -72,7 +78,7 @@ in
}
];
dashboards = [
dashboards.settings.providers = [
{
name = "Node Exporter";
options.path = pkgs.nur.repos.alarsyo.grafanaDashboards.node-exporter;

2
modules/services/nginx/default.nix
View file

@ -405,7 +405,7 @@ in
};
};
services.grafana.provision.dashboards = lib.mkIf cfg.monitoring.enable [
services.grafana.provision.dashboards.settings.providers = lib.mkIf cfg.monitoring.enable [
{
name = "NGINX";
options.path = pkgs.nur.repos.alarsyo.grafanaDashboards.nginx;