diff --git a/README.md b/README.md index a7bcca21f5901265a7a14826c2af42133add7a36..50601b065f7b566fbf43220cd2409122bc2771d7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/cisco_meraki-1.3.1-20240624.mkp "cisco_meraki-1.3.1-20240624.mkp" +[PACKAGE]: ../../raw/master/mkp/cisco_meraki-1.3.2-20240626.mkp "cisco_meraki-1.3.2-20240626.mkp" [SDK]: ../../raw/master/mkp/MerakiSDK-1.46.0-20240516.mkp "MerakiSDK-1.46.0-20240516.mkpp" # Cisco Meraki special agent diff --git a/mkp/cisco_meraki-1.3.2-20240626.mkp b/mkp/cisco_meraki-1.3.2-20240626.mkp new file mode 100644 index 0000000000000000000000000000000000000000..314056bec4ee57fdffa01a4c0a2d1c360a289da1 Binary files /dev/null and b/mkp/cisco_meraki-1.3.2-20240626.mkp differ diff --git a/source/checks/agent_cisco_meraki b/source/checks/agent_cisco_meraki index fb3808c5f06f3c144fda39152b20ab66b7bed027..74230b874006e58d5f574213ebafe09fbab2a5e0 100644 --- a/source/checks/agent_cisco_meraki +++ b/source/checks/agent_cisco_meraki @@ -51,7 +51,7 @@ def agent_cisco_meraki_arguments( args.extend(["--excluded-sections"] + excluded_sections) if cache_per_section := params.get("cache_per_section"): - args.extend(["--cache_per_section"] + list(cache_per_section)) + args.extend(["--cache-per-section"] + list(cache_per_section)) return args diff --git a/source/lib/python3/cmk/special_agents/agent_cisco_meraki.py b/source/lib/python3/cmk/special_agents/agent_cisco_meraki.py index 3d9b69d61b88854ada69e8489bd42aff70798d6f..e1bd3fcbd0e29683dc1317547e6e99e003439519 100644 --- a/source/lib/python3/cmk/special_agents/agent_cisco_meraki.py +++ b/source/lib/python3/cmk/special_agents/agent_cisco_meraki.py @@ -37,6 +37,8 @@ # 2024-05-20: made appliance uplinks usage user selectable # made API requests per org user selectable # 2024-06-23: added cache time per section -> not nice but should work. +# 2024-06-24: renamed cache time per section option form --cache_per_section to --cache-per-section +# fixed --cache-per-section parameter evaluation # 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/ @@ -1139,9 +1141,9 @@ def parse_arguments(argv: Sequence[str] | None) -> Args: ) parser.add_argument( - '--cache_per_section', + '--cache-per-section', nargs="+", - type=list[int], + type=int, help="List of chache time per section in minutes", default=[0, 0, 60, 60, 60, 60, 60, 60, 600, 600, 0, 0, 600, 0, 0, 30, 30] ) diff --git a/source/packages/cisco_meraki b/source/packages/cisco_meraki index 65c1dc0d4994771f6187842dd50191965fa5be30..6f2a23d4f3b30e271bb4e1c6f6d2d6732baebe1b 100644 --- a/source/packages/cisco_meraki +++ b/source/packages/cisco_meraki @@ -60,7 +60,7 @@ 'plugins/wato/agent_cisco_meraki.py']}, 'name': 'cisco_meraki', 'title': 'Cisco Meraki special agent', - 'version': '1.3.1-20240624', + 'version': '1.3.2-20240626', 'version.min_required': '2.2.0b1', 'version.packaged': '2.2.0p27', 'version.usable_until': '2.3.0b1'}