diff options
| -rw-r--r-- | f3s/prometheus/additional-scrape-configs.yaml | 1 | ||||
| -rw-r--r-- | f3s/prometheus/manifests/additional-scrape-configs-secret.yaml | 1 | ||||
| -rw-r--r-- | f3s/prometheus/manifests/freebsd-temperature-alerts.yaml | 7 | ||||
| -rw-r--r-- | frontends/Rexfile | 1 | ||||
| -rw-r--r-- | frontends/etc/hosts.wg.append | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/f3s/prometheus/additional-scrape-configs.yaml b/f3s/prometheus/additional-scrape-configs.yaml index bb19367..5883e17 100644 --- a/f3s/prometheus/additional-scrape-configs.yaml +++ b/f3s/prometheus/additional-scrape-configs.yaml @@ -4,6 +4,7 @@ - '192.168.2.130:9100' # f0 via WireGuard - '192.168.2.131:9100' # f1 via WireGuard - '192.168.2.132:9100' # f2 via WireGuard + - '192.168.2.133:9100' # f3 via WireGuard labels: os: freebsd - targets: diff --git a/f3s/prometheus/manifests/additional-scrape-configs-secret.yaml b/f3s/prometheus/manifests/additional-scrape-configs-secret.yaml index bb89e4c..970a45a 100644 --- a/f3s/prometheus/manifests/additional-scrape-configs-secret.yaml +++ b/f3s/prometheus/manifests/additional-scrape-configs-secret.yaml @@ -14,6 +14,7 @@ stringData: - '192.168.2.130:9100' # f0 via WireGuard - '192.168.2.131:9100' # f1 via WireGuard - '192.168.2.132:9100' # f2 via WireGuard + - '192.168.2.133:9100' # f3 via WireGuard labels: os: freebsd - targets: diff --git a/f3s/prometheus/manifests/freebsd-temperature-alerts.yaml b/f3s/prometheus/manifests/freebsd-temperature-alerts.yaml index 8393da6..fe91115 100644 --- a/f3s/prometheus/manifests/freebsd-temperature-alerts.yaml +++ b/f3s/prometheus/manifests/freebsd-temperature-alerts.yaml @@ -7,15 +7,14 @@ metadata: release: prometheus spec: groups: - # CPU temperature alerting for the FreeBSD bhyve hosts (f0, f1, f2). + # CPU temperature alerting for the FreeBSD bhyve hosts (f0, f1, f2, f3). # # Metric: node_cpu_temperature_celsius{os="freebsd", cpu="N"} # One reading per CPU core, exported by node_exporter (built with the - # FreeBSD temperature collector). f3 is NOT covered — it is a standalone - # host that is not in the node-exporter scrape target list. + # FreeBSD temperature collector). # # The expression takes the hottest core per host (max by instance) and - # joins node_uname_info to attach a friendly `nodename` label (f0/f1/f2) + # joins node_uname_info to attach a friendly `nodename` label (f0/f1/f2/f3) # for the alert summary, since the raw series is only labelled by the # WireGuard instance address. - name: freebsd-temperature diff --git a/frontends/Rexfile b/frontends/Rexfile index 2510dd0..9327402 100644 --- a/frontends/Rexfile +++ b/frontends/Rexfile @@ -108,6 +108,7 @@ our %wg0_ips = ( 'r0' => { '4' => '192.168.2.120', '6' => 'fd42:beef:cafe:2::120' }, 'r1' => { '4' => '192.168.2.121', '6' => 'fd42:beef:cafe:2::121' }, 'r2' => { '4' => '192.168.2.122', '6' => 'fd42:beef:cafe:2::122' }, + 'rocky' => { '4' => '192.168.2.123', '6' => 'fd42:beef:cafe:2::123' }, 'pi0' => { '4' => '192.168.2.203', '6' => 'fd42:beef:cafe:2::203' }, 'pi1' => { '4' => '192.168.2.204', '6' => 'fd42:beef:cafe:2::204' }, ); diff --git a/frontends/etc/hosts.wg.append b/frontends/etc/hosts.wg.append index 3da6a50..bfda7cd 100644 --- a/frontends/etc/hosts.wg.append +++ b/frontends/etc/hosts.wg.append @@ -4,6 +4,7 @@ 192.168.2.120 r0.wg0.wan.buetow.org r0.wg0 192.168.2.121 r1.wg0.wan.buetow.org r1.wg0 192.168.2.122 r2.wg0.wan.buetow.org r2.wg0 +192.168.2.123 rocky.wg0.wan.buetow.org rocky.wg0 192.168.2.130 f0.wg0.wan.buetow.org f0.wg0 192.168.2.131 f1.wg0.wan.buetow.org f1.wg0 192.168.2.132 f2.wg0.wan.buetow.org f2.wg0 @@ -17,6 +18,7 @@ fd42:beef:cafe:2::111 fishfinger.wg0.wan.buetow.org fishfinger.wg0 fd42:beef:cafe:2::120 r0.wg0.wan.buetow.org r0.wg0 fd42:beef:cafe:2::121 r1.wg0.wan.buetow.org r1.wg0 fd42:beef:cafe:2::122 r2.wg0.wan.buetow.org r2.wg0 +fd42:beef:cafe:2::123 rocky.wg0.wan.buetow.org rocky.wg0 fd42:beef:cafe:2::130 f0.wg0.wan.buetow.org f0.wg0 fd42:beef:cafe:2::131 f1.wg0.wan.buetow.org f1.wg0 fd42:beef:cafe:2::132 f2.wg0.wan.buetow.org f2.wg0 |