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

---
 checks/cisco_asa_connections                 |  15 +++++++++++----
 cisco_asa_connections.mkp                    | Bin 2298 -> 2306 bytes
 web/plugins/metrics/cisco_asa_connections.py |  16 ++++++++--------
 web/plugins/wato/cisco_asa_connections.py    |   8 ++++----
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/checks/cisco_asa_connections b/checks/cisco_asa_connections
index ce7eab9..72c5433 100644
--- a/checks/cisco_asa_connections
+++ b/checks/cisco_asa_connections
@@ -2,9 +2,11 @@
 # -*- encoding: utf-8; py-indent-offset: 4 -*-
 #
 # created by Th.L.:
+#
 # Monitors Cisco ASA connection count
-# works with Cisco ASA 55xx and later
-# tested witch 5506W and 5512-X, 5585-SSP2
+#
+# works with Cisco ASA 55xx and later, tested witch 5506W and 5512-X, 5585-SSP2
+#
 # 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)
@@ -15,11 +17,14 @@
 # .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
 #
+# CISCO-FIREWALL-MIB::cfwConnectionStatValue.protoIp.currentInUse = Gauge32: 4987
+# CISCO-FIREWALL-MIB::cfwConnectionStatValue.protoIp.high = Gauge32: 17517
+#
 # sample info
 #
 # [[u'4987', u'17517']]
 #
-# connection levels (war,crit,minimum)
+# connection levels (warn,crit,minimum)
 cisco_asa_connections_default_levels = (3000, 5000,100)
 
 
@@ -33,7 +38,9 @@ def check_cisco_asa_connections(_no_item, params, info):
         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)]
+        #             label                  value               warn  crit  min max
+        perfdata = [('current_connections', current_connections, warn, crit, 1000, 2000),
+                    ('max_connections', max_connections)]
         infotext = ''
 
         if current_connections >= crit:
diff --git a/cisco_asa_connections.mkp b/cisco_asa_connections.mkp
index f1b767230768bec07b5f76275dad01c44ee61829..22ea3f5f4cd44cfe8cb72dab0fcd38641306365a 100644
GIT binary patch
delta 2285
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

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

diff --git a/web/plugins/metrics/cisco_asa_connections.py b/web/plugins/metrics/cisco_asa_connections.py
index fc7714b..7c33f9e 100644
--- a/web/plugins/metrics/cisco_asa_connections.py
+++ b/web/plugins/metrics/cisco_asa_connections.py
@@ -9,33 +9,33 @@
 
 #####################################################################################################################
 #
-# define units for cisco_asa_connections perfdata
+# define units
 #
 #####################################################################################################################
 
 
 #####################################################################################################################
 #
-# define metrics for cisco_asa_connections perfdata
+# define metrics
 #
 #####################################################################################################################
 
 metric_info['cisco_asa_connections_current_connections'] = {
     'title': _('current conections'),
     'unit': 'count',
-    'color': '11/a',
+    'color': '26/a',
 }
 
 
 metric_info['cisco_asa_connections_max_connections'] = {
     'title': _('max conections'),
     'unit': 'count',
-    'color': '21/a',
+    'color': '11/a',
 }
 
 ######################################################################################################################
 #
-# map cisco_asa_connections perfdata to metric, not really necessary but makes sure to use the right metrics
+# map perfdata to metric
 #
 ######################################################################################################################
 
@@ -46,15 +46,15 @@ check_metrics['check_mk-cisco_asa_connections'] = {
 
 ######################################################################################################################
 #
-# how to graph perdata for cisco_asa_connections
+# how to graph perdata
 #
 ######################################################################################################################
 
 graph_info.append({
     'title': _('connections'),
     'metrics': [
-        ('cisco_asa_connections_current_connections', 'line'),
         ('cisco_asa_connections_max_connections', 'line'),
+        ('cisco_asa_connections_current_connections', 'area'),
     ],
     'scalars': [
         ('cisco_asa_connections_current_connections:crit', _('crit level')),
@@ -64,7 +64,7 @@ graph_info.append({
 
 ######################################################################################################################
 #
-# define perf-o-meter for cisco_asa_connections rpm
+# define perf-o-meter
 #
 ######################################################################################################################
 
diff --git a/web/plugins/wato/cisco_asa_connections.py b/web/plugins/wato/cisco_asa_connections.py
index 518b0c3..f5c50b0 100644
--- a/web/plugins/wato/cisco_asa_connections.py
+++ b/web/plugins/wato/cisco_asa_connections.py
@@ -3,7 +3,7 @@
 #
 # Author : Th.L.
 # Content: wato plugin for snmp check 'cisco_asa_connections' 
-#          to configure waring/critical levels
+#          to configure waring/critical/minimum levels
 #
 #
 register_check_parameters(
@@ -13,9 +13,9 @@ register_check_parameters(
     Tuple(
         title=_('Cisco ASA current connections'),
         elements=[
-            Integer(title=_('warning at'), unit=_(' connections'), default_value=3000),
-            Integer(title=_('critical at'), unit=_(' connections'), default_value=5000),
-            Integer(title=_('minimum'), unit=_(' connections'), default_value=100),
+            Integer(title=_('warning at'), unit=_('connections'), default_value=3000),
+            Integer(title=_('critical at'), unit=_('connections'), default_value=5000),
+            Integer(title=_('minimum'), unit=_('connections'), default_value=100),
         ]
     ),
     None, None
-- 
GitLab