added "use network as prefix" option

README.md

-[PACKAGE]: ../../raw/master/mkp/cisco_meraki-1.4.1-20241217.mkp "cisco_meraki-1.4.1-20241217.mkp"
+[PACKAGE]: ../../raw/master/mkp/cisco_meraki-1.4.2-20250104.mkp "cisco_meraki-1.4.2-20250104.mkp"
 [SDK]: ../../raw/master/mkp/MerakiSDK-1.52.0-20241116.mkp "MerakiSDK-1.52.0-20241116.mkp"
 # Cisco Meraki special agent
 

source/cmk_addons_plugins/meraki/lib/utils.py

@@ -23,48 +23,47 @@ from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import CheckResul
 MerakiAPIData = Mapping[str, object]
 
 # parameter names for agent options
-_SEC_NAME_ORGANISATIONS: Final = '_organisations'  # internal use runs always
-_SEC_NAME_DEVICE_INFO: Final = '_device_info'  # Not configurable, needed for piggyback
-_SEC_NAME_NETWORKS: Final = '_networks'  # internal use, runs always, needed for network names
-_SEC_NAME_ORG_API_REQUESTS: Final = 'api-requests-by-organization'  # internal use, runs always
-
-_SEC_NAME_APPLIANCE_UPLINKS: Final = 'appliance-uplinks'
-_SEC_NAME_APPLIANCE_PORTS: Final = 'appliance-ports'
-_SEC_NAME_APPLIANCE_UPLINKS_USAGE: Final = 'appliance-uplinks-usage'
-_SEC_NAME_APPLIANCE_VPNS: Final = 'appliance-vpns'
-_SEC_NAME_APPLIANCE_PERFORMANCE: Final = 'appliance-performance'
-_SEC_NAME_CELLULAR_UPLINKS: Final = 'cellular-uplinks'
-_SEC_NAME_DEVICE_STATUSES: Final = 'device-status'
-_SEC_NAME_DEVICE_UPLINKS_INFO: Final = 'device-uplinks-info'
-_SEC_NAME_LICENSES_OVERVIEW: Final = 'licenses-overview'
-_SEC_NAME_SENSOR_READINGS: Final = 'sensor-readings'
-_SEC_NAME_SWITCH_PORTS_STATUSES: Final = 'switch-ports-statuses'
-_SEC_NAME_WIRELESS_DEVICE_STATUS: Final = 'wireless-device-status'
-_SEC_NAME_WIRELESS_ETHERNET_STATUSES: Final = 'wireless-ethernet-statuses'
-
+SEC_NAME_ORGANISATIONS: Final = '_organisations'  # internal use runs always
+SEC_NAME_DEVICE_INFO: Final = '_device_info'  # Not configurable, needed for piggyback
+SEC_NAME_NETWORKS: Final = '_networks'  # internal use, runs always, needed for network names
+SEC_NAME_ORG_API_REQUESTS: Final = 'api-requests-by-organization'  # internal use, runs always
+
+SEC_NAME_APPLIANCE_UPLINKS: Final = 'appliance-uplinks'
+SEC_NAME_APPLIANCE_PORTS: Final = 'appliance-ports'
+SEC_NAME_APPLIANCE_UPLINKS_USAGE: Final = 'appliance-uplinks-usage'
+SEC_NAME_APPLIANCE_VPNS: Final = 'appliance-vpns'
+SEC_NAME_APPLIANCE_PERFORMANCE: Final = 'appliance-performance'
+SEC_NAME_CELLULAR_UPLINKS: Final = 'cellular-uplinks'
+SEC_NAME_DEVICE_STATUSES: Final = 'device-status'
+SEC_NAME_DEVICE_UPLINKS_INFO: Final = 'device-uplinks-info'
+SEC_NAME_LICENSES_OVERVIEW: Final = 'licenses-overview'
+SEC_NAME_SENSOR_READINGS: Final = 'sensor-readings'
+SEC_NAME_SWITCH_PORTS_STATUSES: Final = 'switch-ports-statuses'
+SEC_NAME_WIRELESS_DEVICE_STATUS: Final = 'wireless-device-status'
+SEC_NAME_WIRELESS_ETHERNET_STATUSES: Final = 'wireless-ethernet-statuses'
 
 # api cache defaults per section
-_SEC_CACHE_APPLIANCE_PERFORMANCE = 0
-_SEC_CACHE_APPLIANCE_UPLINKS_USAGE = 0
-_SEC_CACHE_APPLIANCE_UPLINKS = 60
-_SEC_CACHE_APPLIANCE_VPNS = 60
-_SEC_CACHE_CELLULAR_UPLINKS = 60
-_SEC_CACHE_DEVICE_INFO = 60
-_SEC_CACHE_DEVICE_STATUSES = 60
-_SEC_CACHE_DEVICE_UPLINKS_INFO = 60
-_SEC_CACHE_LICENSES_OVERVIEW = 600
-_SEC_CACHE_NETWORKS = 600
-_SEC_CACHE_ORG_API_REQUESTS = 0
-_SEC_CACHE_ORG_SWITCH_PORTS_STATUSES = 0
-_SEC_CACHE_ORGANISATIONS = 600
-_SEC_CACHE_SENSOR_READINGS = 0
-_SEC_CACHE_SWITCH_PORTS_STATUSES = 0
-_SEC_CACHE_WIRELESS_DEVICE_STATUS = 30
-_SEC_CACHE_WIRELESS_ETHERNET_STATUSES = 30
-_SEC_CACHE_APPLIANCE_PORTS = 30
+SEC_CACHE_APPLIANCE_PERFORMANCE = 0
+SEC_CACHE_APPLIANCE_UPLINKS_USAGE = 0
+SEC_CACHE_APPLIANCE_UPLINKS = 60
+SEC_CACHE_APPLIANCE_VPNS = 60
+SEC_CACHE_CELLULAR_UPLINKS = 60
+SEC_CACHE_DEVICE_INFO = 60
+SEC_CACHE_DEVICE_STATUSES = 60
+SEC_CACHE_DEVICE_UPLINKS_INFO = 60
+SEC_CACHE_LICENSES_OVERVIEW = 600
+SEC_CACHE_NETWORKS = 600
+SEC_CACHE_ORG_API_REQUESTS = 0
+SEC_CACHE_ORG_SWITCH_PORTS_STATUSES = 0
+SEC_CACHE_ORGANISATIONS = 600
+SEC_CACHE_SENSOR_READINGS = 0
+SEC_CACHE_SWITCH_PORTS_STATUSES = 0
+SEC_CACHE_WIRELESS_DEVICE_STATUS = 30
+SEC_CACHE_WIRELESS_ETHERNET_STATUSES = 30
+SEC_CACHE_APPLIANCE_PORTS = 30
 
 # Early Access
-_SEC_NAME_ORG_SWITCH_PORTS_STATUSES: Final = 'org-switch-ports-statuses'
+SEC_NAME_ORG_SWITCH_PORTS_STATUSES: Final = 'org-switch-ports-statuses'
 
 
 @dataclass(frozen=True)

source/cmk_plugins/collection/server_side_calls/cisco_meraki.py

@@ -27,6 +27,7 @@ __param = {
     ),
     'no_cache': True,
     'org_id_as_prefix': True,
+    'net_id_as_prefix': True,
     'excluded_sections': [
         'appliance_performance',
         'switch_ports_statuses',
@@ -82,6 +83,7 @@ class Params(BaseModel):
     orgs: Sequence[str] | None = None
     excluded_sections: Sequence[str] | None = None
     org_id_as_prefix: bool | None = None
+    net_id_as_prefix: bool | None = None
     no_cache: bool | None = None
     cache_per_section: CachePerSection | None = None
 
@@ -153,6 +155,9 @@ def agent_cisco_meraki_arguments(
     if params.org_id_as_prefix is True:
         args.append("--org-id-as-prefix")
 
+    if params.net_id_as_prefix is True:
+        args.append("--net-id-as-prefix")
+
     if params.no_cache is True:
         args.append("--no-cache")
 

source/packages/cisco_meraki

@@ -63,7 +63,7 @@
            'web': ['plugins/views/cisco_meraki.py']},
  'name': 'cisco_meraki',
  'title': 'Cisco Meraki special agent',
- 'version': '1.4.1-20241217',
+ 'version': '1.4.2-20250104',
  'version.min_required': '2.3.0b1',
  'version.packaged': 'cmk-mkp-tool 0.2.0',
  'version.usable_until': '2.4.0b1'}