diff --git a/agent_based/cisco_vpn_tunnel.py b/agent_based/cisco_vpn_tunnel.py index 285815b689c1e206fc6ed802be1250784bb224d7..cc94fcb76d38bc4d5fed247959485208eb30ee27 100644 --- a/agent_based/cisco_vpn_tunnel.py +++ b/agent_based/cisco_vpn_tunnel.py @@ -18,7 +18,7 @@ # 2021-11-03: fix negative vpn active tine # 2022-01-19: added workaround for not matching IKE_OID_end and cipSecTunIkeTunnelIndexfor not matching # IKE_OID_end and cipSecTunIkeTunnelIndex, try to match IPSec nad IKE sa by remote address -# +# 2022-04-01: changed IPSec SA count output to check levels # snmpwalk sample # @@ -300,7 +300,14 @@ def check_cisco_vpn_tunnel(item, params, section: Dict[str, IkeSa]) -> CheckResu render_func=render.timespan, metric_name='cisco_vpn_tunnel_cipSecTunActiveTime' ) - yield Result(state=State.OK, summary=f'SAs: {ipsecsummary.sa_count}') + + yield from check_levels( + label='IPSec SAs', + value=ipsecsummary.sa_count, + metric_name='cisco_vpn_tunnel_ipsec_sa_count', + render_func=lambda v: f'{int(v)}', + ) + # yield Result(state=State.OK, summary=f'SAs: {ipsecsummary.sa_count}') ipsec_in_octets = 0 ipsec_out_octets = 0 # convert to octets/packets per second diff --git a/cisco_vpn_tunnel.mkp b/cisco_vpn_tunnel.mkp index e57f997e1c32bae79b1de31a50f7e90f252e02b0..a6b63cd04e859c32f621df00b9e59e4f9915e5f8 100644 Binary files a/cisco_vpn_tunnel.mkp and b/cisco_vpn_tunnel.mkp differ diff --git a/packages/cisco_vpn_tunnel b/packages/cisco_vpn_tunnel index 59ad7cb3f66596ba9b4c6a14a4f2f3923c678301..7c6ea78435abf2567e040183cba6af9cbd05ec86 100644 --- a/packages/cisco_vpn_tunnel +++ b/packages/cisco_vpn_tunnel @@ -11,7 +11,7 @@ 'name': 'cisco_vpn_tunnel', 'num_files': 3, 'title': 'Monitor Cisco VPN Tunnel', - 'version': '20220119.v0.3', + 'version': '20220401.v0.3a', 'version.min_required': '2.0.0', 'version.packaged': '2021.09.20', 'version.usable_until': None} \ No newline at end of file diff --git a/web/plugins/metrics/cisco_vpn_tunnel.py b/web/plugins/metrics/cisco_vpn_tunnel.py index 2fba64282e7cedc6ee9c1db65f3041284680ac61..59831ccf2d23a9972f18711c93c80525888cca68 100644 --- a/web/plugins/metrics/cisco_vpn_tunnel.py +++ b/web/plugins/metrics/cisco_vpn_tunnel.py @@ -137,6 +137,14 @@ metric_info['cisco_vpn_tunnel_cipSecTunActiveTime'] = { 'unit': 's', 'color': '26/b', } + +metric_info['cisco_vpn_tunnel_ipsec_sa_count'] = { + 'title': _('IPSec SA count'), + 'help': _(''), + 'unit': 'count', + 'color': '12/b', +} + metric_info['cisco_vpn_tunnel_cipSecTunHcInOctets'] = { 'title': _('IPSec Bytes in'), 'help': _(''), @@ -277,6 +285,12 @@ graph_info['cisco_vpn_tunnel_ipsec_uptime'] = { ('cisco_vpn_tunnel_cipSecTunActiveTime', 'area'), ], } +graph_info['cisco_vpn_tunnel_ipsec_sa_count'] = { + 'title': _('IPSec SA count'), + 'metrics': [ + ('cisco_vpn_tunnel_ipsec_sa_count', 'area'), + ], +} graph_info['cisco_vpn_tunnel_ipsec_octets'] = { 'title': _('IPSec Bytes/s'), 'metrics': [