From 5a7ccd0044c7bcd3594d80e8a8c5cb424a1e7654 Mon Sep 17 00:00:00 2001
From: "Th.L" <thl-cmk@outlook.com>
Date: Sun, 21 Mar 2021 21:18:49 +0100
Subject: [PATCH] update project

---
 agent_based/cisco_asa_sensors.py |  14 ++++++--------
 cisco_asa_sensors.mkp            | Bin 3376 -> 3380 bytes
 packages/cisco_asa_sensors       |   2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/agent_based/cisco_asa_sensors.py b/agent_based/cisco_asa_sensors.py
index 386cc97..58e213c 100644
--- a/agent_based/cisco_asa_sensors.py
+++ b/agent_based/cisco_asa_sensors.py
@@ -7,9 +7,10 @@
 # URL   : https://thl-cmk.hopto.org
 # Date  : 2021-03-18
 #
-# Monitor Cisco ASA temperature sensors
+# Monitor Cisco ASA Sensors (Temperature, Fan and Power supply)
+#
+# 2021-03-21: fixed params in cisco_asa_fan
 #
-# 2021-02-25: rewrite for CMK 2.x
 #
 # sample snmpwalk
 # .1.3.6.1.2.1.47.1.1.1.1.7.1 = STRING: "Chassis"
@@ -272,9 +273,6 @@ register.check_plugin(
 #
 # ##################################################################################################
 
-def render_rpm(value) -> str:
-    return '%s RPM' % str(value)
-
 
 def discovery_cisco_asa_fan(section: Dict) -> DiscoveryResult:
     for key in section['fan']:
@@ -290,10 +288,10 @@ def check_cisco_asa_fan(item, params, section) -> CheckResult:
         yield from check_levels(
             sensor.value,
             label='Speed',
-            levels_lower=params.get('levels_lower', None),
-            levels_upper=params.get('levels_upper', None),
+            levels_lower=params.get('lower', None),
+            levels_upper=params.get('upper', None),
             metric_name='fan' if params.get('output_metrics') else None,
-            render_func=render_rpm,
+            render_func=lambda v: '%s RPM' % str(v),
         )
 
     except KeyError:
diff --git a/cisco_asa_sensors.mkp b/cisco_asa_sensors.mkp
index 045a974b6d1afe83e294a6d5ce55f2b6e1c3919e..a6b6243ab6935936e2daa46eb1b1ffa21df979e0 100644
GIT binary patch
delta 3313
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

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

diff --git a/packages/cisco_asa_sensors b/packages/cisco_asa_sensors
index 39e62e1..c4b310d 100644
--- a/packages/cisco_asa_sensors
+++ b/packages/cisco_asa_sensors
@@ -9,5 +9,5 @@
  'title': 'Cisco ASA Sensors',
  'version': '20210318_v0.0.1',
  'version.min_required': '2.0.0',
- 'version.packaged': '2.0.0',
+ 'version.packaged': '2.0.0p1',
  'version.usable_until': None}
\ No newline at end of file
-- 
GitLab