serguzim/infrastructure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor "dns" to remove target-domain split

Browse source
This commit is contained in:
Tobias Reisinger 2024-10-19 00:19:23 +02:00
parent 82c25edf8e
commit 810bf9acb5
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
8 changed files with 33 additions and 72 deletions
playbooks/filter_plugins
gatus.pyservice_filters.py

6
playbooks/filter_plugins/gatus.py
View file

@ -53,11 +53,7 @@ class FilterModule(object):
for service in services:
if mon := service.get("monitoring"):
if service.get("dns"):
dns = service["dns"][0]
url = "https://"
if dns.get("target") != "@":
url += f"{dns["target"]}."
url += dns['domain']
url = f"https://{service["dns"][0]['domain']}"
if mon_url := mon.get("url"):
if mon_url.startswith("/"):

6
playbooks/filter_plugins/service_filters.py
View file

@ -38,9 +38,11 @@ class FilterModule(object):
for service in services:
for dns in service.get("dns") or []:
name = dns.get("name") or service["name"]
domain_parts = dns["domain"].split(".")
target_parts = domain_parts[:-2] or ["@"]
result[name] = {
"target": dns["target"],
"domain": dns["domain"],
"target": ".".join(target_parts),
"domain": ".".join(domain_parts[-2:]),
}
if dns.get("alias"):