refactor(ops): make status.snix.dev grafana listen on unix socket
Change-Id: Ib3838edf1ee98a8fe1792771f1a948f00e3f466b Reviewed-on: https://cl.snix.dev/c/snix/+/30493 Reviewed-by: Ryan Lahfa <masterancpp@gmail.com> Autosubmit: Florian Klink <flokli@flokli.de> Tested-by: besadii
This commit is contained in:
parent
83c3305863
commit
6b518f1aed
2 changed files with 17 additions and 16 deletions
|
|
@ -17,9 +17,10 @@ in
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
server = {
|
server = {
|
||||||
|
protocol = "socket";
|
||||||
|
socket = "/run/grafana/web.sock";
|
||||||
|
socket_gid = config.ids.gids.nginx;
|
||||||
domain = "status.snix.dev";
|
domain = "status.snix.dev";
|
||||||
http_addr = "127.0.0.1";
|
|
||||||
http_port = 2342;
|
|
||||||
root_url = "https://status.snix.dev/";
|
root_url = "https://status.snix.dev/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -140,6 +141,9 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.grafana.serviceConfig.RuntimeDirectory = "grafana";
|
||||||
|
systemd.services.grafana.serviceConfig.SupplementaryGroups = "nginx";
|
||||||
|
|
||||||
infra.monitoring.alloy.exporters.grafana.port = 2342;
|
infra.monitoring.alloy.exporters.grafana.port = 2342;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -6,20 +6,17 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
services.nginx =
|
services.nginx = {
|
||||||
let
|
enable = true;
|
||||||
scfg = config.services.grafana.settings.server;
|
upstreams.grafana.servers."unix:/run/grafana/web.sock" = { };
|
||||||
in
|
virtualHosts."status.snix.dev" = {
|
||||||
{
|
enableACME = true;
|
||||||
enable = true;
|
forceSSL = true;
|
||||||
virtualHosts."${scfg.domain}" = {
|
locations."/" = {
|
||||||
enableACME = true;
|
proxyPass = "http://grafana/";
|
||||||
forceSSL = true;
|
proxyWebsockets = true;
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://${scfg.http_addr}:${toString scfg.http_port}";
|
|
||||||
proxyWebsockets = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue