From 03a86074e4a7393d474ddb5f2a9f34ce8818e032 Mon Sep 17 00:00:00 2001
From: Thl CMK <thl-cmk@outlook.com>
Date: Thu, 13 Feb 2020 19:57:36 +0100
Subject: [PATCH] update project

---
 checks/cisco_asa_connections |  54 ++++++++++++++++++-----------------
 cisco_asa_connections.mkp    | Bin 2240 -> 2298 bytes
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/checks/cisco_asa_connections b/checks/cisco_asa_connections
index 0f36212..ce7eab9 100644
--- a/checks/cisco_asa_connections
+++ b/checks/cisco_asa_connections
@@ -8,45 +8,46 @@
 # 24.03.2016: changed "snmp_scan_function" from ".1.3.6.1.2.1.1.2.0" to ".1.3.6.1.2.1.1.1.0"
 # 02.07.2016: fixed crit/warn to >=
 # 09.01.2018: some fine tuning (changed infotext)
+# 13.02.2020: changed snmp_info from ".1.3.6.1.4.1.9.9.147.1.2.2.2.1.5" to more specific "1.3.6.1.4.1.9.9.147.1.2.2.2.1.5.40"
 #
 # sample snmp walk
 #
-# .1.3.6.1.4.1.9.9.147.1.2.2.2.1.5.40.6 = Gauge32: 16684
-# .1.3.6.1.4.1.9.9.147.1.2.2.2.1.5.40.7 = Gauge32: 46797
+# .1.3.6.1.4.1.9.9.147.1.2.2.2.1.5.40.6 = Gauge32: 4987
+# .1.3.6.1.4.1.9.9.147.1.2.2.2.1.5.40.7 = Gauge32: 17517
 #
 # sample info
 #
-# [[u'16684'], [u'46797']]
+# [[u'4987', u'17517']]
 #
 # connection levels (war,crit,minimum)
 cisco_asa_connections_default_levels = (3000, 5000,100)
 
 
 def inventory_cisco_asa_connections(info):
-    current_connections = info[0]
-    max_connections = info[1]
-    return [(None, cisco_asa_connections_default_levels)]
+    if len(info) > 0:
+        return [(None, cisco_asa_connections_default_levels)]
 
 
-def check_cisco_asa_connections(item, params, info):
-    warn, crit, minimum = params
-    current_connections = int(info[0][0])
-    max_connections = int(info[1][0])
-    perfdata = [('current_connections', current_connections, warn, crit, '', ''), ('max_connections', max_connections)]
-    infotext = 'item not found'
+def check_cisco_asa_connections(_no_item, params, info):
+    if len(info) > 0:
+        warn, crit, minimum = params
+        current_connections = int(info[0][0])
+        max_connections = int(info[0][1])
+        perfdata = [('current_connections', current_connections, warn, crit, '', ''), ('max_connections', max_connections)]
+        infotext = ''
 
-    if current_connections >= crit:
-        infotext = '%d (>=%d)(!!)/%d current/max connections' % (current_connections, crit, max_connections)
-        return 2, infotext, perfdata
-    elif current_connections >= warn:
-        infotext = '%d (>=%d)(!)/%d current/max connections' % (current_connections, warn, max_connections)
-        return 1, infotext, perfdata
-    elif current_connections < minimum:
-        infotext = '%d (<%d)(!!)/%d current/max connections' % (current_connections, minimum, max_connections)
-        return 2, infotext, perfdata
-    else:
-        infotext = '%d/%d current/max connections' % (current_connections, max_connections)
-        return 0, infotext, perfdata
+        if current_connections >= crit:
+            infotext = '%d (>=%d)(!!)/%d current/max connections' % (current_connections, crit, max_connections)
+            return 2, infotext, perfdata
+        elif current_connections >= warn:
+            infotext = '%d (>=%d)(!)/%d current/max connections' % (current_connections, warn, max_connections)
+            return 1, infotext, perfdata
+        elif current_connections < minimum:
+            infotext = '%d (<%d)(!!)/%d current/max connections' % (current_connections, minimum, max_connections)
+            return 2, infotext, perfdata
+        else:
+            infotext = '%d/%d current/max connections' % (current_connections, max_connections)
+            return 0, infotext, perfdata
 
 
 check_info['cisco_asa_connections'] = {
@@ -56,7 +57,8 @@ check_info['cisco_asa_connections'] = {
     'has_perfdata'       : True,
     'group'              : 'cisco_asa_connections',
     'snmp_scan_function' : lambda oid: oid('.1.3.6.1.2.1.1.1.0').lower().startswith('cisco adaptive security appliance'),
-    'snmp_info'          : ('.1.3.6.1.4.1.9.9.147.1.2.2.2.1', [
-                             '5'  # CISCO-FIREWALL-MIB::cfwConnectionStatValue
+    'snmp_info'          : ('.1.3.6.1.4.1.9.9.147.1.2.2.2.1.5.40', [  # CISCO-FIREWALL-MIB::cfwConnectionStatValue.protoIp
+                             '6',  # CISCO-FIREWALL-MIB::cfwConnectionStatValue.protoIp.currentInUse
+                             '7',  # CISCO-FIREWALL-MIB::cfwConnectionStatValue.protoIp.high
                            ]),
 }
diff --git a/cisco_asa_connections.mkp b/cisco_asa_connections.mkp
index 855d6ccf29e88e64ade038fcfbc0b51b169eab64..f1b767230768bec07b5f76275dad01c44ee61829 100644
GIT binary patch
delta 2245
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
Tpa>BRq7wfB$#n!j0C)fZ-&S@G

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

-- 
GitLab