diff --git a/agent_based/cisco_asa_sensors.py b/agent_based/cisco_asa_sensors.py index 386cc9752dcf55662bf18811e871c726945a4e54..58e213c24b9df00aa773218376d34a04c3803916 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 Binary files a/cisco_asa_sensors.mkp and b/cisco_asa_sensors.mkp differ diff --git a/packages/cisco_asa_sensors b/packages/cisco_asa_sensors index 39e62e176658cc74cf51a45236ed7ff6fb1bdb95..c4b310dfc26a6f2ce885cf8a5a793282bd11a114 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