From 38a8f17a22b9f77779c99c4c2551ec896b819558 Mon Sep 17 00:00:00 2001
From: Thl CMK <thl-cmk@outlook.com>
Date: Mon, 8 Jun 2020 21:28:10 +0200
Subject: [PATCH] update project
---
checkpoint_powersupply.mkp | Bin 1391 -> 1434 bytes
checks/checkpoint_powersupply | 20 ++++++++++----------
packages/checkpoint_powersupply | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/checkpoint_powersupply.mkp b/checkpoint_powersupply.mkp
index 818ab584954a5081def75765b67c86d369d4c975..b2633f067d99ebb4deb896c616024b283e1161c2 100644
GIT binary patch
delta 1406
zcmV-^1%dkS3YrTDABzYGNs-=Okq9q;ZExE)5P<Vpzv8N*P`ufSB)=rnkPllLWWm}l
zXp&)oV;G7|$691kl_;l1kpI3TCB^TFSF|Y#++!e;$h+h5<&I<`J`_9O7zgRJTKb7B
zKb`%ix8pWDo&C1!v|V?{ak0$Z0cYn0$TJzF0AHn(^PT%axVM5_jznttkXsjjBm12V
zyK)pa!trf4kUf#hScu#1K*(Mw#x<*MfHh!Qm_~_=1lMZs1&^di;b_FdTR0ODmk=aL
z90fdNkcc~$LY8B}6mYO*o?Y=P-T<^AqcDge8tQTeTu3nU#I#j47m%=YI0$4=e%=LA
zT=BvMamQm34ElK*qYu_d$|UoD_x4KH?U6{Nutj>KrH4_>G8DVFLgk`*?G~?za<;Es
zEIhP&4@!dvW2WqG5Yi&~xL+A|Re_9T%=CcF55$`8YxM~lD+bW=9QOc&z_lli?bz;o
zwLOk_KV_ftC}jgB>)M`uaDA{KlLX;ya8uQ{Y$s_RSP$FHe}wUG|C<Sa{ypR0bC%-Y
zb($TD{}+jWQ?FqYgTpL>17Ex5`gLz&aDcgPX`+%@E=?0fRQRZ(4Q5cH$T~{q`J|)d
zb#N*1XJSjq&L;<@vN1VmSF12KRT$5DR|Qqkvm&U>S-mP=id)_EEHx^LubLUJFg0F1
zog2-E|2zN1oZA=!-z)xqy_R}kihsA=rucse)<@_!n}2t|wO>5jZZ%Y`PBs6nPTO-m
zod34h_Fj1Y$I~p5Y_r^R^*<=DU+v{tx_2G%y=00hnH#U6@lyjB55*wjH+Y<p!^Xj{
zkW3p9A22Q(VmQp0^r58$jo0c2@1l_LjQMc#;Sx?5XDMc{v-~=Lj>4)ACY~1kO=o@|
zHYa=(y8QSK0DRb(x>4q>N{lF@(s0AsZ!}$Pzsk8qLIpA0BKvAZ&+(jw(`h&dK7^xy
zWAcZLkCR3g1{{Vt4^>*%q8H+=@F8VmF=6oc`9HR8>+&oZCo$7ncR_rMyV{+Ag_g3K
z7Cidn_~_5GzfM1YTr}RF{_gu)<XlUf;wXQ%UE6^}!208p<BzyAZKLBY>UdA<oa^x^
z8#=%Ec>3YQhs$IuC2vJZ_X>?Q?T)RsOFRs8JlquVbKm|2pT%#bQ_rca>C@9H-nt$=
zr?S$YvP0#3szWk<smWZJODyYla|=)Gc<8@OtX>`P(|i1X>}fN`FbHu$PWu=&5<@E6
zbob~F*f7XrnOQyb=H4(K48y=OY=44*r%bF@+*J<Nd;>!UhPd?Ss!&(EUsNiROvUl%
zI=+-4ayYN>D2Hc{Qq+#JL39(z-P+8GVj8h{Ftc}GxvQPr=&EF6Y&%GUaaM<K>o^=9
zf@*Kk?czj#bqLNvscK8I&k`#vYoR6<{01{rlCP<o*D7Mehc}r8Zyudo6dyj8+p%(e
zw+63JHBYQXA1gm~Cp}}KE@d)LdC`sf%!8lj9L0$!CPCG1zUt~#rc4$R{VK;<v&Q@<
zXR}^t&(`OX1^?NlTUsbrem`at7H9oQkVe5Z-lk!H;~jh!ETxHzr4!s~`t$#tD4np*
z=1<yh9#w8qfg=yAs8*BZ8^3M@Gkag{2eY2~5C`MyK>#8e_^^wAcdf^K<5fw_s@dwG
zA+x(kj^+dw5|ZmR@%mo_ks7caU(gy}Sv>qiSrn^5zz4>cw6*9sHd)8ms8y?aq4{ir
z+o#BFIbK)PfYs*5QY}zxW%M_-Q)X;zs|)btMs>_(I^CjUI(aKw%e(0|y56ep`D)Ow
zr-#FU33G=a2!bF8f*=TjAP9mW2!bF8f*=TjAP9mW2!bF8f*=TjAP9mW2!bF8f*|Jj
M55mk@_yAA<0904C<p2Nx
delta 1363
zcmV-Z1+4m-3-1aDABzYG?J(3`kq9q;|4-vK6u|kpe}ymT6uPw`Nn6Tg;)feU4DIfA
z0&Y5~R8>fw)+4pE#GzD(|9#JPO1}f!?s~fEeJYW}e%~DXJv%TSi=D5G3mi0?`U)&x
z-FCy@@fxjzmfLU}t=5j~L7TTj+?_2@<TA_%`67dyAKZ7sy&V>EC^9=Bg?%}Hbly2+
zPY#oMG`i`8vMUOi2yxTt3)zjtsA|_L#O~8P%2+Cy;9Bjy;7p2)91m%9Lp}<|B?;3s
zVIhwwNyV6EBrl+0Lf~b~BERBSyiUM|WKoz97VCCOxRAsuQp-`@T#%GzaX*w{`8W=x
zxZ)-RG3JQ~`@JGdAO?FVWts<n`}<|+&QPRMI3gQp>6j%n2eErQQX#6_j=4=$ust23
ziO}voC=DKtsIt33NQ)Gs-qf(C8YGhm)h}fJMXVXVR=)*f<^|fm>m5Q8c+RcsxQ;j9
z?Ti@jW%RFtWwftkJ;!$ruMZbw(lELS2h;wh<ED+4{qVB+XORESpSj?F-!lJwcPalp
zw{d{^zm@#A^cuDxIV_VLaNDuguX_uUgIMd9CMa3u(zHNCrH^XbU<M>i)lo9f7ab+9
zlS_#|lUqu5zBnkAjm1HSI!$9srSWWZ)1)#ZGf8F5`c?B%-fGvg(x@c9Xl1;D(s=cB
zZL}W#>HM2HcOVD8RsQ>bO?AJN{~la0|F^*U4E<{J@3ot4b8UIkSJi5G`ux{w95kWs
zL%Y}Vo7<lM(IjV*ZkBtl|2t*()qas@``3)`rxPg2ys}H`Khz23k?1o%fa8pe>xVy)
zbW&%$Pr0m%IL@gINK*+`cGZte3!SNAM8q#Bd0O$U-UkArcL8{R{zX+g5)f5e>u$T=
z@U+<MF(^Ie;V4Zg$@wT9hsh0WAY(xm?B`W2c>L?h@oyi0Kl^Z5e}DFK5NMGLEpY||
zx^q0oB}WAMPfkzHVH0?Xj=!kmKdp12-%9D|;`03L!)ZW1r7u$QSCsUqz*xgMaMaEO
z`|g1c`wu*}oi}iQHNTZXJ*To}Oi!!$>qhjP%F1{a=Tn_W;Ym&A!dyaIr&HK)IEM4}
zr_}D&2t4|ak6mr15{D5i!$}VosD#y<Z#w4p`ZNxUMCNuEqPeeB9x9azw1NLySmVmX
zdc{2zU^S=^Ach4$*9E#deAB5&bCoi8HMl7g<7i&tQ4Y3$`BKzjd7llK+^f#4C?<?1
z{h7V{X}CJbjiE|90^ea4j`AA$x`C6UBcl8*hHVZnN5oxdRlX#>lh9$?3q6V8133Mq
z#hSi(Et4Aod7azj^<$8W;_+j<lc>=5s^k@@7OA}$<1|h^NWZesmr+?{+zg{Oi{Qt(
zKw%=xB&gnh&0m#zl_`@(q8ArD(jU+>XTg)RSu@(R^|@prcy{TQ7Rr_1OXw|4^4@Kj
zvG5u`T*=1I-C44fCUTnHvWWKP{}E6IVSk)I)V_XH8Ds+9JXu9~O_x8efn8gb_Ff)^
zd^Xg8B;n|~9}>a(f%>y&Kh_(6TEy(CTF@PPeI@dL{D!)=p>hzYzX|OBH2eIHoWc~3
zL$kDZ$$#W&-!0?&?Q~b%hR>$)`NzfQZI0A8UbpA5`NnuWZ?~O>yG_T3#_{{XNR~<R
zua~c*j-)alGdbLQ%Bfwg&AC$b$6iUUO$N#h8G`QUJlK2=IpH#!R9^6Ulrd#%`LOg7
zU4K<V_hPlCucr&I0rtZk1VIo4K@bE%5ClOG1VIo4K@bE%5ClOG1VIo4K@bE%5ClOG
V1VIo4L6H9ie*+4lD}De_005tRtMvc?
diff --git a/checks/checkpoint_powersupply b/checks/checkpoint_powersupply
index 5c9de7b..2a1b651 100644
--- a/checks/checkpoint_powersupply
+++ b/checks/checkpoint_powersupply
@@ -2,13 +2,17 @@
# -*- encoding: utf-8; py-indent-offset: 4 -*-
#
#
-# Monitor status of Check Point appliance power supply
+# License: GNU General Public License v2
#
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
# Date : 2018-07-31
#
-# 2018-07-31:
+# Monitor status of Check Point appliance power supply
+#
+# 2020-06-08: changed snmp-scan function
#
+# ToDo: remove VSX...
#
# sample snmpwalk (two power supplys)
#
@@ -63,13 +67,9 @@ check_info['checkpoint_powersupply'] = {
'default_levels_variable' : 'checkpoint_powersupply_defaults',
'service_description' : 'Power supply %s',
'group' : 'cp_powersupply',
- #'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0') in ['.1.3.6.1.4.1.2620.1.6.123.1.67', # ClusterXL Gateway
- # '.1.3.6.1.4.1.2620.1.6.123.1.65', # Appliance
- # '.1.3.6.1.4.1.2620.1.6.123.1.64', # VSX Gateway
- # '.1.3.6.1.4.1.2620.1.6.123.1.62', # Gateway
- # '.1.3.6.1.4.1.2620.1.6.123.1.49', # R77.30 Gateway
- # '.1.3.6.1.4.1.2620.1.6.123.1.48', # Mgmt
- 'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.2620.1.6.123.1'),
+ 'snmp_scan_function': lambda oid: (oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.2620.1.6.123.1') or
+ oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.8072.3.2.10')) and
+ oid('.1.3.6.1.4.1.2620.1.6.1.0', '').lower().startswith('svn foundation'),
'snmp_info' : ('.1.3.6.1.4.1.2620.1.6.7.9.1.1', [ # CHECKPOINT-MIB::powerSupplyEntry
'1', # powerSupplyIndex
'2', # powerSupplyStatus
diff --git a/packages/checkpoint_powersupply b/packages/checkpoint_powersupply
index 6d6d1db..992276a 100644
--- a/packages/checkpoint_powersupply
+++ b/packages/checkpoint_powersupply
@@ -7,4 +7,4 @@
'title': u'Check Point power supply status',
'version': '20180731.v0.0.1',
'version.min_required': '1.2.8b8',
- 'version.packaged': '1.4.0p35'}
\ No newline at end of file
+ 'version.packaged': '1.4.0p38'}
\ No newline at end of file
--
GitLab