Move monitoring stack to infra server

container-config/nginx-home/metrics

@@ -4,13 +4,13 @@ server {
   listen [::]:443 ssl;
   include snippets/headers.conf;
   location = /api/v1/write {
-    set $upstream home.server.home.arpa;
-    proxy_pass http://$upstream:8006;
+    set $upstream systemd-prometheus.;
+    proxy_pass http://$upstream:9090;
     include snippets/proxy.conf;
   }
   location = /loki/api/v1/push {
-    set $upstream home.server.home.arpa;
-    proxy_pass http://$upstream:8007;
+    set $upstream systemd-loki.;
+    proxy_pass http://$upstream:3100;
     include snippets/proxy.conf;
   }
 }

container-config/nginx-home/monitoring

@@ -5,8 +5,8 @@ server {
   include snippets/headers.conf;
   include snippets/local-only.conf;
   location / {
-    set $upstream home.server.home.arpa;
-    proxy_pass http://$upstream:8008;
+    set $upstream systemd-grafana.;
+    proxy_pass http://$upstream:3000;
     include snippets/proxy.conf;
     proxy_http_version 1.1;
     proxy_set_header Connection upgrade;

containers/code-server/Containerfile

@@ -1,4 +1,4 @@
-FROM quay.io/fedora/fedora-toolbox:40
+FROM quay.io/fedora/fedora-toolbox:41
 RUN dnf up -y
 RUN dnf install -y bash-color-prompt clang gcc hyperfine java-devel libvirt llvm mtools nodejs-npm openssl-devel parted poetry postgresql-server python3-ipykernel python3-pip qemu-system-x86-core rustup systemd-container vim-enhanced
 RUN dnf install -y https://github.com/coder/code-server/releases/download/v4.93.1-rc.1/code-server-4.93.1-rc.1-amd64.rpm

containers/sandboxed-toolbox/Containerfile

@@ -1,4 +1,4 @@
-FROM quay.io/fedora/fedora-toolbox:40
+FROM quay.io/fedora/fedora-toolbox:41
 RUN dnf up -y
 RUN dnf install -y bash-color-prompt default-fonts gcc-gdb-plugin gdb java libglvnd-gles libglvnd-opengl nautilus netcat nodejs-npm pipx systemd-container vim-enhanced wine-desktop wine-fonts xdg-desktop-portal-gtk xdg-utils
 RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install frida-tools

infra/etc/containers/systemd/grafana.container

@@ -12,7 +12,6 @@ Environment=GF_SMTP_HOST=vps.strypsteen.com:465
 Environment=GF_SMTP_USER=monitoring
 Environment=GF_SMTP_FROM_ADDRESS=monitoring@strypsteen.me
 Secret=GF_SMTP_PASSWORD,type=env
-PublishPort=10.0.1.2:8008:3000
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

infra/etc/containers/systemd/loki.container

@@ -3,7 +3,6 @@ Image=docker.io/grafana/loki
 Network=nginx.network
 Exec=-config.file=/etc/loki/local-config.yaml -log.level=warn -reporting.enabled=false
 Volume=loki.volume:/loki:U,Z
-PublishPort=10.0.1.2:8007:3100
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

infra/etc/containers/systemd/prometheus.container

@@ -6,7 +6,6 @@ Volume=/var/lib/system-config/container-config/prometheus/prometheus.yml:/promet
 Volume=prometheus.volume:/prometheus/data:U,Z
 Tmpfs=/prometheus
 Secret=prometheus-config
-PublishPort=10.0.1.2:8006:9090
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target