Added support for DNS comments #86

Remove everything after hash in comments for device tracking #86
This commit is contained in:
tomaae 2021-04-12 13:23:05 +02:00
parent f6cb4c4706
commit 27f1b14ec4

View file

@ -1436,7 +1436,7 @@ class MikrotikControllerData:
data=self.data["dns"], data=self.data["dns"],
source=self.api.path("/ip/dns/static"), source=self.api.path("/ip/dns/static"),
key="name", key="name",
vals=[{"name": "name"}, {"name": "address"}], vals=[{"name": "name"}, {"name": "address"}, {"name": "comment"}],
) )
# --------------------------- # ---------------------------
@ -1719,9 +1719,14 @@ class MikrotikControllerData:
if vals["address"] != "unknown": if vals["address"] != "unknown":
for dns_uid, dns_vals in self.data["dns"].items(): for dns_uid, dns_vals in self.data["dns"].items():
if dns_vals["address"] == vals["address"]: if dns_vals["address"] == vals["address"]:
self.data["host"][uid]["host-name"] = dns_vals[ if dns_vals["comment"] != "":
"name" self.data["host"][uid]["host-name"] = dns_vals[
].split(".")[0] "comment"
].split("#", 1)[0]
else:
self.data["host"][uid]["host-name"] = dns_vals[
"name"
].split(".")[0]
break break
# Resolve hostname from DHCP comment # Resolve hostname from DHCP comment
if ( if (
@ -1731,7 +1736,7 @@ class MikrotikControllerData:
): ):
self.data["host"][uid]["host-name"] = self.data["dhcp"][uid][ self.data["host"][uid]["host-name"] = self.data["dhcp"][uid][
"comment" "comment"
] ].split("#", 1)[0]
# Resolve hostname from DHCP hostname # Resolve hostname from DHCP hostname
elif ( elif (
self.data["host"][uid]["host-name"] == "unknown" self.data["host"][uid]["host-name"] == "unknown"