diff --git a/modules/services/grafana.nix b/modules/services/grafana.nix new file mode 100644 index 0000000..4511961 --- /dev/null +++ b/modules/services/grafana.nix @@ -0,0 +1,22 @@ +{ config, ... }: +{ + services = { + grafana = { + enable = true; + settings.server = { + domain = "monitoring.liv.town"; + http_addr = "127.0.0.1"; + http_port = 2342; + }; + }; + + nginx.virtualHosts.${config.services.grafana.domain} = { + useACMEHost = "liv.town"; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; + proxyWebsockets = true; + }; + }; + }: +} diff --git a/modules/services/monitoring.nix b/modules/services/monitoring.nix index 0242a9f..f89ae88 100644 --- a/modules/services/monitoring.nix +++ b/modules/services/monitoring.nix @@ -1,23 +1,6 @@ -{ config, ... }: { +{ config, ... }: +{ services = { - grafana = { - enable = true; - settings.server = { - domain = "monitoring.liv.town"; - http_addr = "127.0.0.1"; - http_port = 2342; - }; - }; - - nginx.virtualHosts.${config.services.grafana.domain} = { - useACMEHost = "liv.town"; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.grafana.port}"; - proxyWebsockets = true; - }; - }; - prometheus = { enable = true; port = 9001; @@ -28,13 +11,16 @@ port = 9002; }; }; - scrapeConfigs = [{ - job_name = "violet"; - static_configs = [{ - targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; - }]; - }]; + scrapeConfigs = [ + { + job_name = "${config.networking.hostname}"; + static_configs = [ + { + targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; + } + ]; + } + ]; }; }; } -