privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

cluster/services/monitoring: switch to ways

Browse source
This commit is contained in:
Max Headroom 2024-07-04 17:31:59 +02:00
parent a39ef182d4
commit a2cbfb9c25
2 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cluster/services/monitoring/default.nix
View file

@ -85,5 +85,8 @@ in
}; };
}; };
dns.records.monitoring.consulService = "grafana"; ways.monitoring = {
consulService = "grafana";
extras.locations."/".proxyWebsockets = true;
};
} }

31
cluster/services/monitoring/grafana-ha.nix
View file

@ -8,8 +8,6 @@ let
inherit (config.networking) hostName; inherit (config.networking) hostName;
svc = cluster.config.services.monitoring;
iniList = lib.concatStringsSep " "; iniList = lib.concatStringsSep " ";
login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}"; login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}";
@ -93,36 +91,15 @@ in
}; };
}; };
services.nginx = {
upstreams.grafana-ha.servers = lib.mapAttrs' (_: links: lib.nameValuePair links.grafana.tuple {}) (lib.getAttrs (svc.nodes.grafana) hostLinks);
virtualHosts."monitoring.${domain}" = lib.recursiveUpdate (depot.lib.nginx.vhosts.proxy "http://grafana-ha") {
locations."/".proxyWebsockets = true;
};
};
security.acme.certs."monitoring.${domain}" = {
dnsProvider = "exec";
webroot = lib.mkForce null;
};
consul.services.grafana = { consul.services.grafana = {
mode = "manual"; mode = "manual";
definition = rec { definition = {
name = "grafana"; name = "grafana";
address = depot.reflection.interfaces.primary.addrPublic; address = hostLinks.${hostName}.grafana.ipv4;
port = 443; port = hostLinks.${hostName}.grafana.port;
checks = [ checks = [
rec {
name = "Frontend";
id = "service:grafana:frontend";
interval = "30s";
http = "https://${address}/healthz";
tls_server_name = "monitoring.${domain}";
header.Host = lib.singleton tls_server_name;
}
{ {
name = "Backend"; name = "Grafana";
id = "service:grafana:backend"; id = "service:grafana:backend";
interval = "5s"; interval = "5s";
http = "${hostLinks.${hostName}.grafana.url}/healthz"; http = "${hostLinks.${hostName}.grafana.url}/healthz";