Update agent_unifi_controller

remove check_mk section

README.md

@@ -1,2 +1,16 @@
 # check-unifi-controller
 Checkmk special agent for checking unifi controller 
+
+### Usage:
+Login into your checkmk instnace user on your checkmk server (e.g. via SSH).
+Download and install the checkmk agent:
+~~~
+wget https://github.com/bashclub/check-unifi-controller/releases/download/v0.87/unifi_controller-0.87.mkp
+mkp install ./unifi_controller-0.87.mkp
+~~~
+
+### Configure Agent
+Login into your checkmk website and go to "Setup" -> "Agents" -> "Other integrations" (Datasource programs). Under the category "Hardware" click on "Unifi Controller via API" and create a new rule.
+Fill in the credentials of your Unifi controller, set the HTTPS Port, define the site name (if other than default), check "Ignore certificate validation" if using a self signed certificate, select Hostname or IP for storing piggyback data.
+Under "Conditions" assign an "Explicit host" with your Unifi Controller Machine.
+The agent will carry piggyback data for switches and access points and you can create new hosts to monitor, where piggyback data will be assignesd on exact match (IP or hostname).

lib/check_mk/base/plugins/agent_based/unifi_controller.py

@@ -1,6 +1,28 @@
 #!/usr/bin/env python3
 # -*- encoding: utf-8; py-indent-offset: 4 -*-
 #
+##  MIT License
+##  
+##  Copyright (c) 2024 Bash Club
+##  
+##  Permission is hereby granted, free of charge, to any person obtaining a copy
+##  of this software and associated documentation files (the "Software"), to deal
+##  in the Software without restriction, including without limitation the rights
+##  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+##  copies of the Software, and to permit persons to whom the Software is
+##  furnished to do so, subject to the following conditions:
+##  
+##  The above copyright notice and this permission notice shall be included in all
+##  copies or substantial portions of the Software.
+##  
+##  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+##  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+##  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+##  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+##  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+##  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+##  SOFTWARE.
+
 from cmk.gui.i18n import _
 
 from .agent_based_api.v1 import (
@@ -8,9 +30,13 @@ from .agent_based_api.v1 import (
     register,
     render,
     Result,
+    IgnoreResults,
     Service,
     State,
+    TableRow,
+    Attributes
 )
+
 from .agent_based_api.v1.type_defs import CheckResult, DiscoveryResult
 from typing import Any, Dict, Mapping, Sequence, Optional
 
@@ -38,6 +64,12 @@ def _safe_float(val):
     except (TypeError,ValueError):
         return 0
 
+def _safe_int(val,default=0):
+    try:
+        return int(val)
+    except (TypeError,ValueError):
+        return default
+
 def _unifi_status2state(status):
     return {
         "ok"        : State.OK,
@@ -59,6 +91,13 @@ def parse_unifi_nested_dict(string_table):
         _ret[_line[0]][_line[1]] = _line[2]
     return _ret
 
+UNIFI_DEVICE_STATES = {
+    "0" : "disconnected",
+    "1" : "connected",
+    "2" : "pending"
+}
+
+
 ############ Controller ############
 def discovery_unifi_controller(section):
     yield Service(item="Unifi Controller")
@@ -76,18 +115,25 @@ def check_unifi_controller(item,section):
                 state=State.WARN,
                 notice=_("Update available")
             )
-        yield Metric("uptime",int(section.uptime))
     if item == "Cloudkey":
         yield Result(
             state=State.OK,
             summary=f"Version: {section.cloudkey_version}"
         )
-        if int(section.cloudkey_update_available) > 0:
+        if _safe_int(section.cloudkey_update_available) > 0:
             yield Result(
                 state=State.WARN,
                 notice=_("Update available")
             )
 
+def inventory_unifi_controller(section):
+    yield Attributes(
+        path=["software","os"],
+        inventory_attributes={
+            "controller_version" : section.get("controller_version")
+        }
+    )
+
 register.agent_section(
     name = 'unifi_controller',
     parse_function = parse_unifi_dict
@@ -99,24 +145,31 @@ register.check_plugin(
     discovery_function=discovery_unifi_controller,
     check_function=check_unifi_controller,
 )
+
+register.inventory_plugin(
+    name = "unifi_controller",
+    inventory_function = inventory_unifi_controller
+)
+
 ############ SITES ###########
 
 def discovery_unifi_sites(section):
     for _item in section.values():
         yield Service(item=f"{_item.desc}")
 
-def check_unifi_sites(item,section):
+def check_unifi_sites(item,params,section):
     site = next(filter(lambda x: x.desc == item,section.values()))
-    yield Metric("satisfaction",max(0,interfaces.saveint(site.satisfaction)))
+    yield Metric("satisfaction",max(0,_safe_int(site.satisfaction)))
 
     if site.lan_status != "unknown":
-        yield Metric("lan_user_sta",interfaces.saveint(site.lan_num_user))
-        yield Metric("lan_guest_sta",interfaces.saveint(site.lan_num_guest))
-        yield Metric("if_in_octets",interfaces.saveint(site.lan_rx_bytes_r))
-        #yield Metric("if_in_bps",interfaces.saveint(site.lan_rx_bytes_r)*8)
-        yield Metric("if_out_octets",interfaces.saveint(site.lan_tx_bytes_r))
-        #yield Metric("if_out_bps",interfaces.saveint(site.lan_tx_bytes_r)*8)
-        
+        yield Metric("lan_user_sta",_safe_int(site.lan_num_user))
+        yield Metric("lan_guest_sta",_safe_int(site.lan_num_guest))
+        yield Metric("if_in_octets",_safe_int(site.lan_rx_bytes_r))
+        #yield Metric("if_in_bps",_safe_int(site.lan_rx_bytes_r)*8)
+        yield Metric("if_out_octets",_safe_int(site.lan_tx_bytes_r))
+        #yield Metric("if_out_bps",_safe_int(site.lan_tx_bytes_r)*8)
+        yield Metric("lan_active_sw",_safe_int(site.lan_num_sw))
+        yield Metric("lan_total_sw",_safe_int(site.lan_num_adopted))
         yield Result(
             state=_unifi_status2state(site.lan_status),
             summary=f"LAN: {site.lan_num_sw}/{site.lan_num_adopted} Switch ({site.lan_status})"
@@ -127,11 +180,13 @@ def check_unifi_sites(item,section):
         #)
 
     if site.wlan_status != "unknown":
-        yield Metric("wlan_user_sta",interfaces.saveint(site.wlan_num_user))
-        yield Metric("wlan_guest_sta",interfaces.saveint(site.wlan_num_guest))
-        yield Metric("wlan_iot_sta",interfaces.saveint(site.wlan_num_iot))
-        yield Metric("wlan_if_in_octets",interfaces.saveint(site.wlan_rx_bytes_r))
-        yield Metric("wlan_if_out_octets",interfaces.saveint(site.wlan_tx_bytes_r))
+        yield Metric("wlan_user_sta",_safe_int(site.wlan_num_user))
+        yield Metric("wlan_guest_sta",_safe_int(site.wlan_num_guest))
+        yield Metric("wlan_iot_sta",_safe_int(site.wlan_num_iot))
+        yield Metric("wlan_if_in_octets",_safe_int(site.wlan_rx_bytes_r))
+        yield Metric("wlan_if_out_octets",_safe_int(site.wlan_tx_bytes_r))
+        yield Metric("wlan_active_ap",_safe_int(site.wlan_num_ap))
+        yield Metric("wlan_total_ap",_safe_int(site.wlan_num_adopted))
         yield Result(
             state=_unifi_status2state(site.wlan_status),
             summary=f"WLAN: {site.wlan_num_ap}/{site.wlan_num_adopted} AP ({site.wlan_status})"
@@ -155,8 +210,14 @@ def check_unifi_sites(item,section):
             state=_unifi_status2state(site.vpn_status),
             notice=f"WWW Status: {site.vpn_status}"
         )
+
+    if params.get("ignore_alarms"):
+        _alarmstate = State.OK
+    else:
+        _alarmstate = _expect_number(site.num_new_alarms)
+
     yield Result(
-        state=_expect_number(site.num_new_alarms),
+        state=_alarmstate,
         notice=f"{site.num_new_alarms} new Alarm"
     )
 
@@ -170,13 +231,45 @@ register.check_plugin(
     name='unifi_sites',
     service_name='Site %s',
     discovery_function=discovery_unifi_sites,
+    check_default_parameters={},
+    check_ruleset_name="unifi_sites",
     check_function=check_unifi_sites,
 )
 
+############ DEVICE_SHORTLIST ##########
+
+def inventory_unifi_device_shortlist(section):
+    for _name,_device in section.items():
+        yield TableRow(
+            path=["hardware","networkdevices"],
+            key_columns={"_name"   : _name},
+            inventory_columns={
+                "serial"     : _device.get("serial"),
+                "_state"     : UNIFI_DEVICE_STATES.get(_device.state,"unknown"),
+                "vendor"    : "ubiquiti",
+                "model"     : _device.get("model_name",_device.get("model")),
+                "version"   : _device.version,
+                "ip_address": _device.ip,
+                "mac"       : _device.mac
+            }
+        )
+
+register.agent_section(
+    name = 'unifi_device_shortlist',
+    parse_function = parse_unifi_nested_dict
+)
+
+register.inventory_plugin(
+    name = "unifi_device_shortlist",
+    inventory_function = inventory_unifi_device_shortlist
+)
+
+
+
 ############ DEVICE ###########
 def discovery_unifi_device(section):
+    yield Service(item="Device Status")
     yield Service(item="Unifi Device")
-    yield Service(item="Uptime")
     yield Service(item="Active-User")
     if  section.type != "uap":  # kein satisfaction bei ap .. radio/ssid haben schon
         yield Service(item="Satisfaction")
@@ -188,43 +281,46 @@ def discovery_unifi_device(section):
         yield Service(item="Speedtest")
 
 def check_unifi_device(item,section):
+    _device_state = UNIFI_DEVICE_STATES.get(section.state,"unknown")
+    ## connected OK / pending Warn / Rest Crit
+    _hoststatus = State.OK if section.state == "1" else State.WARN if section.state == "2" else State.CRIT
+    if item == "Device Status":
+        yield Result(
+            state=_hoststatus,
+            summary=f"Status: {_device_state}"
+        )
+    #if section.state != "1":
+    #    yield IgnoreResults(f"device not active State: {section.state}")
+        
     if item == "Unifi Device":
         yield Result(
             state=State.OK,
             summary=f"Version: {section.version}"
         )
-        if interfaces.saveint(section.upgradable) > 0:
+        if _safe_int(section.upgradable) > 0:
             yield Result(
                 state=State.WARN,
                 notice=_("Update available")
             )
     if item == "Active-User":
-        _active_user = interfaces.saveint(section.user_num_sta)
+        _active_user = _safe_int(section.user_num_sta)
         yield Result(
             state=State.OK,
             summary=f"{_active_user}"
         )
-        if interfaces.saveint(section.guest_num_sta) > -1:
+        if _safe_int(section.guest_num_sta) > -1:
             yield Result(
                 state=State.OK,
                 summary=f"Guest: {section.guest_num_sta}"
             )
         yield Metric("user_sta",_active_user)
-        yield Metric("guest_sta",interfaces.saveint(section.guest_num_sta))
-    if item == "Uptime":
-        _uptime = int(section.uptime) if section.uptime else -1
-        if _uptime > 0:
-            yield Result(
-                state=State.OK,
-                summary=render.timespan(_uptime)
-            )
-            yield Metric("unifi_uptime",_uptime)
+        yield Metric("guest_sta",_safe_int(section.guest_num_sta))
     if item == "Satisfaction":
         yield Result(
             state=State.OK,
             summary=f"{section.satisfaction}%"
         )
-        yield Metric("satisfaction",max(0,interfaces.saveint(section.satisfaction)))
+        yield Metric("satisfaction",max(0,_safe_int(section.satisfaction)))
     if item == "Temperature":
         yield Metric("temp",_safe_float(section.general_temperature))
         yield Result(
@@ -264,6 +360,33 @@ def check_unifi_device(item,section):
             summary=f"Device {section.uplink_device} Port: {section.uplink_remote_port}"
         )
 
+def inventory_unifi_device(section):
+    yield Attributes(
+        path=["software","os"],
+        inventory_attributes={
+            "version"   : section.get("version")
+        }
+    )
+    yield Attributes(
+        path=["software","configuration","snmp_info"],
+        inventory_attributes = {
+            "name"      : section.get("name"),
+            "contact"   : section.get("snmp_contact"),
+            "location"  : section.get("snmp_location")
+        }
+    )
+    _hwdict = {
+        "vendor"    : "ubiquiti",
+    }
+    for _key in ("model","board_rev","serial","mac"):
+        _val = section.get(_key)
+        if _val:
+            _hwdict[_key] = _val
+    yield Attributes(
+        path=["hardware","system"],
+        inventory_attributes= _hwdict
+    )
+
 register.agent_section(
     name = 'unifi_device',
     parse_function = parse_unifi_dict
@@ -275,9 +398,15 @@ register.check_plugin(
     discovery_function=discovery_unifi_device,
     check_function=check_unifi_device,
 )
+
+register.inventory_plugin(
+    name = "unifi_device",
+    inventory_function = inventory_unifi_device
+)
+
 ############ DEVICEPORT ###########
 @dataclass
-class unifi_interface(interfaces.Interface):
+class unifi_interface(interfaces.InterfaceWithCounters):
     jumbo           : bool = False
     satisfaction    : int = 0
     poe_enable      : bool = False
@@ -290,34 +419,89 @@ class unifi_interface(interfaces.Interface):
     dot1x_mode      : Optional[str] = None
     dot1x_status    : Optional[str] = None
     ip_address      : Optional[str] = None
+    portconf        : Optional[str] = None
 
-    def __post_init__(self) -> None:
-        self.finalize()
 
 def _convert_unifi_counters_if(section: Section) -> interfaces.Section:
+    ##  10|port_idx|10
+    ##  10|port_poe|1
+    ##  10|poe_caps|7
+    ##  10|op_mode|switch
+    ##  10|poe_mode|auto
+    ##  10|anomalies|0
+    ##  10|autoneg|1
+    ##  10|dot1x_mode|unknown
+    ##  10|dot1x_status|disabled
+    ##  10|enable|1
+    ##  10|full_duplex|1
+    ##  10|is_uplink|0
+    ##  10|jumbo|1
+    ##  10|poe_class|Unknown
+    ##  10|poe_current|0.00
+    ##  10|poe_enable|0
+    ##  10|poe_good|0
+    ##  10|poe_power|0.00
+    ##  10|poe_voltage|0.00
+    ##  10|rx_broadcast|1290
+    ##  10|rx_bytes|38499976384
+    ##  10|rx_dropped|0
+    ##  10|rx_errors|0
+    ##  10|rx_multicast|16423
+    ##  10|rx_packets|125489263
+    ##  10|satisfaction|100
+    ##  10|satisfaction_reason|0
+    ##  10|speed|1000
+    ##  10|stp_pathcost|20000
+    ##  10|stp_state|forwarding
+    ##  10|tx_broadcast|20791854
+    ##  10|tx_bytes|238190158091
+    ##  10|tx_dropped|0
+    ##  10|tx_errors|0
+    ##  10|tx_multicast|262691
+    ##  10|tx_packets|228482694
+    ##  10|tx_bytes_r|17729
+    ##  10|rx_bytes_r|176941
+    ##  10|bytes_r|194671
+    ##  10|name|Port 10
+    ##  10|aggregated_by|0
+    ##  10|oper_status|1
+    ##  10|admin_status|1
+    ##  10|portconf|ALL
+    ##  unifi_interface(index='10', descr='Port 10', alias='Port 10', type='6', speed=1000000000, oper_status='1', 
+    ##      in_octets=38448560321, in_ucast=125404491, in_mcast=16414, in_bcast=1290, in_discards=0, in_errors=0, 
+    ##      out_octets=238185160794, out_ucast=228451699, out_mcast=262551, out_bcast=20783341, out_discards=0, out_errors=0, 
+    ##      out_qlen=0, phys_address='', oper_status_name='up', speed_as_text='', group=None, node=None, admin_status='1', 
+    ##      total_octets=276633721115, jumbo=True, satisfaction=100,
+    ##      poe_enable=False, poe_mode='auto', poe_good=None, poe_current=0.0, poe_power=0.0, poe_voltage=0.0, poe_class='Unknown', 
+    ##      dot1x_mode='unknown',dot1x_status='disabled', ip_address='', portconf='ALL')
+
     return [ 
         unifi_interface(
-            index=str(netif.port_idx),
-            descr=netif.name,
-            alias=netif.name,
-            type='6',
-            speed=interfaces.saveint(netif.speed)*1000000,
-            oper_status=netif.oper_status,
-            admin_status=netif.admin_status,
-            in_octets=interfaces.saveint(netif.rx_bytes),
-            in_ucast=interfaces.saveint(netif.rx_packets),
-            in_mcast=interfaces.saveint(netif.rx_multicast),
-            in_bcast=interfaces.saveint(netif.rx_broadcast),
-            in_discards=interfaces.saveint(netif.rx_dropped),
-            in_errors=interfaces.saveint(netif.rx_errors),
-            out_octets=interfaces.saveint(netif.tx_bytes),
-            out_ucast=interfaces.saveint(netif.tx_packets),
-            out_mcast=interfaces.saveint(netif.tx_multicast),
-            out_bcast=interfaces.saveint(netif.tx_broadcast),
-            out_discards=interfaces.saveint(netif.tx_dropped),
-            out_errors=interfaces.saveint(netif.tx_errors),
+            attributes=interfaces.Attributes(
+                index=str(netif.port_idx),
+                descr=netif.name,
+                alias=netif.name,
+                type='6',
+                speed=_safe_int(netif.speed)*1000000,
+                oper_status=netif.oper_status,
+                admin_status=netif.admin_status,
+            ),
+            counters=interfaces.Counters(
+                in_octets=_safe_int(netif.rx_bytes),
+                in_ucast=_safe_int(netif.rx_packets),
+                in_mcast=_safe_int(netif.rx_multicast),
+                in_bcast=_safe_int(netif.rx_broadcast),
+                in_disc=_safe_int(netif.rx_dropped),
+                in_err=_safe_int(netif.rx_errors),
+                out_octets=_safe_int(netif.tx_bytes),
+                out_ucast=_safe_int(netif.tx_packets),
+                out_mcast=_safe_int(netif.tx_multicast),
+                out_bcast=_safe_int(netif.tx_broadcast),
+                out_disc=_safe_int(netif.tx_dropped),
+                out_err=_safe_int(netif.tx_errors),
+            ),
             jumbo=True if netif.jumbo == "1" else False,
-            satisfaction=interfaces.saveint(netif.satisfaction) if netif.satisfaction and netif.oper_status == "1" else 0,
+            satisfaction=_safe_int(netif.satisfaction) if netif.satisfaction and netif.oper_status == "1" else 0,
             poe_enable=True if netif.poe_enable == "1" else False,
             poe_mode=netif.poe_mode,
             poe_current=float(netif.poe_current) if netif.poe_current else 0,
@@ -326,7 +510,8 @@ def _convert_unifi_counters_if(section: Section) -> interfaces.Section:
             poe_class=netif.poe_class,
             dot1x_mode=netif.dot1x_mode,
             dot1x_status=netif.dot1x_status,
-            ip_address=netif.ip
+            ip_address=netif.ip,
+            portconf=netif.portconf
         ) for netif in parse_unifi_nested_dict(section).values()
     ]
     
@@ -348,13 +533,19 @@ def check_unifi_network_port_if(  ##fixme parsed_section_name
     section: Section,
 ) -> CheckResult:
     _converted_ifs = _convert_unifi_counters_if(section)
-    iface = next(filter(lambda x: item in (x.index,x.alias),_converted_ifs),None) ## fix Service Discovery appearance alias/descr
+    iface = next(filter(lambda x: _safe_int(item,-1) == _safe_int(x.attributes.index) or item == x.attributes.alias,_converted_ifs),None) ## fix Service Discovery appearance alias/descr
     yield from interfaces.check_multiple_interfaces(
         item,
         params,
         _converted_ifs,
     )
     if iface:
+        #pprint(iface)
+        if iface.portconf:
+            yield Result(
+                state=State.OK,
+                summary=f"Network: {iface.portconf}"
+            )
         yield Metric("satisfaction",max(0,iface.satisfaction))
         #pprint(iface)
         if iface.poe_enable:
@@ -371,6 +562,35 @@ def check_unifi_network_port_if(  ##fixme parsed_section_name
                 summary=f"IP: {iface.ip_address}"
             )
 
+def inventory_unifi_network_ports(section):
+    _total_ethernet_ports = 0
+    _available_ethernet_ports = 0
+    for _iface in parse_unifi_nested_dict(section).values():
+        _total_ethernet_ports +=1
+        _available_ethernet_ports +=1 if _iface.oper_status == '2' else 0
+        yield TableRow(
+            path=["networking","interfaces"],
+            key_columns={"index"    : _safe_int(_iface.port_idx)},
+            inventory_columns={
+                "description"   : _iface.name,
+                "alias"         : _iface.name,
+                "speed"         : _safe_int(_iface.speed)*1000000,
+                "oper_status"   : _safe_int(_iface.oper_status),
+                "admin_status"  : _safe_int(_iface.admin_status),
+                "available"     : _iface.oper_status == '2',
+                "vlans"         : _iface.portconf,
+                "port_type"     : 6,
+            }
+        )
+        
+    yield Attributes(
+        path=["networking"],
+        inventory_attributes={
+            "available_ethernet_ports"      : _available_ethernet_ports,
+            "total_ethernet_ports"          : _total_ethernet_ports,
+            "total_interfaces"              : _total_ethernet_ports
+        }
+    )
 
 register.check_plugin(
     name='unifi_network_ports_if',
@@ -384,6 +604,12 @@ register.check_plugin(
     check_default_parameters=interfaces.CHECK_DEFAULT_PARAMETERS,
     check_function=check_unifi_network_port_if,
 )
+
+register.inventory_plugin(
+    name = "unifi_network_ports",
+    inventory_function = inventory_unifi_network_ports
+)
+
 ############ DEVICERADIO ###########
 def discovery_unifi_radios(section):
     #pprint(section)
@@ -396,12 +622,12 @@ def discovery_unifi_radios(section):
 def check_unifi_radios(item,section):
     _item = { "2.4Ghz" : "ng", "5Ghz" : "na" }.get(item)
     radio = next(filter(lambda x: x.radio == _item,section.values()))
-    yield Metric("read_data",interfaces.saveint(radio.rx_bytes))
-    yield Metric("write_data",interfaces.saveint(radio.tx_bytes))
-    yield Metric("satisfaction",max(0,interfaces.saveint(radio.satisfaction)))
-    yield Metric("wlan_user_sta",interfaces.saveint(radio.user_num_sta))
-    yield Metric("wlan_guest_sta",interfaces.saveint(radio.guest_num_sta))
-    yield Metric("wlan_iot_sta",interfaces.saveint(radio.iot_num_sta))
+    yield Metric("read_data",_safe_int(radio.rx_bytes))
+    yield Metric("write_data",_safe_int(radio.tx_bytes))
+    yield Metric("satisfaction",max(0,_safe_int(radio.satisfaction)))
+    yield Metric("wlan_user_sta",_safe_int(radio.user_num_sta))
+    yield Metric("wlan_guest_sta",_safe_int(radio.guest_num_sta))
+    yield Metric("wlan_iot_sta",_safe_int(radio.iot_num_sta))
 
     yield Result(
         state=State.OK,
@@ -440,41 +666,42 @@ def discovery_unifi_ssids(section):
 
 def check_unifi_ssids(item,section):
     ssid = section.get(item)
-    _channels = ",".join(list(filter(lambda x: interfaces.saveint(x) > 0,[ssid.ng_channel,ssid.na_channel])))
-    yield Result(
-        state=State.OK,
-        summary=f"Channels: {_channels}"
-    )
-    if (interfaces.saveint(ssid.ng_is_guest) + interfaces.saveint(ssid.na_is_guest)) > 0:
+    if ssid:
+        _channels = ",".join(list(filter(lambda x: _safe_int(x) > 0,[ssid.ng_channel,ssid.na_channel])))
         yield Result(
             state=State.OK,
-            summary="Guest"
+            summary=f"Channels: {_channels}"
         )
-    _satisfaction = max(0,min(interfaces.saveint(ssid.ng_satisfaction),interfaces.saveint(ssid.na_satisfaction)))
-    yield Result(
-        state=State.OK,
-        summary=f"Satisfaction: {_satisfaction}"
-    )
-    _num_sta = interfaces.saveint(ssid.na_num_sta) + interfaces.saveint(ssid.ng_num_sta)
-    if _num_sta > 0:
+        if (_safe_int(ssid.ng_is_guest) + _safe_int(ssid.na_is_guest)) > 0:
+            yield Result(
+                state=State.OK,
+                summary="Guest"
+            )
+        _satisfaction = max(0,min(_safe_int(ssid.ng_satisfaction),_safe_int(ssid.na_satisfaction)))
         yield Result(
             state=State.OK,
-            summary=f"User: {_num_sta}"
+            summary=f"Satisfaction: {_satisfaction}"
         )
-    yield Metric("satisfaction",max(0,_satisfaction))
-    yield Metric("wlan_24Ghz_num_user",interfaces.saveint(ssid.ng_num_sta) )
-    yield Metric("wlan_5Ghz_num_user",interfaces.saveint(ssid.na_num_sta) )
-
-    yield Metric("na_avg_client_signal",interfaces.saveint(ssid.na_avg_client_signal))
-    yield Metric("ng_avg_client_signal",interfaces.saveint(ssid.ng_avg_client_signal))
+        _num_sta = _safe_int(ssid.na_num_sta) + _safe_int(ssid.ng_num_sta)
+        if _num_sta > 0:
+            yield Result(
+                state=State.OK,
+                summary=f"User: {_num_sta}"
+            )
+        yield Metric("satisfaction",max(0,_satisfaction))
+        yield Metric("wlan_24Ghz_num_user",_safe_int(ssid.ng_num_sta) )
+        yield Metric("wlan_5Ghz_num_user",_safe_int(ssid.na_num_sta) )
     
-    yield Metric("na_tcp_packet_loss",interfaces.saveint(ssid.na_tcp_packet_loss))
-    yield Metric("ng_tcp_packet_loss",interfaces.saveint(ssid.ng_tcp_packet_loss))
-
-    yield Metric("na_wifi_retries",interfaces.saveint(ssid.na_wifi_retries))
-    yield Metric("ng_wifi_retries",interfaces.saveint(ssid.ng_wifi_retries))
-    yield Metric("na_wifi_latency",interfaces.saveint(ssid.na_wifi_latency))
-    yield Metric("ng_wifi_latency",interfaces.saveint(ssid.ng_wifi_latency))
+        yield Metric("na_avg_client_signal",_safe_int(ssid.na_avg_client_signal))
+        yield Metric("ng_avg_client_signal",_safe_int(ssid.ng_avg_client_signal))
+        
+        yield Metric("na_tcp_packet_loss",_safe_int(ssid.na_tcp_packet_loss))
+        yield Metric("ng_tcp_packet_loss",_safe_int(ssid.ng_tcp_packet_loss))
+    
+        yield Metric("na_wifi_retries",_safe_int(ssid.na_wifi_retries))
+        yield Metric("ng_wifi_retries",_safe_int(ssid.ng_wifi_retries))
+        yield Metric("na_wifi_latency",_safe_int(ssid.na_wifi_latency))
+        yield Metric("ng_wifi_latency",_safe_int(ssid.ng_wifi_latency))
     
     
 
@@ -499,23 +726,27 @@ def discovery_unifi_ssidlist(section):
 
 def check_unifi_ssidlist(item,section):
     ssid = section.get(item)
-    yield Result(
-        state=State.OK,
-        summary=f"Channels: {ssid.channels}"
-    )
-#    if (interfaces.saveint(ssid.ng_is_guest) + interfaces.saveint(ssid.na_is_guest)) > 0:
-#        yield Result(
-#            state=State.OK,
-#            summary="Guest"
-#        )
-#    yield Result(
-#        state=State.OK,
-#        summary=f"Satisfaction: {_satisfaction}"
-#    )
-    yield Result(
-        state=State.OK,
-        summary=f"User: {ssid.num_sta}"
-    )
+    if ssid:
+        yield Result(
+            state=State.OK,
+            summary=f"Channels: {ssid.channels}"
+        )
+        yield Result(
+            state=State.OK,
+            summary=f"User: {ssid.num_sta}"
+        )
+        yield Metric("wlan_24Ghz_num_user",_safe_int(ssid.ng_num_sta) )
+        yield Metric("wlan_5Ghz_num_user",_safe_int(ssid.na_num_sta) )
+        yield Metric("na_avg_client_signal",_safe_int(ssid.na_avg_client_signal))
+        yield Metric("ng_avg_client_signal",_safe_int(ssid.ng_avg_client_signal))
+        
+        yield Metric("na_tcp_packet_loss",_safe_int(ssid.na_tcp_packet_loss))
+        yield Metric("ng_tcp_packet_loss",_safe_int(ssid.ng_tcp_packet_loss))
+    
+        yield Metric("na_wifi_retries",_safe_int(ssid.na_wifi_retries))
+        yield Metric("ng_wifi_retries",_safe_int(ssid.ng_wifi_retries))
+        yield Metric("na_wifi_latency",_safe_int(ssid.na_wifi_latency))
+        yield Metric("ng_wifi_latency",_safe_int(ssid.ng_wifi_latency))
 
 register.agent_section(
     name = 'unifi_ssid_list',

share/check_mk/agents/special/agent_unifi_controller

@@ -1,8 +1,29 @@
 #!/usr/bin/env python3
 # -*- encoding: utf-8; py-indent-offset: 4 -*-
+##  MIT License
+##  
+##  Copyright (c) 2024 Bash Club
+##  
+##  Permission is hereby granted, free of charge, to any person obtaining a copy
+##  of this software and associated documentation files (the "Software"), to deal
+##  in the Software without restriction, including without limitation the rights
+##  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+##  copies of the Software, and to permit persons to whom the Software is
+##  furnished to do so, subject to the following conditions:
+##  
+##  The above copyright notice and this permission notice shall be included in all
+##  copies or substantial portions of the Software.
+##  
+##  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+##  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+##  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+##  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+##  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+##  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+##  SOFTWARE.
 
 ### 
-__VERSION__ = 0.75
+__VERSION__ = 2.01
 
 import sys
 import socket
@@ -14,7 +35,140 @@ from statistics import mean
 from collections import defaultdict
 
 from pprint import pprint
+try:
+    import cmk.utils.paths
+    AGENT_TMP_PATH = cmk.utils.paths.Path(cmk.utils.paths.tmp_dir, "agents/agent_unifi")
+except ImportError:
+    AGENT_TMP_PATH = None
 
+UNIFI_DEVICE_TABLE = {
+    'BZ2'       : 'UAP',
+    'BZ2LR'     : 'UAP-LR',
+    'S216150'   : 'US-16-150W',
+    'S224250'   : 'US-24-250W',
+    'S224500'   : 'US-24-500W',
+    'S248500'   : 'US-48-500W',
+    'S248750'   : 'US-48-750W',
+    'S28150'    : 'US-8-150W',
+    'U2HSR'     : 'UAP-Outdoor+',
+    'U2IW'      : 'UAP-IW',
+    'U2L48'     : 'UAP-LR',
+    'U2Lv2'     : 'UAP-LRv2',
+    'U2M'       : 'UAP-Mini',
+    'U2O'       : 'UAP-Outdoor',
+    'U2S48'     : 'UAP',
+    'U2Sv2'     : 'UAPv2',
+    'U5O'       : 'UAP-Outdoor5',
+    'U6ENT'     : 'U6-Enterprise',
+    'U6EXT'     : 'U6-Extender',
+    'U6IW'      : 'U6-IW',
+    'U6M'       : 'U6-Mesh',
+    'U7E'       : 'UAP-AC',
+    'U7EDU'     : 'UAP-AC-EDU',
+    'U7Ev2'     : 'UAP-AC',
+    'U7HD'      : 'UAP-AC-HD',
+    'U7IW'      : 'UAP-AC-IW',
+    'U7IWP'     : 'UAP-AC-IW-Pro',
+    'U7LR'      : 'UAP-AC-LR',
+    'U7LT'      : 'UAP-AC-Lite',
+    'U7MP'      : 'UAP-AC-M-Pro',
+    'U7MSH'     : 'UAP-AC-M',
+    'U7NHD'     : 'UAP-nanoHD',
+    'U7O'       : 'UAP-AC-Outdoor',
+    'U7P'       : 'UAP-AC-Pro',
+    'U7PG2'     : 'UAP-AC-Pro',
+    'U7SHD'     : 'UAP-AC-SHD',
+    'UAE6'      : 'U6-Extender-EA',
+    'UAIW6'     : 'U6-IW-EA',
+    'UAL6'      : 'U6-Lite',
+    'UALR6'     : 'U6-LR-EA',
+    'UALR6v2'   : 'U6-LR',
+    'UALR6v3'   : 'U6-LR',
+    'UAM6'      : 'U6-Mesh-EA',
+    'UAP6'      : 'U6-LR',
+    'UAP6MP'    : 'U6-Pro',
+    'UASXG'     : 'UAS-XG',
+    'UBB'       : 'UBB',
+    'UBBXG'     : 'UBB-XG',
+    'UCK'       : 'UCK',
+    'UCK-v2'    : 'UCK',
+    'UCK-v3'    : 'UCK',
+    'UCKG2'     : 'UCK-G2',
+    'UCKP'      : 'UCK-G2-Plus',
+    'UCMSH'     : 'UAP-XG-Mesh',
+    'UCXG'      : 'UAP-XG',
+    'UDC48X6'   : 'USW-Leaf',
+    'UDM'       : 'UDM',
+    'UDMB'      : 'UAP-BeaconHD',
+    'UDMPRO'    : 'UDM-Pro',
+    'UDMPROSE'  : 'UDM-SE',
+    'UDR'       : 'UDR',
+    'UDW'       : 'UDW',
+    'UDWPRO'    : 'UDWPRO',
+    'UFLHD'     : 'UAP-FlexHD',
+    'UGW3'      : 'USG-3P',
+    'UGW4'      : 'USG-Pro-4',
+    'UGWHD4'    : 'USG',
+    'UGWXG'     : 'USG-XG-8',
+    'UHDIW'     : 'UAP-IW-HD',
+    'ULTE'      : 'U-LTE',
+    'ULTEPEU'   : 'U-LTE-Pro',
+    'ULTEPUS'   : 'U-LTE-Pro',
+    'UP1'       : 'USP-Plug',
+    'UP4'       : 'UVP-X',
+    'UP5'       : 'UVP',
+    'UP5c'      : 'UVP',
+    'UP5t'      : 'UVP-Pro',
+    'UP5tc'     : 'UVP-Pro',
+    'UP6'       : 'USP-Strip',
+    'UP7'       : 'UVP-Executive',
+    'UP7c'      : 'UVP-Executive',
+    'US16P150'  : 'US-16-150W',
+    'US24'      : 'USW-24-G1',
+    'US24P250'  : 'US-24-250W',
+    'US24P500'  : 'US-24-500W',
+    'US24PL2'   : 'US-L2-24-PoE',
+    'US24PRO'   : 'USW-Pro-24-PoE',
+    'US24PRO2'  : 'USW-Pro-24',
+    'US48'      : 'US-48-G1',
+    'US48P500'  : 'US-48-500W',
+    'US48P750'  : 'US-48-750W',
+    'US48PL2'   : 'US-L2-48-PoE',
+    'US48PRO'   : 'USW-Pro-48-PoE',
+    'US48PRO2'  : 'USW-Pro-48',
+    'US624P'    : 'USW-Enterprise-24-PoE',
+    'US648P'    : 'USW-Enterprise-48-PoE',
+    'US68P'     : 'USW-Enterprise-8-PoE',
+    'US6XG150'  : 'US-XG-6PoE',
+    'US8'       : 'US-8',
+    'US8P150'   : 'US-8-150W',
+    'US8P60'    : 'US-8-60W',
+    'USAGGPRO'  : 'USW-Pro-Aggregation',
+    'USC8'      : 'US-8',
+    'USC8P150'  : 'US-8-150W',
+    'USC8P450'  : 'USW-Industrial',
+    'USC8P60'   : 'US-8-60W',
+    'USF5P'     : 'USW-Flex',
+    'USFXG'     : 'USW-Flex-XG',
+    'USL16LP'   : 'USW-Lite-16-PoE',
+    'USL16P'    : 'USW-16-PoE',
+    'USL24'     : 'USW-24-G2',
+    'USL24P'    : 'USW-24-PoE',
+    'USL48'     : 'USW-48-G2',
+    'USL48P'    : 'USW-48-PoE',
+    'USL8A'     : 'USW-Aggregation',
+    'USL8LP'    : 'USW-Lite-8-PoE',
+    'USL8MP'    : 'USW-Mission-Critical',
+    'USMINI'    : 'USW-Flex-Mini',
+    'USPPDUP'   : 'USP-PDU-Pro',
+    'USPRPS'    : 'USP-RPS',
+    'USXG'      : 'US-16-XG',
+    'USXG24'    : 'USW-EnterpriseXG-24',
+    'UXBSDM'    : 'UWB-XG-BK',
+    'UXGPRO'    : 'UXG-Pro',
+    'UXSDM'     : 'UWB-XG',
+    'p2N'       : 'PICOM2HP'
+}
 
 try:
     from cmk.special_agents.utils.argument_parsing import create_default_argument_parser
@@ -40,6 +194,9 @@ class unifi_object(object):
         if hasattr(self,"_init"):
             self._init()
 
+    def __repr__(self):
+        return repr([(_k,_v) for _k,_v in self.__dict__.items() if type(_v) in (int,str)])
+
 ########################################
 ######
 ######      S S I D
@@ -51,9 +208,17 @@ class unifi_network_ssid(unifi_object):
         self._UNIFI_SITE = self._PARENT._PARENT
         for _k,_v in getattr(self,"reasons_bar_chart_now",{}).items():
             setattr(self,_k,_v)
+        setattr(self,f"{self.radio}_num_sta",self.num_sta)
+        setattr(self,f"{self.radio}_tcp_packet_loss",self.tcp_packet_loss)
+        setattr(self,f"{self.radio}_wifi_retries",self.wifi_retries)
+        setattr(self,f"{self.radio}_wifi_latency",self.wifi_latency)
+        setattr(self,f"{self.radio}_avg_client_signal",self.avg_client_signal)
     def __str__(self):
         _ret = []
-        _unwanted = ["essid","radio","id","t","name","radio_name","wlanconf_id","is_wep","up","site_id","ap_mac","state"]
+        _unwanted = ["essid","radio","id","t","name","radio_name","wlanconf_id","is_wep","up","site_id","ap_mac","state",
+            "na_num_sta","ng_num_sta","ng_tcp_packet_loss","na_tcp_packet_loss","na_wifi_retries","ng_wifi_retries",
+            "na_wifi_latency","ng_wifi_latency","na_avg_client_signal","ng_avg_client_signal"
+        ]
         for _k,_v in self.__dict__.items():
             if _k.startswith("_") or _k in _unwanted or type(_v) not in (str,int,float):
                 continue
@@ -101,6 +266,9 @@ class unifi_network_port(unifi_object):
                 self.name = self.ifname
         if not hasattr(self,"port_idx") and hasattr(self,"ifname"):
             self.port_idx = int(self.ifname[-1])+1  ## ethX
+        
+        self.portconf = self._PARENT._PARENT._PORTCONFIGS.get(getattr(self,"portconf_id",None))
+        
 
     def _get_state(self,state):
         return {
@@ -135,7 +303,8 @@ class unifi_device(unifi_object):
         for _k,_v in getattr(self,"sys_stats",{}).items():
             _k = _k.replace("-","_")
             setattr(self,_k,_v)
-        if self.type in ("ugw","udm"):
+        self.model_name = UNIFI_DEVICE_TABLE.get(self.model)
+        if self.type in ("ugw","udm") and hasattr(self,"connect_request_ip"):
             ## change ip to local ip
             self.wan_ip = self.ip
             self.ip = self.connect_request_ip
@@ -172,7 +341,7 @@ class unifi_device(unifi_object):
 
     def _get_short_info(self):
         _ret = []
-        _wanted = ["version","ip","mac","serial","model","uptime","upgradeable","num_sta"]
+        _wanted = ["version","ip","mac","serial","model","model_name","uptime","upgradeable","num_sta","adopted","state"]
         for _k,_v in self.__dict__.items():
             if _k.startswith("_") or _k not in _wanted or type(_v) not in (str,int,float):
                 continue
@@ -197,7 +366,7 @@ class unifi_device(unifi_object):
             "lcm_idle_timeout_override","lcm_brightness_override","uplink_depth","mesh_sta_vap_enabled","mesh_uplink_2",
             "lcm_tracker_enabled","model_incompatible","model_in_lts","model_in_eol","country_code","wifi_caps",
             "meshv3_peer_mac","element_peer_mac","vwireEnabled","hide_ch_width","x_authkey","x_ssh_hostkey_fingerprint",
-            "x_fingerprint","x_inform_authkey","op_mode"
+            "x_fingerprint","x_inform_authkey","op_mode","uptime"
         ]
         for _k,_v in self.__dict__.items():
             if _k.startswith("_") or _k in _unwanted or type(_v) not in (str,int,float):
@@ -206,7 +375,10 @@ class unifi_device(unifi_object):
 
         _ret.append("<<<labels:sep(0)>>>")
         _ret.append(f"{{\"unifi_device\":\"unifi-{self.type}\"}}")
-
+        _uptime = getattr(self,"uptime",None)
+        if _uptime:
+            _ret.append("<<<uptime>>>")
+            _ret.append(str(_uptime))
         if self._NETWORK_PORTS:
             _ret += ["","<<<unifi_network_ports:sep(124)>>>"] + [str(_port) for _port in self._NETWORK_PORTS]
         if self._NETWORK_RADIO:
@@ -234,6 +406,8 @@ class unifi_site(unifi_object):
         
         ##pprint(_api.get_data("/stat/rogueap"))
         self._SITE_DEVICES = []
+        self._PORTCONFIGS = {}
+        self._get_portconfig()
         self._get_devices()
         _satisfaction = list(filter(
             lambda x: x != None,map(
@@ -242,6 +416,10 @@ class unifi_site(unifi_object):
         ))
         self.satisfaction = max(0,int(mean(_satisfaction)) if _satisfaction else 0)
 
+    def _get_portconfig(self):
+        _data = self._API.get_portconfig(site=self.name)
+        for _config in _data:
+            self._PORTCONFIGS[_config["_id"]] = _config.get("name")
 
     def _get_devices(self):
         _data = self._API.get_devices(site=self.name)
@@ -308,7 +486,14 @@ class unifi_controller(unifi_object):
         
         _ret = []
         for _ssid,_obj in _dict.items():
-            _ret.append("|".join([_ssid,"num_sta",str(sum(map(lambda x: getattr(x,"num_sta",0),_obj)))]))
+            #pprint(_obj)
+            for _key in ("num_sta","ng_num_sta","na_num_sta","ng_tcp_packet_loss","na_tcp_packet_loss","ng_wifi_retries","na_wifi_retries","ng_wifi_latency","na_wifi_latency"):
+                _ret.append("|".join([_ssid,_key,str(sum(map(lambda x: getattr(x,_key,0),_obj)))]))
+            
+            _signals = list(map(lambda x: getattr(x,"ng_avg_client_signal",0),filter(lambda x: x.radio == "ng",_obj)))
+            _ret.append("|".join([_ssid,"ng_avg_client_signal",str(mean(_signals if _signals else [0]))]))
+            _signals = list(map(lambda x: getattr(x,"na_avg_client_signal",0),filter(lambda x: x.radio == "na",_obj)))
+            _ret.append("|".join([_ssid,"na_avg_client_signal",str(mean(_signals if _signals else [0]))]))
             _ret.append("|".join([_ssid,"channels",",".join(
                 sorted(
                     set(map(lambda x: str(getattr(x,"channel","0")),_obj))
@@ -338,7 +523,7 @@ class unifi_controller(unifi_object):
         for _site in self._UNIFI_SITES:
             _ret.append(str(_site))
 
-        _ret.append("<<<unifi_device_shortlist>>>")
+        _ret.append("<<<unifi_device_shortlist:sep(124)>>>")
         for _device in self._UNIFI_DEVICES:
             if _device._piggy_back:
                 _ret.append(_device._get_short_info())
@@ -351,7 +536,7 @@ class unifi_controller(unifi_object):
         if self._API.PIGGYBACK_ATTRIBUT.lower() != "none":
             ## PIGGYBACK DEVICES ##
             for _device in self._UNIFI_DEVICES:
-                if _device._piggy_back:
+                if _device._piggy_back and _device.adopted:
                     _ret.append(str(_device))
         return "\n".join(_ret)
 
@@ -380,7 +565,11 @@ class unifi_controller_api(object):
 
     def check_unifi_os(self):
         _response = self.request("GET",url=self.url,allow_redirects=False)
-        self.is_unifios= _response.status_code == 200 and _response.headers.get("x-csrf-token")
+        _osid = re.findall('UNIFI_OS_MANIFEST.*?"id":"(\w+)"',_response.text)
+        if _osid and _osid[0] in ("UCKP","UNVR","UDMPRO","UDMENT","UDM","UDR"):
+            self.is_unifios = _osid[0]
+        else:
+            self.is_unifios = []
 
     def get_sysinfo(self):
         return self.get_data("/stat/sysinfo")
@@ -388,6 +577,9 @@ class unifi_controller_api(object):
     def get_sites(self):
         return self.get_data("/stat/sites",site=None)
 
+    def get_portconfig(self,site):
+        return self.get_data("/rest/portconf",site=site)
+
     def get_devices(self,site):
         return self.get_data("/stat/device",site=site)
 
@@ -409,17 +601,24 @@ class unifi_controller_api(object):
             return
         raise unifi_api_exception("Login failed")
 
-    def get_data(self,path,site="default",method="GET"):
-        _json = self.request(method=method,path=path,site=site).json()
-        _meta = _json.get("meta",{})
-        if _meta.get("rc") == "ok":
-            return _json.get("data",[])
+    def get_data(self,path,site="default",method="GET",**kwargs):
+        _json = self.request(method=method,path=path,site=site,**kwargs).json()
+        if type(_json) == dict:
+            _meta = _json.get("meta",{})
+            if _meta.get("rc") == "ok":
+                return _json.get("data",[])
+            if _json.get("modelKey") == "nvr":
+                return _json
+        if type(_json) == list:
+            return _json
         raise unifi_api_exception(_meta.get("msg",_json.get("errors",repr(_json))))
 
     def request(self,method,url=None,path=None,site=None,json=None,**kwargs):
         if not url:
-            if self.is_unifios:
-                url = f"{self.url}/proxy/network/api/"
+            if self.is_unifios == "UNVR":
+                url = f"{self.url}/proxy/protect/api"
+            elif self.is_unifios:
+                url = f"{self.url}/proxy/network/api"
             else:
                 url = f"{self.url}/api"
             if site is not None:
@@ -460,8 +659,6 @@ if __name__ == '__main__':
     parser.add_argument("host",type=str,
                         help="""Host name or IP address of Unifi Controller""")
     args = parser.parse_args()
-    print("<<<check_mk>>>")
-    print(f"Version: {__VERSION__}")
     try:
         _api = unifi_controller_api(**args.__dict__)
     except socket.error as e:
@@ -469,12 +666,18 @@ if __name__ == '__main__':
         sys.exit(1)
 
     if _api.is_unifios:
-        print("AgentOS: UnifiOS")
-    #pprint(_api.get_data("rest/portconf",site="default",method="GET"))
-    ##pprint(_api.get_data("/stat/rogueap"))
+        labels = {"cmk/os_family": "UnifiOS"}
+        print("<<<labels:sep(0)>>>")
+        print(json.dumps(labels))
+    if _api.is_unifios == "UNVR":
+        pprint(_api.get_data("/sensors",site=None))
+        pprint(_api.get_data("/cameras",site=None))
+        pprint(_api.get_data("/nvr",site=None))
+        sys.exit(0)
+    ##pprint(_api.get_data("/stat/rogueap?within=4"))
     ##pprint(_api.get_data("/rest/user",site="default",method="GET"))
     ##pprint(_api.get_data("/stat/sta",site="default",method="GET"))
-    #sys.exit(0)
+    ##sys.exit(0)
     _controller = unifi_controller(_API=_api)
     if args.rawapi == False:
         print(_controller)

share/check_mk/checkman/unifi_controller

@@ -0,0 +1,13 @@
+title: Unifi Controller
+agents: unifi_controller
+catalog: networking
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the device
+
+inventory:
+ One Service for each device
+ 

share/check_mk/checkman/unifi_device

@@ -0,0 +1,13 @@
+title: Unifi Device
+agents: unifi_controller
+catalog: networking
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the device
+
+inventory:
+ One Service for each device
+ 

share/check_mk/checkman/unifi_device_shortlist

@@ -0,0 +1,13 @@
+title: Unifi Devicelist
+catalog: networking
+agents: unifi_controller
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the device
+
+inventory:
+ One Service for each device
+ 

share/check_mk/checkman/unifi_network_ports_if

@@ -0,0 +1,13 @@
+title: Unifi Network Port
+agents: unifi_controller
+catalog: networking
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the Port
+
+inventory:
+ One Service for each Port
+ 

share/check_mk/checkman/unifi_network_radios

@@ -0,0 +1,13 @@
+title: Unifi WLAN Radio
+agents: unifi_controller
+catalog: networking
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the Radio
+
+inventory:
+ One Service for each Radio
+ 

share/check_mk/checkman/unifi_network_ssids

@@ -0,0 +1,13 @@
+title: Unifi SSID
+agents: unifi_controller
+catalog: networking
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the SSID
+
+inventory:
+ One Service for each SSID
+ 

share/check_mk/checkman/unifi_sites

@@ -0,0 +1,13 @@
+title: Unifi Site
+agents: unifi_controller
+catalog: networking
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the Site
+
+inventory:
+ One Service for each Site
+ 

share/check_mk/checkman/unifi_ssid_list

@@ -0,0 +1,13 @@
+title: Unifi Devicelist
+catalog: networking
+agents: unifi_controller
+licence: MIT
+description:
+ plz fill me
+
+item:
+ The name of the device
+
+inventory:
+ One Service for each device
+ 

share/check_mk/checks/agent_unifi_controller

@@ -1,5 +1,26 @@
 #!/usr/bin/env python3
 # -*- encoding: utf-8; py-indent-offset: 4 -*-
+##  MIT License
+##  
+##  Copyright (c) 2021 Bash Club
+##  
+##  Permission is hereby granted, free of charge, to any person obtaining a copy
+##  of this software and associated documentation files (the "Software"), to deal
+##  in the Software without restriction, including without limitation the rights
+##  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+##  copies of the Software, and to permit persons to whom the Software is
+##  furnished to do so, subject to the following conditions:
+##  
+##  The above copyright notice and this permission notice shall be included in all
+##  copies or substantial portions of the Software.
+##  
+##  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+##  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+##  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+##  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+##  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+##  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+##  SOFTWARE.
 
 #Function get params (in this case is port, passed via WATO agent rule cunfiguration, hostname and ip addres of host, 
 #for which agent will be invoked 

share/check_mk/web/plugins/metrics/unifi_metrics.py

@@ -1,3 +1,27 @@
+#!/usr/bin/env python3
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+##  MIT License
+##  
+##  Copyright (c) 2021 Bash Club
+##  
+##  Permission is hereby granted, free of charge, to any person obtaining a copy
+##  of this software and associated documentation files (the "Software"), to deal
+##  in the Software without restriction, including without limitation the rights
+##  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+##  copies of the Software, and to permit persons to whom the Software is
+##  furnished to do so, subject to the following conditions:
+##  
+##  The above copyright notice and this permission notice shall be included in all
+##  copies or substantial portions of the Software.
+##  
+##  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+##  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+##  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+##  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+##  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+##  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+##  SOFTWARE.
+
 from cmk.gui.i18n import _
 from cmk.gui.plugins.metrics import (
     metric_info,
@@ -97,6 +121,44 @@ graph_info["lan_user_sta_combined"] = {
     ],
 }
 
+
+metric_info["lan_active_sw"] = {
+    "title": _("Active Switches"),
+    "unit": "count",
+    "color": "13/b",
+}
+metric_info["lan_total_sw"] = {
+    "title": _("Total Switches"),
+    "unit": "count",
+    "color": "13/a",
+}
+
+graph_info["lan_active_sw_combined"] = {
+    "title" : _("Active Switches"),
+    "metrics" : [
+        ("lan_active_sw","area"),
+        ("lan_total_sw","line"),
+    ],
+}
+metric_info["wlan_active_ap"] = {
+    "title": _("Active Accesspoints"),
+    "unit": "count",
+    "color": "13/b",
+}
+metric_info["wlan_total_ap"] = {
+    "title": _("Total Accesspoints"),
+    "unit": "count",
+    "color": "13/a",
+}
+
+graph_info["wlan_active_ap_combined"] = {
+    "title" : _("Active Accesspoints"),
+    "metrics" : [
+        ("wlan_active_ap","area"),
+        ("wlan_total_ap","line"),
+    ],
+}
+
 metric_info["wlan_user_sta"] = {
     "title": _("WLAN User"),
     "unit": "count",

share/check_mk/web/plugins/perfometer/unifi_performeter.py

@@ -1,3 +1,27 @@
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+
+##  MIT License
+##  
+##  Copyright (c) 2021 Bash Club
+##  
+##  Permission is hereby granted, free of charge, to any person obtaining a copy
+##  of this software and associated documentation files (the "Software"), to deal
+##  in the Software without restriction, including without limitation the rights
+##  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+##  copies of the Software, and to permit persons to whom the Software is
+##  furnished to do so, subject to the following conditions:
+##  
+##  The above copyright notice and this permission notice shall be included in all
+##  copies or substantial portions of the Software.
+##  
+##  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+##  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+##  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+##  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+##  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+##  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+##  SOFTWARE.
+
 from cmk.gui.plugins.metrics import perfometer_info
 
 perfometer_info.append({

share/check_mk/web/plugins/wato/datasource_unifi_controller.py

@@ -1,14 +1,37 @@
 #!/usr/bin/env python3
 # -*- encoding: utf-8; py-indent-offset: 4 -*-
+##  MIT License
+##  
+##  Copyright (c) 2021 Bash Club
+##  
+##  Permission is hereby granted, free of charge, to any person obtaining a copy
+##  of this software and associated documentation files (the "Software"), to deal
+##  in the Software without restriction, including without limitation the rights
+##  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+##  copies of the Software, and to permit persons to whom the Software is
+##  furnished to do so, subject to the following conditions:
+##  
+##  The above copyright notice and this permission notice shall be included in all
+##  copies or substantial portions of the Software.
+##  
+##  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+##  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+##  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+##  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+##  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+##  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+##  SOFTWARE.
 
 from cmk.gui.i18n import _
 from cmk.gui.plugins.wato import (
     HostRulespec,
+    CheckParameterRulespecWithItem,
     IndividualOrStoredPassword,
     rulespec_registry,
 )
 from cmk.gui.valuespec import (
     Dictionary,
+    Tuple,
     Alternative,
     NetworkPort,
     Checkbox,
@@ -50,3 +73,29 @@ rulespec_registry.register(
         name='special_agents:unifi_controller',
         valuespec=_valuespec_special_agent_unifi_controller,
     ))
+
+def _item_spec_unifi_site():
+    return TextAscii(
+        title=_("Site"),
+        help=_("help Site Text")
+    )
+
+def _parameter_valuespec_unifi_site():
+    return Dictionary(
+        title = _("Unifi Site"),
+        optional_keys=[],
+        elements = [
+            ('ignore_alarms', Checkbox(title=_("Ignore Site Alarms"), default_value=False)),
+        ]
+    )
+
+rulespec_registry.register(
+    CheckParameterRulespecWithItem(
+        check_group_name = "unifi_sites",
+        group=RulespecGroupCheckParametersNetworking,
+        item_spec = _item_spec_unifi_site,
+        match_type = "dict",
+        parameter_valuespec=_parameter_valuespec_unifi_site,
+        title=lambda: _("Unifi Site Parameter")
+    )
+)