From cb879ef85ce819025bcfa59786f7247bfb80c5b3 Mon Sep 17 00:00:00 2001
From: OMD site cmk16x <thl-cmk@outlook.com>
Date: Mon, 24 Feb 2020 11:43:00 +0100
Subject: [PATCH] update project
---
checks/cisco_asa_temp | 62 +++++++++++++++++-----------------------
cisco_asa_temp.mkp | Bin 3196 -> 1946 bytes
packages/cisco_asa_temp | 18 +++++-------
3 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/checks/cisco_asa_temp b/checks/cisco_asa_temp
index 0db03ad..a01ef03 100644
--- a/checks/cisco_asa_temp
+++ b/checks/cisco_asa_temp
@@ -11,52 +11,44 @@
# 03.05.2018: fixed inventory for empty sensorname (asa context)
#
# warn, crit, minimum temp value
-cisco_asa_temp_default_levels = (60, 70, 20)
+factory_settings['cisco_asa_temp_default_levels'] = {'levels_lower': (0.0, -10.0),
+ 'levels': (60, 80),
+ 'output_unit': 'c',
+ 'device_levels_handling': 'usr',
+ }
+
def inventory_cisco_asa_temp(info):
for sensorname, sensortype, sensorvalue, sensorstatus, sensorunits in info:
if sensortype == '8' and sensorstatus == '1' and sensorname != '':
- yield sensorname, cisco_asa_temp_default_levels
+ yield sensorname, None
def check_cisco_asa_temp(item, params, info):
- warn, crit, minimum = params
- infotext = 'item not found(!!)'
- state = 3
- params = []
for sensorname, sensortype, sensorvalue, sensorstatus, sensorunits in info:
if sensorname == item and sensortype == '8':
- sensorvalue = int(sensorvalue)
- infotext = u'%d \xB0C' % (sensorvalue)
- perfdata = [('temp', sensorvalue, warn, crit)]
-
- if sensorvalue >= crit:
- infotext += u' (>=%d \xB0C)(!!)' % crit
- return 2, infotext, perfdata
- elif sensorvalue >= warn:
- infotext += u' (>=%d \xB0C)(!)' % warn
- return 1, infotext, perfdata
- elif sensorvalue < minimum:
- infotext += u' (<%d \xB0C)(!!)' % minimum
- return 2, infotext, perfdata
- else:
- return 0, infotext, perfdata
+ yield check_temperature(reading=float(sensorvalue),
+ params=params,
+ unique_name='cisco_asa_temp_%s' % sensorname,
+ # dev_status=int(sensorstatus)
+ )
- return tate, infotext, perfdata
check_info['cisco_asa_temp'] = {
- 'check_function' : check_cisco_asa_temp,
- 'inventory_function' : inventory_cisco_asa_temp,
- 'service_description': 'Environment: %s',
- 'has_perfdata' : True,
- 'group' : 'cisco_asa_temp',
- '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.2.1', [
- '47.1.1.1.1.7', #ENTITY-MIB::entPhysicalName
- '99.1.1.1.1', #ENTITY-SENSOR-MIB::entPhySensorType
- '99.1.1.1.4', #ENTITY-SENSOR-MIB::entPhySensorValue
- '99.1.1.1.5', #ENTITY-SENSOR-MIB::entPhySensorOperStatus
- '99.1.1.1.6', #ENTITY-SENSOR-MIB::entPhySensorUnitsDisplay
- ] ),
+ 'check_function' : check_cisco_asa_temp,
+ 'inventory_function' : inventory_cisco_asa_temp,
+ 'service_description' : 'Temperature %s',
+ 'has_perfdata' : True,
+ 'group' : 'temperature',
+ 'default_levels_variable' : 'cisco_asa_temp_default_levels',
+ '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.2.1', [
+ '47.1.1.1.1.7', #ENTITY-MIB::entPhysicalName
+ '99.1.1.1.1', #ENTITY-SENSOR-MIB::entPhySensorType
+ '99.1.1.1.4', #ENTITY-SENSOR-MIB::entPhySensorValue
+ '99.1.1.1.5', #ENTITY-SENSOR-MIB::entPhySensorOperStatus
+ '99.1.1.1.6', #ENTITY-SENSOR-MIB::entPhySensorUnitsDisplay
+ ]),
+ 'includes': ['temperature.include'],
}
diff --git a/cisco_asa_temp.mkp b/cisco_asa_temp.mkp
index 525082c24d8f3707900dfb284a3229101d821156..cdbe298b4040c185e9ad63e2c007cf0f65edb85b 100644
GIT binary patch
literal 1946
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
literal 3196
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
diff --git a/packages/cisco_asa_temp b/packages/cisco_asa_temp
index 327fda1..1b92271 100644
--- a/packages/cisco_asa_temp
+++ b/packages/cisco_asa_temp
@@ -1,14 +1,10 @@
-{'author': 'Th.L. (thl-cmk[at]outlook[dot]com)',
- 'description': 'Monitors Cisco ASA Temperatur sensors\nMinimum/Warning/Critical temperature level can be configured via wato',
+{'author': u'Th.L. (thl-cmk[at]outlook[dot]com)',
+ 'description': u'Monitors Cisco ASA Temperatur sensors\n\nRewrite for CMK 1.6x to include "temperature.include"\n\nNOTE: changed item from Environment: <Sensorname> to Temperature <Sensorname>\n',
'download_url': 'https://thl-cmk.hopto.org',
- 'files': {'checkman': ['cisco_asa_temp'],
- 'checks': ['cisco_asa_temp'],
- 'pnp-templates': [],
- 'web': ['plugins/wato/cisco_asa_temp.py',
- 'plugins/metrics/cisco_asa_temp.py']},
+ 'files': {'checkman': ['cisco_asa_temp'], 'checks': ['cisco_asa_temp']},
'name': 'cisco_asa_temp',
- 'num_files': 4,
- 'title': 'monitor Cisco ASA temperature sensors',
- 'version': '20180503.v03a',
- 'version.min_required': '1.2.6p12',
+ 'num_files': 2,
+ 'title': u'monitor Cisco ASA temperature sensors',
+ 'version': '20200224.v04',
+ 'version.min_required': '1.6.0',
'version.packaged': '1.6.0p8'}
\ No newline at end of file
--
GitLab