B4L/cnx-network-clan
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mob next [ci-skip] [ci skip] [skip ci]

Browse Source 
lastFile:clan.nix
This commit is contained in:
kurogeek
2026-08-11 16:57:03 +07:00
parent 95b78b4d25
commit a0c3960a8c
3 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clan.nix
+9 -1
View File
@@ -79,11 +79,11 @@ in
in
{
settings = {
enableOmada = true;
wan = {
interface = "enp1s0";
vlanId = null;
};
vlans = {
mgmt = lib.recursiveUpdate (genVlan 10 24) {
dhcp.fixedIPs.storinator01 = {
@@ -106,6 +106,7 @@ in
};
};
};
trunkPorts = [ "enp2s0" ];
accessPorts = {
@@ -113,6 +114,13 @@ in
};
upLinkPorts = [ "enp3s0" ];
enableOmada = true;
speedtest = {
enable = true;
};
};
};
};
modules/clan/gw-router/default.nix
+11 -4
View File
@@ -120,10 +120,17 @@
description = "TP-Link Omada SDN controller (podman container)";
};
speedtestInterval = lib.mkOption {
type = lib.types.str;
default = "hourly";
description = "systemd OnCalendar spec for the WAN speed test.";
speedtest = {
enable = {
type = lib.types.bool;
default = false;
description = "Periodic WAN speed test so ISP degradation shows up as a trend. A timer runs librespeed-cli and writes the results as Prometheus metrics into node_exporter's textfile collector";
};
interval = lib.mkOption {
type = lib.types.str;
default = "hourly";
description = "systemd OnCalendar spec for the WAN speed test.";
};
};
proxy = {
modules/clan/gw-router/speedtest.nix
+42 -39
View File
@@ -3,55 +3,58 @@
nixosModule =
{
pkgs,
lib,
...
}:
let
textfileDir = "/var/lib/speedtest";
in
{
services.prometheus.exporters.node.extraFlags = [
"--collector.textfile.directory=${textfileDir}"
];
systemd.services.speedtest = {
description = "WAN speed test to Prometheus textfile metrics";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
path = [
pkgs.librespeed-cli
pkgs.jq
config = lib.mkIf (settings.speedtest.enable) {
services.prometheus.exporters.node.extraFlags = [
"--collector.textfile.directory=${textfileDir}"
];
serviceConfig = {
Type = "oneshot";
StateDirectory = "speedtest";
# One test at boot would race PPPoE and log a spurious failure.
ExecCondition = "${pkgs.iproute2}/bin/ip link show ppp0";
};
script = ''
tmp="${textfileDir}/.speedtest.prom.tmp"
if result=$(librespeed-cli --json); then
jq -r '.[0]
| "speedtest_download_mbps \(.download)",
"speedtest_upload_mbps \(.upload)",
"speedtest_ping_ms \(.ping)",
"speedtest_jitter_ms \(.jitter)",
"speedtest_success 1"' <<<"$result" > "$tmp"
else
echo "speedtest_success 0" > "$tmp"
fi
mv "$tmp" "${textfileDir}/speedtest.prom"
'';
};
systemd.timers.speedtest = {
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = settings.speedtestInterval;
RandomizedDelaySec = "10m";
Persistent = true;
systemd.services.speedtest = {
description = "WAN speed test to Prometheus textfile metrics";
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
path = [
pkgs.librespeed-cli
pkgs.jq
];
serviceConfig = {
Type = "oneshot";
StateDirectory = "speedtest";
# One test at boot would race PPPoE and log a spurious failure.
ExecCondition = "${pkgs.iproute2}/bin/ip link show ppp0";
};
script = ''
tmp="${textfileDir}/.speedtest.prom.tmp"
if result=$(librespeed-cli --json); then
jq -r '.[0]
| "speedtest_download_mbps \(.download)",
"speedtest_upload_mbps \(.upload)",
"speedtest_ping_ms \(.ping)",
"speedtest_jitter_ms \(.jitter)",
"speedtest_success 1"' <<<"$result" > "$tmp"
else
echo "speedtest_success 0" > "$tmp"
fi
mv "$tmp" "${textfileDir}/speedtest.prom"
'';
};
};
systemd.timers.speedtest = {
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = settings.speedtest.interval;
RandomizedDelaySec = "10m";
Persistent = true;
};
};
};
};
};
}