diff --git a/services/http-proxy/proxy.nix b/services/http-proxy/proxy.nix index 68bf0f9..c71054e 100644 --- a/services/http-proxy/proxy.nix +++ b/services/http-proxy/proxy.nix @@ -39,6 +39,24 @@ } reverse_proxy http://ha1.home.2rjus.net:8080 } + prometheus.home.2rjus.net { + log { + output file /var/log/caddy/prometheus.log + } + reverse_proxy http://monitoring01.home.2rjus.net:9090 + } + alertmanager.home.2rjus.net { + log { + output file /var/log/caddy/alertmanager.log + } + reverse_proxy http://monitoring01.home.2rjus.net:9093 + } + grafana.home.2rjus.net { + log { + output file /var/log/caddy/grafana.log + } + reverse_proxy http://monitoring01.home.2rjus.net:3000 + } http://http-proxy.home.2rjus.net/metrics { log { output file /var/log/caddy/caddy-metrics.log diff --git a/services/ns/zones-home-2rjus-net.conf b/services/ns/zones-home-2rjus-net.conf index a571fb2..ee5f16d 100644 --- a/services/ns/zones-home-2rjus-net.conf +++ b/services/ns/zones-home-2rjus-net.conf @@ -1,7 +1,7 @@ $ORIGIN home.2rjus.net. $TTL 1800 @ IN SOA ns1.home.2rjus.net. admin.test.2rjus.net. ( - 2042 ; serial number + 2043 ; serial number 3600 ; refresh 900 ; retry 1209600 ; expire @@ -16,9 +16,6 @@ $TTL 1800 kube-blue1 IN A 10.69.8.150 kube-blue2 IN A 10.69.8.151 kube-blue3 IN A 10.69.8.152 -grafana IN CNAME kube-blue3 -prometheus IN CNAME kube-blue3 -alertmanager IN CNAME kube-blue3 kube-blue4 IN A 10.69.8.153 rook IN CNAME kube-blue4 @@ -61,6 +58,9 @@ radarr IN CNAME http-proxy sonarr IN CNAME http-proxy ha IN CNAME http-proxy z2m IN CNAME http-proxy +grafana IN CNAME http-proxy +prometheus IN CNAME http-proxy +alertmanager IN CNAME http-proxy ca IN A 10.69.13.12 monitoring01 IN A 10.69.13.13