danderson/infra
0
0
Fork 0
forked from the-distro/infra
Code Pull requests Activity

Prepare for remote push metrics

Browse source
This commit is contained in:
Ilya K 2024-07-07 17:58:51 +03:00
parent 346a74eabc
commit 40ba3c4ae7
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
secrets/loki-htpasswd.age → secrets/metrics-push-htpasswd.age
View file

0
secrets/promtail-password.age → secrets/metrics-push-password.age
View file

6
services/monitoring/lgtm/loki.nix
View file

@ -12,8 +12,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
age.secrets = { age.secrets = {
loki-htpasswd = { metrics-push-htpasswd = {
file = ../../../secrets/loki-htpasswd.age; file = ../../../secrets/metrics-push-htpasswd.age;
owner = "nginx"; owner = "nginx";
}; };
loki-environment.file = ../../../secrets/loki-environment.age; loki-environment.file = ../../../secrets/loki-environment.age;
@ -93,7 +93,7 @@ in
forceSSL = true; forceSSL = true;
locations."/loki/api/v1/push" = { locations."/loki/api/v1/push" = {
proxyPass = "http://localhost:${toString config.services.loki.configuration.server.http_listen_port}"; proxyPass = "http://localhost:${toString config.services.loki.configuration.server.http_listen_port}";
basicAuthFile = config.age.secrets.loki-htpasswd.path; basicAuthFile = config.age.secrets.metrics-push-htpasswd.path;
}; };
}; };
}; };

11
services/monitoring/lgtm/prometheus.nix
View file

@ -34,7 +34,13 @@ in
options.bagel.services.prometheus.enable = mkEnableOption "Prometheus scraper"; options.bagel.services.prometheus.enable = mkEnableOption "Prometheus scraper";
config = mkIf cfg.enable { config = mkIf cfg.enable {
age.secrets.mimir-environment.file = ../../../secrets/mimir-environment.age; age.secrets = {
metrics-push-htpasswd = {
file = ../../../secrets/metrics-push-htpasswd.age;
owner = "nginx";
};
mimir-environment.file = ../../../secrets/mimir-environment.age;
};
services.prometheus = { services.prometheus = {
enable = true; enable = true;
@ -109,8 +115,9 @@ in
services.nginx.virtualHosts."mimir.forkos.org" = { services.nginx.virtualHosts."mimir.forkos.org" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/api/v1/push" = {
proxyPass = "http://localhost:${toString mimirPort}"; proxyPass = "http://localhost:${toString mimirPort}";
basicAuthFile = config.age.secrets.metrics-push-htpasswd.path;
}; };
}; };
}; };

2
services/monitoring/promtail.nix
View file

@ -12,7 +12,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
age.secrets.promtail-password = { age.secrets.promtail-password = {
file = ../../secrets/promtail-password.age; file = ../../secrets/metrics-push-password.age;
owner = "promtail"; owner = "promtail";
}; };