From 102f48cba24f08bf7510a39bdcc809ca6f61af36 Mon Sep 17 00:00:00 2001 From: "Simon R. - fantomitechno" Date: Thu, 9 Jul 2026 08:48:46 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Caddy=20metrix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IPAM.md | 74 +++++++++++++++++----------------- modules/caddy/conseil | 4 ++ modules/caddy/fant0mib0t | 4 ++ modules/metrics/prometheus.nix | 11 ++++- 4 files changed, 54 insertions(+), 39 deletions(-) diff --git a/IPAM.md b/IPAM.md index 88a77c1..71fd6e9 100644 --- a/IPAM.md +++ b/IPAM.md @@ -54,45 +54,45 @@ All public DNS entries are also registered on Cloudflare with a CNAME entry to ` Global DNS: `conseil.renoux.dev` -| Port Number | Service | DNS entry | -| :--------------- | :--------------- | :------------------------ | -| 22 | OpenSSH | | -| 80, 443 | Caddy | | -| 3001, 3002 | Prometheus | | -| 4000, 4001, 4002 | NFS | | -| 4010 | Garage S3 API | `s3.fantom.internal` | -| 4011 | Garage S3 Web UI | `s3.fantom.home` | -| 4020 | Copyparty | `files.fantomitechno.dev` | +| Port Number | Service | DNS entry | +| :--------------- | :--------------- | :--------------------------------------------- | +| 22 | OpenSSH | | +| 80, 443, 2019 | Caddy | Port 2019 is the admin API used for Prometheus | +| 3001, 3002 | Prometheus | | +| 4000, 4001, 4002 | NFS | | +| 4010 | Garage S3 API | `s3.fantom.internal` | +| 4011 | Garage S3 Web UI | `s3.fantom.home` | +| 4020 | Copyparty | `files.fantomitechno.dev` | ### fant0mib0t Global DNS: `fant0mib0t.renoux.dev` -| Port Number | Service | DNS entry | -| :--------------- | :-------------------------------------- | :-------------------------------------------- | -| 22 | OpenSSH (used for SSH and Tangled Knot) | | -| 80, 443 | Caddy | | -| 222 | Gitea SSH | | -| 2000 | Matrix | `matrix.fantomitechno.dev` | -| 2010 | Tranquill PDS | `pds.fantomitechno.dev` | -| 2020, 2021 | Mastodon | `mastodon.fantomitechno.dev` | -| 3000 | Graphana | `graph.fantom.home` | -| 3001, 3002, 3003 | Prometheus | | -| 4000 | Tangled Knot | `knot.fantomitechno.dev` | -| 4005 | Gitea (Behind Anubis) | `git.fantomitechno.dev` | -| 4010 | Tangled Spindle | `spindle.fantomitechno.dev` | -| 4020, 4021 | Cryptpad | `drive.renoux.dev`, `drive.s.renoux.dev` | -| 4030 | Kiwix | `kiwix.fantomitechno.dev`, `kiwix.renoux.dev` | -| | (redirection to Wikipedia .zim) | `wikipedia.renoux.dev` | -| 4040 | Immich | `photo.renoux.dev` | -| 4050 | Vaultwarden | `vault.renoux.dev` | -| 4060 | Paperless | `pdf.fantom.home` | -| 4070 | Affine | `notes.fantomitechno.dev` | -| 4080 | Jellyfin | `jellyfin.fantom.home` | -| 4081 | FlareSolver | `flaresolver.fantom.home` | -| 4082 | Prowlarr | `prowlarr.fantom.home` | -| 4083 | Jackett | `jackett.fantom.home` | -| 4084 | Sonarr | `sonarr.fantom.home` | -| 4085 | Radarr | `radarr.fantom.home` | -| 4086 | Bazarr | `bazarr.fantom.home` | -| 4090 | qBittorrent | `torrent.fantom.home` | +| Port Number | Service | DNS entry | +| :--------------- | :-------------------------------------- | :--------------------------------------------- | +| 22 | OpenSSH (used for SSH and Tangled Knot) | | +| 80, 443, 2019 | Caddy | Port 2019 is the admin API used for Prometheus | +| 222 | Gitea SSH | | +| 2000 | Matrix | `matrix.fantomitechno.dev` | +| 2010 | Tranquill PDS | `pds.fantomitechno.dev` | +| 2020, 2021 | Mastodon | `mastodon.fantomitechno.dev` | +| 3000 | Graphana | `graph.fantom.home` | +| 3001, 3002, 3003 | Prometheus | | +| 4000 | Tangled Knot | `knot.fantomitechno.dev` | +| 4005 | Gitea (Behind Anubis) | `git.fantomitechno.dev` | +| 4010 | Tangled Spindle | `spindle.fantomitechno.dev` | +| 4020, 4021 | Cryptpad | `drive.renoux.dev`, `drive.s.renoux.dev` | +| 4030 | Kiwix | `kiwix.fantomitechno.dev`, `kiwix.renoux.dev` | +| | (redirection to Wikipedia .zim) | `wikipedia.renoux.dev` | +| 4040 | Immich | `photo.renoux.dev` | +| 4050 | Vaultwarden | `vault.renoux.dev` | +| 4060 | Paperless | `pdf.fantom.home` | +| 4070 | Affine | `notes.fantomitechno.dev` | +| 4080 | Jellyfin | `jellyfin.fantom.home` | +| 4081 | FlareSolver | `flaresolver.fantom.home` | +| 4082 | Prowlarr | `prowlarr.fantom.home` | +| 4083 | Jackett | `jackett.fantom.home` | +| 4084 | Sonarr | `sonarr.fantom.home` | +| 4085 | Radarr | `radarr.fantom.home` | +| 4086 | Bazarr | `bazarr.fantom.home` | +| 4090 | qBittorrent | `torrent.fantom.home` | diff --git a/modules/caddy/conseil b/modules/caddy/conseil index 30824fe..7617d03 100644 --- a/modules/caddy/conseil +++ b/modules/caddy/conseil @@ -1,5 +1,9 @@ { email simon@renoux.dev + + metrics { + per_host + } } (logging) { diff --git a/modules/caddy/fant0mib0t b/modules/caddy/fant0mib0t index d20f036..5621003 100644 --- a/modules/caddy/fant0mib0t +++ b/modules/caddy/fant0mib0t @@ -1,5 +1,9 @@ { email simon@renoux.dev + + metrics { + per_host + } } (logging) { diff --git a/modules/metrics/prometheus.nix b/modules/metrics/prometheus.nix index 473fe2b..9769a3a 100644 --- a/modules/metrics/prometheus.nix +++ b/modules/metrics/prometheus.nix @@ -1,5 +1,4 @@ { - hostname, ... }: { @@ -28,13 +27,21 @@ scrapeConfigs = [ { - job_name = hostname; + job_name = "exporter"; static_configs = [ { targets = [ "127.0.0.1:3002" ]; } ]; } + { + job_name = "caddy"; + static_configs = [ + { + targets = [ "127.0.0.1:2019" ]; + } + ]; + } ]; }; } -- 2.51.2