bashclub/check-unifi-controller
1
0
Fork 0
mirror of https://github.com/bashclub/check-unifi-controller.git synced 2024-11-07 20:31:58 +01:00
Code Issues Projects Releases Wiki Activity

Handle removed sites/ports/radios/SSIDs gracefully

Browse Source
This commit is contained in:
Jan-Philipp Litza 2023-06-20 16:45:08 +02:00
parent f3646613fd
commit 26434074f2
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/check_mk/base/plugins/agent_based/unifi_controller.py
View File

@ -158,7 +158,11 @@ def discovery_unifi_sites(section):
yield Service(item=f"{_item.desc}") yield Service(item=f"{_item.desc}")
def check_unifi_sites(item,params,section): def check_unifi_sites(item,params,section):
site = next(filter(lambda x: x.desc == item,section.values())) try:
site = next(filter(lambda x: x.desc == item,section.values()))
except StopIteration:
return
yield Metric("satisfaction",max(0,_safe_int(site.satisfaction))) yield Metric("satisfaction",max(0,_safe_int(site.satisfaction)))
if site.lan_status != "unknown": if site.lan_status != "unknown":
@ -540,7 +544,11 @@ def check_unifi_network_port_if( ##fixme parsed_section_name
section: Section, section: Section,
) -> CheckResult: ) -> CheckResult:
_converted_ifs = _convert_unifi_counters_if(section) _converted_ifs = _convert_unifi_counters_if(section)
iface = next(filter(lambda x: _safe_int(item,-1) == _safe_int(x.index) or item == x.alias,_converted_ifs),None) ## fix Service Discovery appearance alias/descr try:
iface = next(filter(lambda x: _safe_int(item,-1) == _safe_int(x.index) or item == x.alias,_converted_ifs),None) ## fix Service Discovery appearance alias/descr
except StopIteration:
return
yield from interfaces.check_multiple_interfaces( yield from interfaces.check_multiple_interfaces(
item, item,
params, params,
@ -628,7 +636,11 @@ def discovery_unifi_radios(section):
def check_unifi_radios(item,section): def check_unifi_radios(item,section):
_item = { "2.4Ghz" : "ng", "5Ghz" : "na" }.get(item) _item = { "2.4Ghz" : "ng", "5Ghz" : "na" }.get(item)
radio = next(filter(lambda x: x.radio == _item,section.values())) try:
radio = next(filter(lambda x: x.radio == _item,section.values()))
except StopIteration:
return
yield Metric("read_data",_safe_int(radio.rx_bytes)) yield Metric("read_data",_safe_int(radio.rx_bytes))
yield Metric("write_data",_safe_int(radio.tx_bytes)) yield Metric("write_data",_safe_int(radio.tx_bytes))
yield Metric("satisfaction",max(0,_safe_int(radio.satisfaction))) yield Metric("satisfaction",max(0,_safe_int(radio.satisfaction)))
@ -672,7 +684,11 @@ def discovery_unifi_ssids(section):
yield Service(item=_ssid) yield Service(item=_ssid)
def check_unifi_ssids(item,section): def check_unifi_ssids(item,section):
ssid = section.get(item) try:
ssid = section[item]
except KeyError:
return
_channels = ",".join(list(filter(lambda x: _safe_int(x) > 0,[ssid.ng_channel,ssid.na_channel]))) _channels = ",".join(list(filter(lambda x: _safe_int(x) > 0,[ssid.ng_channel,ssid.na_channel])))
yield Result( yield Result(
state=State.OK, state=State.OK,
@ -731,7 +747,11 @@ def discovery_unifi_ssidlist(section):
yield Service(item=_ssid) yield Service(item=_ssid)
def check_unifi_ssidlist(item,section): def check_unifi_ssidlist(item,section):
ssid = section.get(item) try:
ssid = section[item]
except KeyError:
return
yield Result( yield Result(
state=State.OK, state=State.OK,
summary=f"Channels: {ssid.channels}" summary=f"Channels: {ssid.channels}"