From 9871d999e231ab0b17cdb2ad8d96cdeaa00e6cf2 Mon Sep 17 00:00:00 2001
From: "Th.L" <thl-cmk@outlook.com>
Date: Thu, 15 Jul 2021 11:24:19 +0200
Subject: [PATCH] update project
---
agent_based/inv_cisco_wlc_clients.py | 19 ++++++-----
inv_cisco_wlc_clients.mkp | Bin 5412 -> 5558 bytes
packages/inv_cisco_wlc_clients | 5 ++-
web/plugins/views/inv_cisco_wlc_clients.py | 35 +++++++++++----------
web/plugins/wato/inv_cisco_wlc_clients.py | 23 ++++++++++----
5 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/agent_based/inv_cisco_wlc_clients.py b/agent_based/inv_cisco_wlc_clients.py
index c208d2c..9151962 100644
--- a/agent_based/inv_cisco_wlc_clients.py
+++ b/agent_based/inv_cisco_wlc_clients.py
@@ -9,12 +9,13 @@
#
# writen by: Th.L thl-cmk[at]outlook[dot]com
#
-# 2016-08-22 : removed index column
-# 2017-04-09 : added wato enable/disable, remove columns
-# 2018-09-04 : changes for CMK 1.5.x (inv_tree --> inv_tree_list)
-# 2020-03-15 : added support for CMK1.6x
-# 2021-07-12 : rewritten for CMK 2.0
-#
+# 2016-08-22: removed index column
+# 2017-04-09: added wato enable/disable, remove columns
+# 2018-09-04: changes for CMK 1.5.x (inv_tree --> inv_tree_list)
+# 2020-03-15: added support for CMK1.6x
+# 2021-07-12: rewritten for CMK 2.0
+# 2021-07-15: added support for Catalyst 9800 Controllers
+
import re
import time
@@ -30,6 +31,7 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import (
SNMPTree,
TableRow,
contains,
+ any_of,
)
from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
StringTable,
@@ -358,7 +360,10 @@ register.snmp_section(
'45', # cldcUserAuthType
]
),
- 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_clients.mkp b/inv_cisco_wlc_clients.mkp
index bfdecb39e90cf9a12c7b9e01d0b8257a4c9b99c2..4a6431743b5c0f22f7bba15646768d318a3848aa 100644
GIT binary patch
literal 5558
zcmaKtWjGvw<ABvLUBk%@H{H$Dn3x`BI!<@YaXN<K)O1d_scF+rH-}-T+v$$`|G)p9
z-|yS|Jnz@{d0xgCT-@I06LSody$je3WbX-bHS=}?nSq?_tzEu)atrVY@biiC3-f^a
zcmyqYoE_cJj!gnQmqlhK5%&~gwk|BI%(DesX$pd!fQ8|r+_%4Y!M`S<htpFmRt+V}
zsk|QkfBbKj2k>78C#zT5=az~tuFSKX_F*i(pp1F-GUAL0a)vWYZ5QO7_Vhvk)z<!y
zM1@4&n)|xB@zHCVLRae~rF`UIyq)MNkag>+<eF)fM$aI!`|6XF0p}lAwnahihaKKS
zc`dO`Pur`-`o=(OQsD5abpnNcU_ITnlGF^b9n#jq@S6&>ctTSqJCV<Hx<$Dj=Lgr2
zd-}u6yZtBrvqF*|p1Zp(2xjanBXShLcdN88hH+T_6B#1LwwkRz7SfL&ngiuYdIf~k
z7g>?cuno2A!!yMIny}@~@=fG;Ee1_OhuSO)=MdBI&{-s-u`TMN?FaJu)_gf<Oj+@y
zp_a{#OEob{FyfP1@NfVf(3Fq20T<|FM6vH=t2DIQsy@Ty{^KYjgvvs}Q#Pc)MK<-q
zk+&3m#q3&c$CL4cR9F0CD}~qnR2NOT^C4o^F+#KO{4Mk%M^E|WBB!xfDK_p6xxwu}
z&L3CSHJ#>3AXk+-vuZwgd5iIc^<YW5*0&EVqjQ+UqBvxn9R&tFFouu*{%c6_$~wWT
zIb&M@>;n317y%&HXY4<L3M(AkdB2{O74U%J#I;w-jjXiC?R7w7NQAvI`!7dhP#kzY
z&yrnRDvv>SDArA>zUOwH$GU5j(ISf51=Vb0b!h+4CCp?LeK+`ibqqD>9%B*I8@<^T
z2Wtu2wpQ0C;B5-XS^vN#sELMwJ`bis@;1W_x~e(ZuwkhoZ2+UHvLx$OjM0xxQ?-`u
zM%qI$8QLK}{ZJ;|bTO>M&$`2NP&WAjQa$vUh>s#G5f!-e-!M3M3UU3IsL+%%pVKnt
zWL~j{Ez8N@9v`C^+Tq72s|}>V1IihW0*77T>?5QWrPhLOuD_MN#o0V_DMp>47q$DX
zVfd>)k)Ln05frYGuIStaeezX#uGiUFn((4NnezECgL8_#VSfT#dZy)?R3U+h3Vx!D
zIo3~~@p~zLBL5R6o|EWZ`g2H<W_B!Q$N)kg-Z{ox`7(@wf7enG{y>3te|aY5#BYO@
zw%Oq<g*`@FllMIXy83i{_WzN*+Kg9~s=8bt77YD2T6l$)ofg<AWf6$cMu&dOgZ@My
z6+2=*_6DaabYW(*J3M2GI;}3}wbkg7ax&$Bhbi(EMQDNG2EzA@aGVpT-|ISi(kj@q
zdWa3Uyd1=OZo?1`;kP14uWWcKtL$@+e~{oP$w|}qnU*(ASg3)4JhJ;gq$-eBE&MU%
zH5T}yxUEOZQ|U;}Vv3Bka7_fNetK8LC-!~Fk9d_jQRh@EG)5rSE<Q{vzNJm9ciesM
zg;Hy-pZ#8y@vw8ZNWM&N2ZR=f8S=C$FL$BsdizSu_7eNAs^A1|z#{(Ci>`KA!XP!|
zT@LZaS+G>s#YQBge(^UU(Rb(sX4}veJevxj{9}H!Qalm4tdyCi9ddQG<BvNrK*AEa
zB^q%Y?~du$=E(v^22h=dizV2TtC0iw&+t#fBxTNLD4YV#-D14o#Tq51=z<zg3pze#
z)HA89S9kFB(kQ$z&1DVTTi3A2z`Bf*7`f%aMj2P`<dzr$Z|wDK^j9>ktj+EJI)rey
ze^$>#*y~xDlBBkNjyXYaUpdGId~B7<*qN<Lh<Z@tdhvz!ra?_|&Hm%Ge$~s-aBM$r
zGI1iwByHlRtw5^$ZT2hqMS=Ya4Z$`%^3y+Z9C;ZjRN*1;!C*^Dg8C_2yy&v#Q2sJ6
z+CkOo-n^m@7}(vsy?S5X+4W8(n);gT5NDd3=WX9vC5Aw{qc9D74lMSqwH5S?xrg3~
z2G?YIVQj!hncLWe$~QJNg7n;O-f$^fhcxPk(#3R><GtK`v-CsGULoyu9v%!UFbQaV
z5V_Ait`Nl$)cXnpV>||omDJ(gtTqlc$yaqLvQOBqgL<e8<<2M%5tW}5|MQ{_|DasC
ze&}J*Fmgeb3WGkse=1<0<4HOb81vKuON~@Gy<IB4G583@?ge611y!Cxp0N0$+%19g
zd2}*SUGW{h=UHJ73oK^A?(7YJ3HaUReKUg*XJ{rE)pseMSao=6I*hsAGdi|iZ>&iZ
zIQ-EBze;3cCdM}Tm7e4ab~114CgkYmoq21Le9QHM6W5${!b0f2x#fFcz;pBKMT%!R
zna()(!SG)FD#<Sx*{PZaWoD`*oVWt;!&CpCJD(QqQz>4yeA2A-70wm=b!hMJ^S2Rh
zm|L<eApgxtgqu8FMz=wy!%ppO;i`8tYK9<b?62R=Q<spuf<=)P|2!cv^=-L}xx!(<
zMDSJnSdSO>i+rO~1w>M^NGhzs*TmvUaalVa7k>QCIJZY^sx8OdFMR97^_O;(^|Qj&
zjRp1&-{c1@71yX-rO(v+em6OAp%zw)#96yH9Fz@Rs;d?x0MOvY5Fi%Q`p-scV{SuZ
zv882Mb==!1p;jEp{pw5pJT5NbTtf6k9Ah0aS=SW0&LUgB)PtScH?lGh+JHIaXM!D{
z^}F9;O#@|}_JD(2__ih~H9Ce(Yyo8Uo@;GE^gb`Guhx3etQmSkTb(t3=>|?QIQ3n<
zT*K_j^>zBCn&IvCGNUH{&{Pjldl(|9-fa>pWh`Rm`%DLx1V9IRgpse(jij>cHWJv+
z^JXN{w&$A-bCafpFv1D%QU9L2gB0$IWOQe<75`F}$YP{w;&5piOK?D6JC&4(F%=K~
zCFfCA05uYCohG#4G#r$+LMg2&v!3$In`x=d4<9k&me=Z03ui1RNnJmT?jZ?QJ?7$c
zrW!W-PC6~$=*yXkI2&3)c04VtLbL?oixz*z_B(`wh1Oy-saj0O=AL4wBDzCbcx!yp
zmUtc$psiT7A9}N88-!f+PzSI$Tu~P0Pz|iH4+PwxS~{|#5Kx)}Y3m;Jdz~gA@n@w(
zhb}i6j~lWV@%!VC%C+xv_^Ws{=*CNUgEfU%;K-IFhD3qwphJn@0Dh*xj2<7J=t)5B
zIJ;BDv|gD@vKKwgd-m|C-8SF_Ha}nDTk*1-Xhn9ZGiIJd-`PlQC>pex_=OfhZd&j{
zMhJg-kD;L+5fu+n87EpAnTH47apbYw`sy0@$l)*9>Eg<#=*pJzMf*+?-HJO?2YTu+
z=v~?JEiDeLl$?{(wy<a^t(s=tlxBkNoGtk<gip_i=19wwSIC6b{0*0!8=4=xOA}-=
z1(+2-ZK{_`yom}KHf+uy2GxEwgZ>_sX3X>?{cvE`SV*mtI{Yhl%VR0+-XeTUJ<<bq
zX)zG{o5;9gzh{~2L?U@^mxS{dtJj+Lq~zz$&SR~n%+fEv+xD4GbyLa6JLCbL1r0Mc
zmN?SU5Oc2N2aSzr4!xK|qGF1^o{t<iCI?PmXiNi`TQPZsB&&o>zxGsOM^owQND!Wk
zBuAl}u6j>Ph*}sgJ+|pohFg<!Q+m^X<gkfP(L+k6rh@A^c*rG^YmV7DO%PyOpk2`R
zRQDlIL%smqUqH9n#Mg+Ms>&(L%s@WEq%8q#ULM-UKcCj5M19!JGbYSx&uvRMAMV_z
zy<T;d(Bvr}BZnz|BsAtwYRhf=YA(F|)C7J`e%I%s_*qOcJB!BGw&P%Vz2SJ5JbSse
z4{3vRM@p388|C&cmCK>Q;>^Hwr5vRPsdeQ@iCFqN;x*_NJtO}{Ns`8;I@YcYi%0mL
zeU5Hj*--|A;+lkctI6%qINmPH2{k!n*13tDmhz2=u*#SSuoz$88q^2jcnK}^kU83;
z)XTz~&{nm4*O;u~0Kb0we$<dgzdm&?rB1-D-(;Ywk|HI&lkeYoZe4|IBz-ffM?>FI
zIXg5zlkW)d&J%|Kvx)&TQ1Xb~;$;X)-M0fsW9k=-_|b-HAo<&+=k`0yeKj{2V(Y^L
z#7-_kM~qllq(B}beW-0VdKmw;Y7cZ!S1X~$Zn(m_L?82%D2*ZvyL>tj^#Zdpn07kE
zI-i=(tG5>tU$j|tMXe&nRtN*j!($2ZDLi!WB;9g|BLt7#T_*ZflD?uXMfZN))|Xt~
zDdY1R^T{a7|0niX9xAL!Ui?o$c8o?dms5|AL7q@f=0S*ii1>2dITdKo;Dgt6&Dp4M
zvZn7ajVZlvDCNqxw?DLTO@b<viLYV1)oO*yjX05M@hH<5d+%#?Rp(P9lj2pyARTJE
zmP6;)1%g2>&)Pw7aws{^NP3EdKa11Q89v_5t(G5OAtj--hWnzovF*W8Uy%1Ys%9PW
z?{I-@+{-xKeG4cqEiUuy{_v!!WNW+Z8rb2sdc1kV>Z-}xB$MqgnsukW#@HZ%C?MlR
zs!(r5re!AIhgz6yh3zr|NC`=QiUjYf6-d}Qga%?Hxx;Qir3anLSm)}O<6g82e<)Yl
zY>-)tg6rFRwP7@1T|X{H^X)138VcjKUlR+$dsgoGF0ic=EX6F13B$V<LhEc_X}o@`
z#i;?A3ceW`1Y-`(Uc{%kFH>bNmb8Za2*^ynm29j;C`uP|mzD5LIZEKvl(XC2bYn4I
ze3>5Djei~N3H-|(G%9-P+P!2S*(s8bD6H{H-q`emy>=~&c7?~?*^HyLk3ZK*eTf-)
zn^Zzpumes1y~iQ3u}qA)G&Qe8T6CWb00qoU!4r3%*ud(?<BLHZ3Vty(G>=vhHsZhX
zTQ4q>M6pZq>pe+fZKp08(CAXa;&r;m^^KKa;W;mi<#zb9CaYs!HT_SG<%o^e%XUIH
zc~_-OLFYW$3Q3Vr2f8K%?6>%E3C_4&7{i4-`I0VK{76P-rihSNa-dqrwuDjZvKBn@
z^~5AJfj+X$d8*Ldt15g~3_Oz^Lk)E__?oG6w6_PEDeK5D73G4%g-+U|<J|fS_k<}>
zFWrXHP{EXZO2l_bsaL(cKl|wBVo+FVez%brhZoIp2ayI3@}F&=6S{h+Qrj*phzD|6
zV>bSc+R>)Hk&ZQhC^Xg#{6s%Kcs0MxF}atho?w7|t;TTVx8sDsz!*L6Lv*I+RY6ac
zg6}qC0oO-He5qUp^;W|_fU5ruW`1TN_pcbi$ikxCpD3|^S;*xJ#;zA$lBL&``(4|Q
zN((tht)EcHe?1hJLA5e<yE1{~zIPp)jEA5TmyueDt2jc2CuPZP?P5Mn=96`i{=xJi
ztzD9~8cPGWXWWZ>e$FVOGDZl%FCjYzpI^ziX2G;ZrzAvwDn!hwzZ~(`?KFk3G|;S%
zG%PSe38_yUtG7Eli4$-oc5m^N?vIL-W-*XGQ^kXkZ#~Awl9ro|4mv)=#Ej=_M*Cu~
zVQec63t3mY*OmI;l@tP&0u<)F&6J7)>zoy~jJ$=Jw`tJ>lC#C|@Js&eEx$7ub4}{l
z3j$oVsUEw=`I~Hu>e;Yzxr;Gv02<>uI3R$dEl>lk+tw%1yR$i4&q`t2>l^4$wyog2
zVsOvR9@Jk<;$OBXtva@*f79(<_7=5JdQ_yV=$@BU!nkw;T`2LU%+G28W`d?i3q7#x
z@Ws++ol$cRv*JZrLI2Rqw)OJtWzWTG#`j`@{hougUsv9}?l*rXXN&soU%y09ZFVFK
z>3Y!UsQ*nmdqpM(>vH^@QS+RM*)s8#3v~y!nHCAv+{)^vCE7S}HV->t9}2a7msRW@
z7}L`dh-2HgWXw2e>1N})o-ht=c@}99&*x7vM@CdQ(w$q<sO4(%Jg2=5C6M-~qLjRI
z!_+CI!vy`67}_}EzgWti7i}P%Km_^YJCZ%dTT2I-i^hfX-CpQypN748=ZAUB!74A5
zJbErde{@bj?b*iIg_yczFXjGynrtv>Q<*ytI!$p^SSLNA{oM?K#xEfYnL|lr6A*9G
z;F~<TWey<seH^R|{Q4o51XYo<tgU>elJNjPwZIlJ*4;JnXl4=7Q^iBiD4ORz2b4Ek
zw-}xk{YC7DUySopHXR2myYUQ9{n(z1d#$wYt|pgfE34zF1lzcgu&)Dj8?OCL((fzy
zOAKI&eXZ`4+Ma!(!H8Y6a-}bT$23=s$>P3Nz~;f%N|A{K6(1xvzNXi?9%!j2d))br
zBt_-Gecfg3_2N8$k^8}^slJk7C+!Wx(lnVrU=JOOK=LczZ)m1=iehwt$}w>qO8Wk)
zjw;CN(Yr$iTzP^zMlum;wS#C;PeIhEfS0IT`W|b>sp*0~MA+^VDMCZNe6m{aEpq2^
z;O~*#0}Ri@2%<gwTB1_)jUNQwN9Gfc$QSQafB&<-rliVQOR!+<ZrJ8eAF-6~Ai)`L
ztz9Hc$QF+Qx8J9OB|wk>52l4J2P^`%y<`J68K95n0eh{6>MLr2lu;=aiONwX<d#@I
z%-w7;)QR%J(JlE{LYSeq0$#6(sw!M!E-VHNlQj#B`n-eTVcuk`WGR?cWJ#40Anf#7
zNrB(}n@(Y=%=k)0)-oJZ$9@z?i+=-D998Zvx-)ZhOd_hUG1xu_W|S`=3`;+0C$;X+
zp1DtN3=U%`KH{H^r>9{Z5{X)>QyI&Bex&d=v=U|F6#EBP(otX+{uqim{2j_x<~#bv
z{ot(v+WZu5_n6yvx{vsGS!&EStfcouG3qO@UmpiQzR2{G45<KF2TyN+F!DGTaq(55
z2d^<J)+so}_QO@b9H-!Gy>i9+MgyW)itd9peD?go`JHUc;<Z$;PS4zThQ18#cOgO>
zDQM0xwimijUx@g@mamG4e)B;ojY(fibp%J0l71>n@aThSjl5Myv*JSEUZRvC;T!Lx
z;)L$Z<7YFlFeavU`@|;8u#rje@S?*ev2Y#l?DM>VU29t0NXJfAzU*>a9Jpg(fHbb)
zRwT7{btl+w<uT<tRgpcE$EDBs&Vk>X;M6gYl#Pqkl!BD+;}w6vyiz`{C)>NbM9|$n
z`H^wJ^>=w1v&a)O79SExxA5o>Ubnz4;O$Q>6P_+U<)+*B{TgS#j9S8N;Sj4s_4h7+
zxVj5fz#i_3QPB?Yn7EX}Xjy;w$h+MtcVzxVIk*yg{G?C6e$W+A&r1{o!s<EMG@i#M
z(E(KWRFWA_=`9!nZmZ<()^*|xRJ9?&c(gu|Y5Le!Vor~`6B9jxe{_{{F=sCw9mVTh
zBj|s5ave?@bZ-a@vO^Y$&4W2<%81>{C;c*{z%2xygo}xOW||ZPf#aS3*G&G$XZ};o
Rh?bzxR9doZ(T32_{tvkg_*(z~
literal 5412
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
diff --git a/packages/inv_cisco_wlc_clients b/packages/inv_cisco_wlc_clients
index 654f42d..a8519f0 100644
--- a/packages/inv_cisco_wlc_clients
+++ b/packages/inv_cisco_wlc_clients
@@ -4,7 +4,6 @@
'Via WATO you can:\n'
' - can add/remove some fields\n'
'\n'
- 'Tested with Cisco WLC 5520/5505/2504.\n'
'\n'
'2020-03.15: added support for CMK1.6x\n'
'2021-07-12: rewritten for CMK 2.0\n',
@@ -15,7 +14,7 @@
'name': 'inv_cisco_wlc_clients',
'num_files': 3,
'title': 'inventory of cisco WLC clients',
- 'version': '20210712.v0.3',
+ 'version': '20210715.v0.3a',
'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_clients.py b/web/plugins/views/inv_cisco_wlc_clients.py
index 5123d51..9386e64 100644
--- a/web/plugins/views/inv_cisco_wlc_clients.py
+++ b/web/plugins/views/inv_cisco_wlc_clients.py
@@ -1,36 +1,41 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-import cmk.gui.utils
from cmk.gui.plugins.views import (
inventory_displayhints, )
from cmk.gui.i18n import _
from cmk.gui.plugins.views.inventory import declare_invtable_view
inventory_displayhints.update({
- '.networking.wlan.controller.clients:': {'title': _('WLC clients'),
- 'keyorder': [
- 'index', 'username', 'uptime', 'ipaddress', 'apmacaddress', 'ssid',
- 'channel', 'accessvlan', 'devicetype', 'protocol', 'status',
- ],
- 'view': 'invwlcclients_of_host'},
+ '.networking.wlan.controller.clients:': {
+ 'title': _('WLC clients'),
+ 'keyorder': [
+ 'index', 'username', 'uptime', 'ipaddress', 'apmacaddress', 'ssid',
+ 'channel', 'accessvlan', 'devicetype', 'protocol', 'status',
+ ],
+ 'view': 'invwlcclients_of_host'},
'.networking.wlan.controller.clients:*.index': {'title': _('Index'), },
- '.networking.wlan.controller.clients:*.macaddress': {'title': _('MAC Addresse'), },
+ '.networking.wlan.controller.clients:*.username': {'title': _('Username'), },
+ '.networking.wlan.controller.clients:*.uptime': {'title': _('Uptime'), },
+ '.networking.wlan.controller.clients:*.ipaddress': {'title': _('IP address'), },
+ '.networking.wlan.controller.clients:*.apmacaddress': {'title': _('AP MAC address'), },
+ '.networking.wlan.controller.clients:*.ssid': {'title': _('SSID'), },
+ '.networking.wlan.controller.clients:*.channel': {'title': _('Channel'), },
+ '.networking.wlan.controller.clients:*.accessvlan': {'title': _('Access VLAN'), },
+ '.networking.wlan.controller.clients:*.devicetype': {'title': _('Device type'), },
+ '.networking.wlan.controller.clients:*.protocol': {'title': _('Protocol'), },
'.networking.wlan.controller.clients:*.status': {'title': _('Status'), },
+
+ '.networking.wlan.controller.clients:*.macaddress': {'title': _('MAC Addresse'), },
'.networking.wlan.controller.clients:*.wlanprofilename': {'title': _('WLAN profile name'), },
'.networking.wlan.controller.clients:*.wgbstatus': {'title': _('WGB status'), },
'.networking.wlan.controller.clients:*.wgbmacaddress': {'title': _('WGB MAC address'), },
- '.networking.wlan.controller.clients:*.protocol': {'title': _('Protocol'), },
'.networking.wlan.controller.clients:*.associationmode': {'title': _('Association mode'), },
- '.networking.wlan.controller.clients:*.apmacaddress': {'title': _('AP MAC address'), },
'.networking.wlan.controller.clients:*.iftype': {'title': _('Interface type'), },
- '.networking.wlan.controller.clients:*.ipaddress': {'title': _('IP address'), },
'.networking.wlan.controller.clients:*.nacstate': {'title': _('NAC state'), },
'.networking.wlan.controller.clients:*.quarantinevlan': {'title': _('Quarantine VLAN'), },
- '.networking.wlan.controller.clients:*.accessvlan': {'title': _('Access VLAN'), },
'.networking.wlan.controller.clients:*.logintime': {'title': _('Login time'), },
- '.networking.wlan.controller.clients:*.uptime': {'title': _('Uptime'), },
'.networking.wlan.controller.clients:*.powersavemode': {'title': _('Power save mode'), },
'.networking.wlan.controller.clients:*.currenttxrateset': {'title': _('Current TX rate (MBit/s)'), },
'.networking.wlan.controller.clients:*.datarateset': {'title': _('Data rate set'), },
@@ -42,15 +47,12 @@ inventory_displayhints.update({
'.networking.wlan.controller.clients:*.redirecturl': {'title': _('Redirect URL'), },
'.networking.wlan.controller.clients:*.aaaoverrideaclname': {'title': _('AAA overide ACL name'), },
'.networking.wlan.controller.clients:*.aaaoverrideaclapplied': {'title': _('AAA overide ACL applied'), },
- '.networking.wlan.controller.clients:*.username': {'title': _('Username'), },
- '.networking.wlan.controller.clients:*.ssid': {'title': _('SSID'), },
'.networking.wlan.controller.clients:*.securitytagid': {'title': _('Security tag ID'), },
'.networking.wlan.controller.clients:*.typekts': {'title': _('NEC KTS SIP client'), },
'.networking.wlan.controller.clients:*.ipv6aclname': {'title': _('IPv6 ACL name'), },
'.networking.wlan.controller.clients:*.ipv6aclapplied': {'title': _('IPv6 ACL applied'), },
'.networking.wlan.controller.clients:*.dataswitching': {'title': _('Data switching'), },
'.networking.wlan.controller.clients:*.authentication': {'title': _('Authentication'), },
- '.networking.wlan.controller.clients:*.channel': {'title': _('Channel'), },
'.networking.wlan.controller.clients:*.authmode': {'title': _('Auth mode'), },
'.networking.wlan.controller.clients:*.reasoncode': {'title': _('Reason code'), },
'.networking.wlan.controller.clients:*.sessionid': {'title': _('Session ID'), },
@@ -59,7 +61,6 @@ inventory_displayhints.update({
'.networking.wlan.controller.clients:*.mdnsadvcount': {'title': _('mDNS adv count'), },
'.networking.wlan.controller.clients:*.policyname': {'title': _('Policy name'), },
'.networking.wlan.controller.clients:*.aaarole': {'title': _('AAA role'), },
- '.networking.wlan.controller.clients:*.devicetype': {'title': _('Device type'), },
'.networking.wlan.controller.clients:*.userauthtype': {'title': _('User auth type'), },
})
diff --git a/web/plugins/wato/inv_cisco_wlc_clients.py b/web/plugins/wato/inv_cisco_wlc_clients.py
index 7d25b08..40a49f1 100644
--- a/web/plugins/wato/inv_cisco_wlc_clients.py
+++ b/web/plugins/wato/inv_cisco_wlc_clients.py
@@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-
#
#
+
from cmk.gui.i18n import _
from cmk.gui.plugins.wato import (
HostRulespec,
@@ -16,12 +17,23 @@ from cmk.gui.plugins.wato.inventory import (
RulespecGroupInventory,
)
-_removecolumns = [
+_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'),
- ('accessvlan', 'Access VLAN'),
('aclapplied', 'ACL applied'),
('aclname', 'ACL name'),
('aproammacaddress', 'AP roam MAC address'),
@@ -67,9 +79,8 @@ def _valuespec_inv_cisco_wlc_clients():
ListChoice(
title=_('list of columns to remove'),
help=_('information to remove from inventory'),
- choices=_removecolumns,
- default_value=[
- ],
+ choices=_removecolumns_cisco_wlc_clients,
+ default_value=[],
)),
],
)
@@ -79,6 +90,6 @@ rulespec_registry.register(
HostRulespec(
group=RulespecGroupInventory,
match_type='dict',
- name='inv_cisco_wlc_clients',
+ name='inv_parameters:inv_cisco_wlc_clients',
valuespec=_valuespec_inv_cisco_wlc_clients,
))
--
GitLab