diff --git a/README.md b/README.md index d67420110740f4d18b299095f91b5a072f0433ec..a1b713e8adc7b16ae0ac5c4764d6c8caa6533c58 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/cisco_meraki-1.3.6-20240915.mkp "cisco_meraki-1.3.6-20240915.mkp" +[PACKAGE]: ../../raw/master/mkp/cisco_meraki-1.3.7-20241116.mkp "cisco_meraki-1.3.7-20241116.mkp" [SDK]: ../../raw/master/mkp/MerakiSDK-1.46.0-20240912.mkp "MerakiSDK-1.46.0-20240516.mkpp" # Cisco Meraki special agent diff --git a/mkp/cisco_meraki-1.3.7-20241116.mkp b/mkp/cisco_meraki-1.3.7-20241116.mkp new file mode 100644 index 0000000000000000000000000000000000000000..36320ad94442f9bd7a86fb14a48de752cb7d5356 Binary files /dev/null and b/mkp/cisco_meraki-1.3.7-20241116.mkp differ diff --git a/source/cmk_addons_plugins/meraki/lib/agent.py b/source/cmk_addons_plugins/meraki/lib/agent.py index 6f96d7430eb49e226c85ec7d28b9ed8c497fb2d0..ef80ffec40072310c8b5ce29ed392d08b0f2b4b1 100644 --- a/source/cmk_addons_plugins/meraki/lib/agent.py +++ b/source/cmk_addons_plugins/meraki/lib/agent.py @@ -39,6 +39,7 @@ # 2024-06-23: added cache time per section -> not nice but should work. # 2024-09-12: added version check for min. Meraki SDK version # 2024-09-15: fixed MerakiGetOrganizationSwitchPortsStatusesBySwitch -> return only list of switches +# 2024-11-16: fixed crash on missing items in MerakiGetOrganizationSwitchPortsStatusesBySwitch (ThX to Stephan Bergfeld) # ToDo: create inventory from Networks, is per organisation, not sure where/how to put this in the inventory # ToDo: list Connected Datacenters like Umbrella https://developer.cisco.com/meraki/api-v1/list-data-centers/ @@ -648,11 +649,13 @@ class MerakiGetOrganizationSwitchPortsStatusesBySwitch(MerakiSectionOrg): params=params, timeout=3, ) - return response.json()['items'] - # return self._config.dashboard.organizations.getOrganizationDevices(self._org_id, total_pages='all') except RequestException as e: _LOGGER.debug('Organisation ID: %r: Get Ports statuses by switch: %r', self._org_id, e) return [] + _response = response.json() + if _response: + return _response.get('items', []) + return [] # diff --git a/source/packages/cisco_meraki b/source/packages/cisco_meraki index 08abc811514722ef5a99424d2d9b47ef449eb38b..21fb4c5e2211b498062e91125b9a9870cd1249f2 100644 --- a/source/packages/cisco_meraki +++ b/source/packages/cisco_meraki @@ -63,7 +63,7 @@ 'web': ['plugins/views/cisco_meraki.py']}, 'name': 'cisco_meraki', 'title': 'Cisco Meraki special agent', - 'version': '1.3.6-20240915', + 'version': '1.3.7-20241116', 'version.min_required': '2.3.0b1', 'version.packaged': 'cmk-mkp-tool 0.2.0', 'version.usable_until': '2.4.0b1'}