From cbba8db695c6a114ce840d0de6b72d1612c0223c Mon Sep 17 00:00:00 2001
From: "Th.L" <thl-cmk@outlook.com>
Date: Thu, 15 Jul 2021 11:24:42 +0200
Subject: [PATCH] update project

---
 agent_based/inv_cisco_wlc_ap_cdp_cache.py     |   8 +++++++-
 inv_cisco_wlc_ap_cdp_cache.mkp                | Bin 3327 -> 3388 bytes
 packages/inv_cisco_wlc_ap_cdp_cache           |   2 +-
 .../wato/inv_cisco_wlc_ap_cdp_cache.py        |   4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/agent_based/inv_cisco_wlc_ap_cdp_cache.py b/agent_based/inv_cisco_wlc_ap_cdp_cache.py
index 83d348e..c0f1c98 100644
--- a/agent_based/inv_cisco_wlc_ap_cdp_cache.py
+++ b/agent_based/inv_cisco_wlc_ap_cdp_cache.py
@@ -14,12 +14,15 @@
 # 2018-09-04: changes for CMK 1.5.x (inv_tree --> inv_tree_list)
 # 2020-03-15: added support for CMK1.6x
 # 2021-07-10: rewritten vor 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,
@@ -168,7 +171,10 @@ register.snmp_section(
             '16',  # clcCdpApCacheInterfaceSpeed
         ]
     ),
-    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_ap_cdp_cache.mkp b/inv_cisco_wlc_ap_cdp_cache.mkp
index 767ec8c5b1c516627285302bfa18e2f80d50ab5e..608988f58c9dd5bf9a891165a741afc13023241b 100644
GIT binary patch
delta 3333
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
P^U;3+ng47V0C)fZH5_hZ

delta 3260
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

diff --git a/packages/inv_cisco_wlc_ap_cdp_cache b/packages/inv_cisco_wlc_ap_cdp_cache
index 829889e..fc44e6b 100644
--- a/packages/inv_cisco_wlc_ap_cdp_cache
+++ b/packages/inv_cisco_wlc_ap_cdp_cache
@@ -18,5 +18,5 @@
  'title': 'inventory for Cisco WLC AP CDP cache (CISCO-LWAPP-CDP-MIB)',
  'version': '20210710.v0.3',
  '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/wato/inv_cisco_wlc_ap_cdp_cache.py b/web/plugins/wato/inv_cisco_wlc_ap_cdp_cache.py
index 78fce03..8d797bf 100644
--- a/web/plugins/wato/inv_cisco_wlc_ap_cdp_cache.py
+++ b/web/plugins/wato/inv_cisco_wlc_ap_cdp_cache.py
@@ -19,7 +19,7 @@ from cmk.gui.plugins.wato.inventory import (
     RulespecGroupInventory,
 )
 
-_removecolumns = [
+_removecolumns_cisco_wlc_ap_cdp_cache = [
     ('duplex', 'Duplex'),
     ('speed', 'Speed'),
 ]
@@ -46,7 +46,7 @@ def _valuespec_inv_cisco_wlc_ap_cdp_cache():
              ListChoice(
                  title=_('List of columns to remove'),
                  help=_('information to remove from inventory'),
-                 choices=_removecolumns,
+                 choices=_removecolumns_cisco_wlc_ap_cdp_cache,
                  default_value=[],
              )),
             ('use_short_if_name',
-- 
GitLab