From 4bc0906aa29b23a286d5b131ec788cd3de3cff43 Mon Sep 17 00:00:00 2001
From: "Th.L" <thl-cmk@outlook.com>
Date: Thu, 15 Jul 2021 11:24:30 +0200
Subject: [PATCH] update project
---
agent_based/inv_cisco_wlc_aps_lwap.py | 23 +++++----
inv_cisco_wlc_aps_lwap.mkp | Bin 6307 -> 6413 bytes
packages/inv_cisco_wlc_aps_lwap | 4 +-
web/plugins/views/inv_cisco_wlc_aps_lwap.py | 20 +++++---
web/plugins/wato/inv_cisco_wlc_aps_lwap.py | 51 +++++++++++---------
5 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/agent_based/inv_cisco_wlc_aps_lwap.py b/agent_based/inv_cisco_wlc_aps_lwap.py
index 79642b9..c39fee8 100644
--- a/agent_based/inv_cisco_wlc_aps_lwap.py
+++ b/agent_based/inv_cisco_wlc_aps_lwap.py
@@ -9,16 +9,19 @@
#
# inventory of cisco wlc aps
#
-# 2016-08-22 : removed index column
-# 2018-08-04 : changed scan function, code cleanup
-# 2018-09-04 : changes for CMK 1.5.x (inv_tree --> inv_tree_list)
-# 2021-07-11 : rewritten for CMK 2.0
+# 2016-08-22: removed index column
+# 2018-08-04: changed scan function, code cleanup
+# 2018-09-04: changes for CMK 1.5.x (inv_tree --> inv_tree_list)
+# 2020-03-15: added support for CMK1.6x
+# 2021-07-11: rewritten for CMK 2.0
+# 2021-07-15: added support for Catalyst 9800 Controllers
from cmk.base.plugins.agent_based.agent_based_api.v1 import (
register,
SNMPTree,
TableRow,
contains,
+ any_of,
)
from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
StringTable,
@@ -223,15 +226,15 @@ def parse_inv_cisco_wlc_aps_lwap(string_table: StringTable):
for ap in string_table:
wlcprimaryaddress = ap[5]
- if _inet_address_type.get(int(ap[4])) == 'ipv4':
+ if _inet_address_type.get(ap[4]) == 'ipv4':
wlcprimaryaddress = _render_ip_address(wlcprimaryaddress)
wlcsecondaryaddress = ap[7]
- if _inet_address_type.get(int(ap[6])) == 'ipv4':
+ if _inet_address_type.get(ap[6]) == 'ipv4':
wlcsecondaryaddress = _render_ip_address(wlcsecondaryaddress)
wlctertiaryaddress = ap[9]
- if _inet_address_type.get(int(ap[8])) == 'ipv4':
+ if _inet_address_type.get(ap[8]) == 'ipv4':
wlctertiaryaddress = _render_ip_address(wlctertiaryaddress)
aps.append({
@@ -323,7 +326,6 @@ def inventory_cisco_wlc_aps_lwap(params, section) -> InventoryResult:
status_columns.pop(entry)
except KeyError:
pass
-
yield TableRow(
path=path,
key_columns=key_columns,
@@ -397,7 +399,10 @@ register.snmp_section(
'85', # cLApBleFWDownloadStatus
]
),
- detect=contains('.1.3.6.1.2.1.1.1.0', 'Cisco Controller'), # sysDescr
+ detect=any_of(
+ contains('.1.3.6.1.2.1.1.1.0', 'Cisco Controller'), # sysDescr
+ contains('.1.3.6.1.2.1.1.1.0', 'C9800 Software'), # sysDescr
+ )
)
register.inventory_plugin(
diff --git a/inv_cisco_wlc_aps_lwap.mkp b/inv_cisco_wlc_aps_lwap.mkp
index 432139322c4d4e9ffa33e77abbd9a51d8620cdf6..752bb12af17f9f2b66b348d2904cca202a693b93 100644
GIT binary patch
literal 6413
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
literal 6307
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
diff --git a/packages/inv_cisco_wlc_aps_lwap b/packages/inv_cisco_wlc_aps_lwap
index 0a56736..94f0e6d 100644
--- a/packages/inv_cisco_wlc_aps_lwap
+++ b/packages/inv_cisco_wlc_aps_lwap
@@ -12,7 +12,7 @@
'name': 'inv_cisco_wlc_aps_lwap',
'num_files': 3,
'title': 'inventory for CISCO-LWAPP-AP-MIB',
- 'version': '20210711.v0.4',
+ 'version': '20210715.v0.4a',
'version.min_required': '2.0.0',
- 'version.packaged': '2021.04.10',
+ 'version.packaged': '2021.07.14',
'version.usable_until': None}
\ No newline at end of file
diff --git a/web/plugins/views/inv_cisco_wlc_aps_lwap.py b/web/plugins/views/inv_cisco_wlc_aps_lwap.py
index 67974dd..f18c1f4 100644
--- a/web/plugins/views/inv_cisco_wlc_aps_lwap.py
+++ b/web/plugins/views/inv_cisco_wlc_aps_lwap.py
@@ -8,20 +8,27 @@ from cmk.gui.plugins.views.inventory import declare_invtable_view
inventory_displayhints.update({
- '.networking.wlan.controller.accesspoints_lwap:': {'title' : _('Access Points LWAP info'),
- 'keyorder': ['name', 'if_mac_address', ],
- 'view' : 'invwlcapslwap_of_host',
- },
+ '.networking.wlan.controller.accesspoints_lwap:': {
+ 'title': _('Access Points LWAP info'),
+ 'keyorder': [
+ 'name', 'if_mac_address', 'admin', 'power_status', 'led_state', 'last_reboot_reason', 'telnet', 'ssh',
+ 'encryption_supported', 'encryption', 'data_encryption', 'wips',
+ ],
+ 'view': 'invwlcapslwap_of_host',
+ },
'.networking.wlan.controller.accesspoints_lwap:*.name' : {'title': _('Name')},
'.networking.wlan.controller.accesspoints_lwap:*.if_mac_address' : {'title': _('MAC Address')},
'.networking.wlan.controller.accesspoints_lwap:*.admin' : {'title': _('Admin state')},
- '.networking.wlan.controller.accesspoints_lwap:*.last_reboot_reason' : {'title': _('Last reboot reason')},
'.networking.wlan.controller.accesspoints_lwap:*.power_status' : {'title': _('Power status')},
+ '.networking.wlan.controller.accesspoints_lwap:*.led_state' : {'title': _('LED state')},
+ '.networking.wlan.controller.accesspoints_lwap:*.last_reboot_reason' : {'title': _('Last reboot reason')},
'.networking.wlan.controller.accesspoints_lwap:*.telnet' : {'title': _('Telnet enabled'), 'short': _('Telnet')},
'.networking.wlan.controller.accesspoints_lwap:*.ssh' : {'title': _('SSH enabled'), 'short': _('SSH')},
'.networking.wlan.controller.accesspoints_lwap:*.encryption_supported' : {'title': _('Encryption supported')},
'.networking.wlan.controller.accesspoints_lwap:*.encryption' : {'title': _('Encryption enabled')},
'.networking.wlan.controller.accesspoints_lwap:*.data_encryption' : {'title': _('Data encryption')},
+ '.networking.wlan.controller.accesspoints_lwap:*.wips' : {'title': _('wireless IPS,')},
+
'.networking.wlan.controller.accesspoints_lwap:*.rogue_detection' : {'title': _('Rogue detection enabled'), 'short': _('Rouge detection')},
'.networking.wlan.controller.accesspoints_lwap:*.pwr_injector_state' : {'title': _('Pow. inj. state')},
'.networking.wlan.controller.accesspoints_lwap:*.pwr_injector_selection' : {'title': _('Pow. inj. selection')},
@@ -30,11 +37,9 @@ inventory_displayhints.update({
'.networking.wlan.controller.accesspoints_lwap:*.wlc_primary_address' : {'title': _('primary WLC')},
'.networking.wlan.controller.accesspoints_lwap:*.wlc_secondary_address' : {'title': _('secondary WLC')},
'.networking.wlan.controller.accesspoints_lwap:*.wlc_tertiary_address' : {'title': _('tertiary WLC')},
-
'.networking.wlan.controller.accesspoints_lwap:*.max_#_of_dot11_slots' : {'title': _('max # of dot11 slots')},
'.networking.wlan.controller.accesspoints_lwap:*.max_#_of_ethernet_slots' : {'title': _('max # of ethernet slots')},
'.networking.wlan.controller.accesspoints_lwap:*.failover_priority' : {'title': _('failover priority')},
- '.networking.wlan.controller.accesspoints_lwap:*.wips' : {'title': _('wireless IPS,')},
'.networking.wlan.controller.accesspoints_lwap:*.monitor_mode_optimization' : {'title': _('monitor mode optimization')},
'.networking.wlan.controller.accesspoints_lwap:*.amsdu' : {'title': _('Aggregate MAC Service Data Unit'), 'short': _('AMSDU')},
'.networking.wlan.controller.accesspoints_lwap:*.tcp_mss' : {'title': _('TCP MSS')},
@@ -43,7 +48,6 @@ inventory_displayhints.update({
'.networking.wlan.controller.accesspoints_lwap:*.venue_config_venue_type' : {'title': _('Venue type')},
'.networking.wlan.controller.accesspoints_lwap:*.venue_config_venue_name' : {'title': _('Venue name')},
'.networking.wlan.controller.accesspoints_lwap:*.venue_config_language' : {'title': _('Venue language')},
- '.networking.wlan.controller.accesspoints_lwap:*.led_state' : {'title': _('LED state')},
'.networking.wlan.controller.accesspoints_lwap:*.trunk_vlan' : {'title': _('Mgmt VLAN ID')},
'.networking.wlan.controller.accesspoints_lwap:*.trunk_vlan_status' : {'title': _('Mgmt VLAN tagged state')},
'.networking.wlan.controller.accesspoints_lwap:*.location' : {'title': _('Location')},
diff --git a/web/plugins/wato/inv_cisco_wlc_aps_lwap.py b/web/plugins/wato/inv_cisco_wlc_aps_lwap.py
index 4d6be49..30a6471 100644
--- a/web/plugins/wato/inv_cisco_wlc_aps_lwap.py
+++ b/web/plugins/wato/inv_cisco_wlc_aps_lwap.py
@@ -16,9 +16,21 @@ from cmk.gui.plugins.wato.inventory import (
RulespecGroupInventory,
)
-_removecolumns = [
+_removecolumns_cisco_wlc_aps_lwap = [
+ # ('name', 'Name'),
+ # (if_mac_address', 'MAC Address'),
+ # ('admin', 'Admin state'),
+ # ('power_status', 'Power status'),
+ # ('led_state', 'LED state'),
+ # ('last_reboot_reason', 'Last reboot reason'),
+ # ('telnet', 'Telnet enabled'),
+ # ('ssh', 'SSH enabled'),
+ # ('encryption_supported', 'Encryption supported'),
+ # ('data_encryption', 'Data encryption'),
+ # ('encryption', 'Encryption enabled'),
+ # ('wips', 'wireless IPS,'),
+
('adj_channel_rogue_enabled', 'Adj. channel rogue'),
- ('admin', 'Admin state'),
('amsdu', 'Aggregate MAC Service Data Unit'),
('antenna_band_mode', 'Antenna band mode'),
('is_master', 'AP is master'),
@@ -26,13 +38,8 @@ _removecolumns = [
('submode', 'AP submode'),
('universal_prime_status', 'AP universal prime status'),
('ble_fw_download_status', 'Ble FW downaload status'),
- ('data_encryption', 'Data encryption'),
- ('encryption', 'Encryption enabled'),
- ('encryption_supported', 'Encryption supported'),
('failover_priority', 'failover priority'),
('floor_label', 'Floor label'),
- ('last_reboot_reason', 'Last reboot reason'),
- ('led_state', 'LED state'),
('location', 'Location'),
('max_#_of_dot11_slots', 'max # of dot11 slots'),
('max_#_of_ethernet_slots', 'max # of ethernet slots'),
@@ -45,17 +52,14 @@ _removecolumns = [
('module_inserted', 'Module inserted'),
('monitor_mode_optimization', 'monitor mode optimization'),
('port_number', 'Port number'),
- ('power_status', 'Power status'),
('pwr_injector_selection', 'Pow. inj. selection'),
('pwr_injector_state', 'Pow. inj. state'),
('pwr_injector_sw_mac_addr', 'Pow. inj. MAC address'),
('pwr_pre_std_state', 'PoE pre standard'),
('real_time_stats_mode_enabled', 'Real time stats'),
('rogue_detection', 'Rogue detection enabled'),
- ('ssh', 'SSH enabled'),
('sys_net_id', 'Sys net ID'),
('tcp_mss', 'TCP MSS'),
- ('telnet', 'Telnet enabled'),
('upgrade_failure_cause', 'Upgrade failure cause'),
('upgrade_from_version', 'Upgrade from version'),
('upgrade_to_version', 'Upgrade to version'),
@@ -63,12 +67,23 @@ _removecolumns = [
('venue_config_venue_group', 'Venue group'),
('venue_config_venue_name', 'Venue name'),
('venue_config_venue_type', 'Venue type'),
- ('wips', 'wireless IPS,'),
('wlc_primary_address', 'primary WLC'),
('wlc_secondary_address', 'secondary WLC'),
('wlc_tertiary_address', 'tertiary WLC'),
]
+_removecolumns_defaul_cisco_wlc_aps_lwap = [
+ 'adj_channel_rogue_enabled', 'amsdu', 'is_master', 'is_universal', 'submode',
+ 'universal_prime_status', 'max_client_limit_cause', 'ble_fw_download_status', 'antenna_band_mode',
+ 'module_inserted', 'floor_label', 'max_client_limit_set', 'enable_module',
+ 'pwr_injector_sw_mac_addr', 'pwr_injector_selection', 'pwr_injector_state', 'pwr_pre_std_state',
+ 'trunk_vlan', 'trunk_vlan_status', 'tcp_mss', 'monitor_mode_optimization', 'sys_net_id',
+ 'upgrade_failure_cause', 'upgrade_from_version', 'upgrade_to_version', 'venue_config_language',
+ 'venue_config_venue_group', 'venue_config_venue_name', 'port_number', 'venue_config_venue_type',
+ 'max_#_of_dot11_slots', 'max_#_of_ethernet_slots', 'failover_priority', 'wlc_primary_address',
+ 'wlc_secondary_address', 'wlc_tertiary_address'
+]
+
def _valuespec_inv_cisco_wlc_aps_lwap():
return Dictionary(
@@ -78,18 +93,8 @@ def _valuespec_inv_cisco_wlc_aps_lwap():
ListChoice(
title=_('list of columns to remove'),
help=_('information to remove from inventory'),
- choices=_removecolumns,
- default_value=[
- 'adj_channel_rogue_enabled', 'amsdu', 'is_master', 'is_universal', 'submode',
- 'universal_prime_status', 'max_client_limit_cause', 'ble_fw_download_status', 'antenna_band_mode',
- 'module_inserted', 'floor_label', 'max_client_limit_set', 'enable_module',
- 'pwr_injector_sw_mac_addr', 'pwr_injector_selection', 'pwr_injector_state', 'pwr_pre_std_state',
- 'trunk_vlan', 'trunk_vlan_status', 'tcp_mss', 'monitor_mode_optimization', 'sys_net_id',
- 'upgrade_failure_cause', 'upgrade_from_version', 'upgrade_to_version', 'venue_config_language',
- 'venue_config_venue_group', 'venue_config_venue_name', 'port_number', 'venue_config_venue_type',
- 'max_#_of_dot11_slots', 'max_#_of_ethernet_slots', 'failover_priority', 'wlc_primary_address',
- 'wlc_secondary_address', 'wlc_tertiary_address'
- ],
+ choices=_removecolumns_cisco_wlc_aps_lwap,
+ default_value=_removecolumns_defaul_cisco_wlc_aps_lwap,
)),
],
)
--
GitLab