Compare commits
3 commits
64aa4d8bf8
...
2d5e443cdc
Author | SHA1 | Date | |
---|---|---|---|
2d5e443cdc | |||
c8fcf5c520 | |||
de2908d3e0 |
4 changed files with 21654 additions and 1040 deletions
|
@ -35,7 +35,11 @@
|
||||||
systemd.network.enable = true;
|
systemd.network.enable = true;
|
||||||
systemd.network.networks."10-wan" = {
|
systemd.network.networks."10-wan" = {
|
||||||
matchConfig.MACAddress = "00:16:3e:0a:ec:45";
|
matchConfig.MACAddress = "00:16:3e:0a:ec:45";
|
||||||
networkConfig.DHCP = "ipv4";
|
networkConfig = {
|
||||||
|
DHCP = "ipv4";
|
||||||
|
LinkLocalAddressing = "no";
|
||||||
|
IPv6AcceptRA = "no";
|
||||||
|
};
|
||||||
dhcpV4Config = {
|
dhcpV4Config = {
|
||||||
UseDNS = true;
|
UseDNS = true;
|
||||||
};
|
};
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -133,26 +133,6 @@ in
|
||||||
filter: name(regex: '^(fra)[0-9]+') [add_latency: -150ms]
|
filter: name(regex: '^(fra)[0-9]+') [add_latency: -150ms]
|
||||||
policy: min_moving_avg
|
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.
|
# See https://github.com/daeuniverse/dae/blob/main/docs/en/configuration/routing.md for full examples.
|
||||||
|
@ -179,12 +159,6 @@ in
|
||||||
# === Custom direct rules ===
|
# === Custom direct rules ===
|
||||||
domain(geosite:cn) -> direct
|
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
|
dip(geoip:cn) -> direct
|
||||||
|
|
||||||
fallback: default_group
|
fallback: default_group
|
||||||
|
|
|
@ -120,12 +120,11 @@ in
|
||||||
webhook_configs = [
|
webhook_configs = [
|
||||||
{
|
{
|
||||||
url = "${ntfyUrl}/prometheus-alerts?tpl=yes&m=${lib.escapeURL ''
|
url = "${ntfyUrl}/prometheus-alerts?tpl=yes&m=${lib.escapeURL ''
|
||||||
{{ if eq .truncatedAlerts 0 }}{{ else }}{{.truncatedAlerts}} truncated
|
{{range .alerts}}{{ if eq .status "resolved" }}✅{{ else }}{{ if eq .status "firing" }}🔥{{end}}{{end}}{{.labels.alertname}}
|
||||||
{{end}}{{range .alerts}}{{ if eq .status "resolved" }}✅{{ else }}{{ if eq .status "firing" }}🔥{{end}}{{end}}{{.labels.alertname}}
|
{{.annotations.summary}}
|
||||||
{{.annotations.summary}}
|
{{end}}''}";
|
||||||
{{end}}''}";
|
|
||||||
send_resolved = true;
|
send_resolved = true;
|
||||||
max_alerts = 10;
|
max_alerts = 5;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue