diff --git a/README.md b/README.md index bf97dc81afdd457b7640a673ba7d6d9ca6c432f7..ed748e55706ee840b689bfdd2f7084c47ea6d960 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[PACKAGE]: ../../raw/master/mkp/inv_cisco_wlc_clients-0.5.1-20240308.mkp "inv_cisco_wlc_clients-0.5.1-20240308.mkp" # Cisco WLC client inventory plugin Adds the WLC wireless clients information to the inventory diff --git a/gui/wato/inv_cisco_wlc_clients.py b/gui/wato/inv_cisco_wlc_clients.py deleted file mode 100644 index 79933969e27698009d1c614d26258a8a91e2be12..0000000000000000000000000000000000000000 --- a/gui/wato/inv_cisco_wlc_clients.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# - -from cmk.gui.i18n import _ -from cmk.gui.plugins.wato.utils import ( - HostRulespec, - rulespec_registry, -) -from cmk.gui.valuespec import ( - Dictionary, - ListChoice, -) - -from cmk.gui.plugins.wato.inventory import ( - RulespecGroupInventory, -) - -_removecolumns_cisco_wlc_clients = [ - # 'index': {'title', 'Index'), - # 'username': {'title', 'Username'), - # 'uptime': {'title', 'Uptime'), - # 'ipaddress': {'title', 'IP address'), - # 'apmacaddress': {'title', 'AP MAC address'), - # 'ssid': {'title', 'SSID'), - # 'channel': {'title', 'Channel'), - # 'accessvlan': {'title', 'Access VLAN'), - # 'devicetype': {'title', 'Device type'), - # 'protocol': {'title', 'Protocol'), - # 'status': {'title', 'Status'), - - ('ieee80211ucapable', '802.11u capable'), - ('aaaoverrideaclapplied', 'AAA overide ACL applied'), - ('aaaoverrideaclname', 'AAA overide ACL name'), - ('aaarole', 'AAA role'), - ('aclapplied', 'ACL applied'), - ('aclname', 'ACL name'), - ('aproammacaddress', 'AP roam MAC address'), - ('associationmode', 'Association mode'), - ('authentication', 'Authentication'), - ('authmode', 'Auth mode'), - ('currenttxrateset', 'Current TX rate (MBit/s)'), - ('datarateset', 'Data rate set'), - ('dataswitching', 'Data switching'), - ('hreapapauth', 'HREAP AP auth'), - ('iftype', 'Interface type'), - ('ipv6aclapplied', 'IPv6 ACL applied'), - ('ipv6aclname', 'IPv6 ACL name'), - ('logintime', 'Login time'), - ('macaddress', 'MAC Addresse'), - ('mdnsadvcount', 'mDNS adv count'), - ('mdnsprofile', 'mDNS profile'), - ('nacstate', 'NAC state'), - ('policyname', 'Policy name'), - ('posturestate', 'Posture state'), - ('powersavemode', 'Power save mode'), - ('quarantinevlan', 'Quarantine VLAN'), - ('reasoncode', 'Reason code'), - ('redirecturl', 'Redirect URL'), - ('securitytagid', 'Security tag ID'), - ('sessionid', 'Session ID'), - ('typekts', 'NEC KTS SIP client'), - ('userauthtype', 'User auth type'), - ('wgbmacaddress', 'WGB MAC address'), - ('wgbstatus', 'WGB status'), - ('wlanprofilename', 'WLAN profile name'), -] - - -def _valuespec_inv_cisco_wlc_clients(): - return Dictionary( - title=_('Cisco WLC Clients'), - help=_('This inventory plugin collects all the client information from a Cisco Wireless LAN Controller. ' - 'To use this plugin you must also enable "Status data inventory" in a "Do hardware/software inventory" ' - 'rule.'), - elements=[ - ('removecolumns', - ListChoice( - title=_('list of columns to remove'), - help=_('information to remove from inventory'), - choices=_removecolumns_cisco_wlc_clients, - default_value=[], - )), - ], - ) - - -rulespec_registry.register( - HostRulespec( - group=RulespecGroupInventory, - match_type='dict', - name='inv_parameters:inv_cisco_wlc_clients', - valuespec=_valuespec_inv_cisco_wlc_clients, - )) diff --git a/inv_cisco_wlc_clients.mkp b/inv_cisco_wlc_clients.mkp deleted file mode 100644 index a0a60af2eafe3486d6bbc36b52caa1c448a78579..0000000000000000000000000000000000000000 Binary files a/inv_cisco_wlc_clients.mkp and /dev/null differ diff --git a/inv_cisco_wlc_clients-0.5.0-20230616.mkp b/mkp/inv_cisco_wlc_clients-0.5.0-20230616.mkp similarity index 100% rename from inv_cisco_wlc_clients-0.5.0-20230616.mkp rename to mkp/inv_cisco_wlc_clients-0.5.0-20230616.mkp diff --git a/mkp/inv_cisco_wlc_clients-0.5.1-20240308.mkp b/mkp/inv_cisco_wlc_clients-0.5.1-20240308.mkp new file mode 100644 index 0000000000000000000000000000000000000000..65bffb207d2f79186d003f57750d470fdaec9898 Binary files /dev/null and b/mkp/inv_cisco_wlc_clients-0.5.1-20240308.mkp differ diff --git a/agent_based/inv_cisco_wlc_clients.py b/source/agent_based/inv_cisco_wlc_clients.py similarity index 100% rename from agent_based/inv_cisco_wlc_clients.py rename to source/agent_based/inv_cisco_wlc_clients.py diff --git a/gui/wato/check_parameters/inv_cisco_wlc_clients.py b/source/gui/wato/check_parameters/inv_cisco_wlc_clients.py similarity index 100% rename from gui/wato/check_parameters/inv_cisco_wlc_clients.py rename to source/gui/wato/check_parameters/inv_cisco_wlc_clients.py diff --git a/packages/inv_cisco_wlc_clients b/source/packages/inv_cisco_wlc_clients similarity index 75% rename from packages/inv_cisco_wlc_clients rename to source/packages/inv_cisco_wlc_clients index 829517753a476fe9d1478b7519f4c8d23baffc05..4e408b598c4c960abab58dea8b38bc78f29a80eb 100644 --- a/packages/inv_cisco_wlc_clients +++ b/source/packages/inv_cisco_wlc_clients @@ -9,11 +9,11 @@ '2021-07-12: rewritten for CMK 2.0\n', 'download_url': 'http://thl-cmk.hopto.org', 'files': {'agent_based': ['inv_cisco_wlc_clients.py'], - 'gui': ['views/inv_cisco_wlc_clients.py', - 'wato/check_parameters/inv_cisco_wlc_clients.py']}, + 'gui': ['wato/check_parameters/inv_cisco_wlc_clients.py'], + 'web': ['plugins/views/inv_cisco_wlc_clients.py']}, 'name': 'inv_cisco_wlc_clients', 'title': 'inventory of cisco WLC clients', - 'version': '0.5.0-20230616', + 'version': '0.5.1-20240308', 'version.min_required': '2.2.0b1', - 'version.packaged': '2.2.0p2', + 'version.packaged': '2.2.0p17', 'version.usable_until': None} diff --git a/gui/views/inv_cisco_wlc_clients.py b/source/web/plugins/views/inv_cisco_wlc_clients.py similarity index 98% rename from gui/views/inv_cisco_wlc_clients.py rename to source/web/plugins/views/inv_cisco_wlc_clients.py index b3610e4dfe302ffd83f5f81394310c86c8227497..bdf0da15196148ed947ebebf9869bd64ba392149 100644 --- a/gui/views/inv_cisco_wlc_clients.py +++ b/source/web/plugins/views/inv_cisco_wlc_clients.py @@ -9,6 +9,7 @@ # 2023-06-14: removed declare_invtable_view from view definition on cmk 2.2 (see werk 15493) # changed inventory_displayhints import (see werk 15493) +# 2024-03-08: moved view back to ~/local/share/check_mk/web/plugins/views from cmk.gui.i18n import _ from cmk.gui.views.inventory.registry import inventory_displayhints