Module: check_mk
Branch: master
Commit: 0f46f3d45708c47383a0a805b1a007a000149565
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f46f3d45708c4…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Mar 7 16:15:24 2013 +0100
Some check code formating
---
checks/wmic_process | 1 -
checks/wut_webio_io | 12 +++++-------
checks/wut_webtherm | 9 ++++-----
checks/zfsget | 1 -
checks/zpool_status | 1 -
checks/zypper | 2 --
6 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/checks/wmic_process b/checks/wmic_process
index 0f578f6..67f780f 100644
--- a/checks/wmic_process
+++ b/checks/wmic_process
@@ -94,7 +94,6 @@ def check_wmic_process(item, params, info):
infotext = "".join(infos)
return (state, nagios_state_names[state] + infotext, perfdata)
-
check_info["wmic_process"] = {
'check_function': check_wmic_process,
'service_description': 'proc_%s',
diff --git a/checks/wut_webio_io b/checks/wut_webio_io
index 7d91ba8..1234b10 100644
--- a/checks/wut_webio_io
+++ b/checks/wut_webio_io
@@ -99,15 +99,13 @@ check_info['wut_webio_io.inputs'] = {
"inventory_function" : inventory_wut_webio_io_inputs,
"service_description": "INPUT %s",
"has_perfdata" : False,
- # "group" : "",
- # "default_levels_variable" : "services_default_levels",
- # first check we have a vendor mib from W&T, then check for the model in their
MIB.
- "snmp_scan_function" : lambda oid: \
- ".1.3.6.1.4.1.5040" in oid("1.3.6.1.2.1.1.2.0") and
-
oid(".1.3.6.1.4.1.5040.1.2.4.3.3.5.0").lower().startswith("web-io"),
"snmp_info" : (".1.3.6.1.4.1.5040.1.2.4", [
"3.1.5.2.1.1", # io port index. (bugged)
"3.2.1.1.1", # user defined description.
"1.3.1.4", # the low/high state.
- ]),
+ ]),
+ # first check we have a vendor mib from W&T, then check for the model in their
MIB.
+ "snmp_scan_function" : lambda oid: \
+ ".1.3.6.1.4.1.5040" in oid("1.3.6.1.2.1.1.2.0") and
+
oid(".1.3.6.1.4.1.5040.1.2.4.3.3.5.0").lower().startswith("web-io"),
}
diff --git a/checks/wut_webtherm b/checks/wut_webtherm
index bde37f5..06eea20 100644
--- a/checks/wut_webtherm
+++ b/checks/wut_webtherm
@@ -56,16 +56,15 @@ def detect_webtherm(oid):
".1.3.6.1.4.1.5040.1.2.8",
".1.3.6.1.4.1.5040.1.2.16" ]
-
-
-
-
check_info["wut_webtherm"] = {
'check_function': check_webtherm,
'inventory_function': inventory_webtherm,
'service_description': 'Thermograph Sensor %s',
'has_perfdata': True,
- 'snmp_info': ('.1.3.6.1.4.1.5040.1.2', ['1',
'2', '3', '6', '8', '16'], ['1.2.1.1',
'1.3.1.1']),
+ 'snmp_info': ('.1.3.6.1.4.1.5040.1.2',
+ ['1', '2', '3', '6', '8', '16'],
+ ['1.2.1.1', '1.3.1.1']
+ ),
'snmp_scan_function': detect_webtherm,
'group': 'room_temperature',
}
diff --git a/checks/zfsget b/checks/zfsget
index 4b5d514..aacbb12 100644
--- a/checks/zfsget
+++ b/checks/zfsget
@@ -178,7 +178,6 @@ def check_zfsget(item, params, info):
return df_check_filesystem_list(item, params, fslist)
-
check_info['zfsget'] = {
"check_function" : check_zfsget,
"inventory_function" : inventory_zfsget,
diff --git a/checks/zpool_status b/checks/zpool_status
index 20d384c..93cc3fb 100644
--- a/checks/zpool_status
+++ b/checks/zpool_status
@@ -116,7 +116,6 @@ def check_zpool_status(_no_item, _no_params, info):
if len(message) == 0:
message = ['No critical errors']
return (state, nagios_state_names[state] + " - " + ",
".join(message))
-#
check_info["zpool_status"] = {
'check_function': check_zpool_status,
diff --git a/checks/zypper b/checks/zypper
index 14d7535..7ea882f 100644
--- a/checks/zypper
+++ b/checks/zypper
@@ -79,10 +79,8 @@ def check_zypper(_no_item, _no_params, info):
return state, nagios_state_names[state] + infotext
-
check_info['zypper'] = {
"check_function" : check_zypper,
"inventory_function" : inventory_zypper,
"service_description" : "Zypper Updates",
}
-