Compare commits

..

No commits in common. "2d5e443cdc6f8d712d3c7663032e911443dcdad5" and "64aa4d8bf85a0e95e7dc62941ee66206645c40b4" have entirely different histories.

4 changed files with 1040 additions and 21654 deletions

View file

@ -35,11 +35,7 @@
systemd.network.enable = true;
systemd.network.networks."10-wan" = {
matchConfig.MACAddress = "00:16:3e:0a:ec:45";
networkConfig = {
DHCP = "ipv4";
LinkLocalAddressing = "no";
IPv6AcceptRA = "no";
};
networkConfig.DHCP = "ipv4";
dhcpV4Config = {
UseDNS = true;
};

File diff suppressed because it is too large Load diff

View file

@ -133,6 +133,26 @@ in
filter: name(regex: '^(fra)[0-9]+') [add_latency: -150ms]
policy: min_moving_avg
}
asia_group {
filter: name(regex: '^.*(hk).*')
filter: name(regex: '^.*(la).*') [add_latency: 5000ms]
filter: name(regex: '^.*(fra).*') [add_latency: 5000ms]
policy: min_moving_avg
}
europe_group {
filter: name(regex: '^.*(fra).*')
filter: name(regex: '^.*(la).*') [add_latency: 5000ms]
filter: name(regex: '^.*(hk).*') [add_latency: 5000ms]
policy: min_moving_avg
}
america_group {
filter: name(regex: '^.*(la).*')
filter: name(regex: '^.*(hk).*') [add_latency: 5000ms]
filter: name(regex: '^.*(fra).*') [add_latency: 5000ms]
policy: min_moving_avg
}
}
# See https://github.com/daeuniverse/dae/blob/main/docs/en/configuration/routing.md for full examples.
@ -159,6 +179,12 @@ in
# === Custom direct rules ===
domain(geosite:cn) -> direct
domain(suffix:ipify.org) -> direct
domain(geosite:steam@cn) -> direct
domain(suffix:uk, suffix:it, suffix:de, suffix:eu, suffix:se, suffix:nl) -> europe_group
domain(suffix:jp, suffix:sg, suffix:hk, suffix:kr) -> asia_group
dip(geoip:cn) -> direct
fallback: default_group

View file

@ -120,11 +120,12 @@ in
webhook_configs = [
{
url = "${ntfyUrl}/prometheus-alerts?tpl=yes&m=${lib.escapeURL ''
{{range .alerts}}{{ if eq .status "resolved" }}{{ else }}{{ if eq .status "firing" }}🔥{{end}}{{end}}{{.labels.alertname}}
{{ if eq .truncatedAlerts 0 }}{{ else }}{{.truncatedAlerts}} truncated
{{end}}{{range .alerts}}{{ if eq .status "resolved" }}{{ else }}{{ if eq .status "firing" }}🔥{{end}}{{end}}{{.labels.alertname}}
{{.annotations.summary}}
{{end}}''}";
send_resolved = true;
max_alerts = 5;
max_alerts = 10;
}
];
}