VEGAS/monitoring: adjust loki for new monitoring clients

This commit is contained in:
Max Headroom 2022-08-03 23:36:50 +02:00
parent c8beafd021
commit 232ff31ded

View file

@ -1,9 +1,11 @@
{ config, hosts, inputs, lib, pkgs, tools, ... }: { cluster, config, hosts, inputs, lib, pkgs, tools, ... }:
let let
inherit (tools.meta) domain; inherit (tools.meta) domain;
inherit (config) links; inherit (config) links;
inherit (cluster.config.links) loki-ingest;
cfg = { inherit (config.services) loki; }; cfg = { inherit (config.services) loki; };
toString' = v: toString' = v:
@ -40,10 +42,6 @@ in
links = { links = {
grafana.protocol = "http"; grafana.protocol = "http";
prometheus.protocol = "http"; prometheus.protocol = "http";
loki = {
protocol = "http";
ipv4 = myNode.hypr.addr;
};
loki-grpc = { loki-grpc = {
protocol = "grpc"; protocol = "grpc";
}; };
@ -91,7 +89,7 @@ in
{ {
name = "Loki"; name = "Loki";
# uid = "P8E80F9AEF21F6940"; # uid = "P8E80F9AEF21F6940";
inherit (links.loki) url; inherit (loki-ingest) url;
type = "loki"; type = "loki";
} }
]; ];
@ -145,7 +143,7 @@ in
]; ];
}; };
systemd.services.loki.after = [ "hyprspace.service" "sys-devices-virtual-net-hyprspace.device" ]; systemd.services.loki.after = [ "wireguard-wgmesh.service" ];
services.loki = { services.loki = {
enable = true; enable = true;
dataDir = "/srv/storage/private/loki"; dataDir = "/srv/storage/private/loki";
@ -153,8 +151,8 @@ in
auth_enabled = false; auth_enabled = false;
server = { server = {
log_level = "warn"; log_level = "warn";
http_listen_address = links.loki.ipv4; http_listen_address = loki-ingest.ipv4;
http_listen_port = links.loki.port; http_listen_port = loki-ingest.port;
grpc_listen_address = links.loki-grpc.ipv4; grpc_listen_address = links.loki-grpc.ipv4;
grpc_listen_port = links.loki-grpc.port; grpc_listen_port = links.loki-grpc.port;
}; };