From f4ab8241c3c3d13d315ab3b7b5f9552214713416 Mon Sep 17 00:00:00 2001 From: "th.l" <thl-cmk@outlook.com> Date: Wed, 14 Aug 2024 21:02:10 +0200 Subject: [PATCH] update project --- README.md | 2 +- mkp/cisco_vpn_tunnel-0.4.1-20240814.mkp | Bin 0 -> 6392 bytes source/agent_based/cisco_vpn_tunnel.py | 4 ++-- source/packages/cisco_vpn_tunnel | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 mkp/cisco_vpn_tunnel-0.4.1-20240814.mkp diff --git a/README.md b/README.md index 542c953..4344069 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/cisco_vpn_tunnel-0.4.0-20230607.mkp "cisco_vpn_tunnel-0.4.0-20230607.mkp" +[PACKAGE]: ../../raw/master/mkp/cisco_vpn_tunnel-0.4.1-20240814.mkp "cisco_vpn_tunnel-0.4.1-20240814.mkp" # Cisco IPSec VPN tunnel Monitors the status of Cisco IPSec VPN tunnels. This is a complete rewrite of the original check diff --git a/mkp/cisco_vpn_tunnel-0.4.1-20240814.mkp b/mkp/cisco_vpn_tunnel-0.4.1-20240814.mkp new file mode 100644 index 0000000000000000000000000000000000000000..52ba3cc4c618d39a7b667bf9257b62b9c8c7a253 GIT binary patch literal 6392 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 literal 0 HcmV?d00001 diff --git a/source/agent_based/cisco_vpn_tunnel.py b/source/agent_based/cisco_vpn_tunnel.py index 912c365..61380c0 100644 --- a/source/agent_based/cisco_vpn_tunnel.py +++ b/source/agent_based/cisco_vpn_tunnel.py @@ -22,7 +22,7 @@ # 2022-12-17: check input values for isdigit() # 2023-06-07: fixed ValueError (not enough values to unpack (expected 10, got 4)) in parse function (ipsec_tunnel_entry) # 2023-06-07: fixed ValueError (not enough values to unpack (expected 18, got 4)) in parse function (ike_tunnel_entry) -# +# 2024-08-14: fixed missing () on isdigit # snmpwalk sample # @@ -172,7 +172,7 @@ def parse_cisco_vpn_tunnel(string_table: List[StringTable]) -> Dict[str, IkeSa]: ipsec_sa.hc_out_octets += int(hc_out_octets) if hc_out_octets.isdigit() else 0 ipsec_sa.out_pkts += int(out_pkts) if out_pkts.isdigit() else 0 ipsec_sa.out_drop_pkts += int(out_drop_pkts) if out_drop_pkts.isdigit() else 0 - if active_time.isdigit and (int(active_time) // 100 > ipsec_sa.active_time): + if active_time.isdigit() and (int(active_time) // 100 > ipsec_sa.active_time): ipsec_sa.active_time = int(active_time) // 100 # IKE SA diff --git a/source/packages/cisco_vpn_tunnel b/source/packages/cisco_vpn_tunnel index f52593b..0cee533 100644 --- a/source/packages/cisco_vpn_tunnel +++ b/source/packages/cisco_vpn_tunnel @@ -9,7 +9,7 @@ 'gui': ['metrics/cisco_vpn_tunnel.py', 'wato/cisco_vpn_tunnel.py']}, 'name': 'cisco_vpn_tunnel', 'title': 'Monitor Cisco VPN Tunnel', - 'version': '0.4.0-20230607', + 'version': '0.4.1-20240814', 'version.min_required': '2.1.0b1', - 'version.packaged': '2.2.0p24', + 'version.packaged': 'cmk-mkp-tool 0.2.0', 'version.usable_until': None} -- GitLab