Module: check_mk
Branch: master
Commit: 1b9c224e99a549002af84ee7b6f9977170c65e04
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b9c224e99a549…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Oct 11 11:51:52 2016 +0200
fixed typo
---
checks/fileinfo | 2 +-
checks/oracle_tablespaces | 20 +++++++++++++++++---
web/plugins/wato/check_parameters.py | 21 +++++++++++++++++++++
3 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/checks/fileinfo b/checks/fileinfo
index 5d52695..dc37936 100644
--- a/checks/fileinfo
+++ b/checks/fileinfo
@@ -89,7 +89,7 @@ def fileinfo_groups_of_file(check_filename, reftime):
incl_match = fnmatch.fnmatch(check_filename, inclusion)
if exclusion.startswith("~"):
- reg = regex(exlusion[1:])
+ reg = regex(exclusion[1:])
excl_match = reg.match( check_filename )
else:
excl_match = fnmatch.fnmatch(check_filename, exclusion)
diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces
index 7e799cc..573a400 100644
--- a/checks/oracle_tablespaces
+++ b/checks/oracle_tablespaces
@@ -224,6 +224,7 @@ def check_oracle_tablespaces(item, params, parsed):
num_increments = 0
increment_size = 0
free_space = 0
+ dfs_recover_offline = {}
# Conversion of old autochecks params
if type(params) == tuple:
@@ -234,9 +235,18 @@ def check_oracle_tablespaces(item, params, parsed):
for datafile in tablespace["datafiles"]:
- if datafile["file_online_status"] in [ "OFFLINE",
"RECOVER" ]:
- yield 2, "One or more datafiles OFFLINE or RECOVER"
- return
+ df_file_online_status = datafile["file_online_status"]
+ if df_file_online_status in [ "OFFLINE", "RECOVER" ]:
+ if params.get("set_file_online_status"):
+ dfs_recover_offline.setdefault(df_file_online_status, {
+ "state" :
params["set_file_online_status"][df_file_online_status],
+ "sids" : [],
+ })
+ dfs_recover_offline[df_file_online_status]["sids"].append(sid)
+
+ else:
+ yield 2, "One or more datafiles OFFLINE or RECOVER"
+ return
num_files += 1
if datafile["status"] in [ "AVAILABLE", "ONLINE",
"READONLY" ]:
@@ -347,6 +357,10 @@ def check_oracle_tablespaces(item, params, parsed):
yield 0, "%d data files (%d avail, %d autoext)" % \
(num_files, num_avail, num_extensible)
+ for df_file_online_status, this_state_info in dfs_recover_offline:
+ this_state = this_state_info["state"]
+ yield this_state, "Datafiles %s: %s" % (this_state, ",
".join(this_state_info["sids"]))
+
check_info['oracle_tablespaces'] = {
"parse_function" : parse_oracle_tablespaces,
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 8aa8c29..0b9ab66 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -7418,6 +7418,27 @@ register_check_parameters(
]
)
),
+ ( "set_file_online_status",
+ Dictionary(
+ title = _("Interpretation of datafiles' file online
states RECOVER or OFFLINE"),
+ help = _("If specified the datafiles with state RECOVER or
OFFLINE are collected"),
+ elements = [
+ ( "RECOVER",
+ MonitoringState(
+ title = _("Interpretation of RECOVER state"),
+ default_value = 2,
+ )
+ ),
+ ( "OFFLINE",
+ MonitoringState(
+ title = _("Interpretation of OFFLINE state"),
+ default_value = 2,
+ )
+ ),
+ ],
+ required_keys = [ "RECOVER", "OFFLINE" ]
+ ),
+ ),
],
),
TextAscii(