[checkmk-commits] Check_MK Git: check_mk: #2514 check oracle_jobs: configurable service status in case of disabled jobs

Module: check_mk Branch: master Commit: ba484cabce55caad5f3232e0c42b456fe292ed0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba484cabce55ca… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Mon Aug 3 17:06:56 2015 +0200 #2514 check oracle_jobs: configurable service status in case of disabled jobs If a job configured in ORACLE databases is DISABLED, the status of the service can now be set to OK, WARN, CRIT or UNKNOWN. --- .werks/2514 | 9 +++++++++ ChangeLog | 1 + checks/oracle_jobs | 23 +++++++++++++++++++++-- web/plugins/wato/check_parameters.py | 6 +++++- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.werks/2514 b/.werks/2514 new file mode 100644 index 0000000..ec96534 --- /dev/null +++ b/.werks/2514 @@ -0,0 +1,9 @@ +Title: check oracle_jobs: configurable service status in case of disabled jobs +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1438613862 +Class: feature + +If a job configured in ORACLE databases is DISABLED, the status of the service can now be set to OK, WARN, CRIT or UNKNOWN. diff --git a/ChangeLog b/ChangeLog index ffeaa60..933a479 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 2479 Allowing dots in host-, service- and contact groups now * 2486 Remove special handling for non-distributed-setups in WATO... * 2487 Remove dangerous <i>Factory Reset</i> button... + * 2514 check oracle_jobs: configurable service status in case of disabled jobs... * 2344 FIX: Improved validation of selected rules when editing BI aggregations... * 2346 FIX: Notifications: Fixed garbled page when switching on/off bulks/backlog/user rules * 2372 FIX: Avoid freezing WATO during bulk discovery if hosts do not respond in a timely manner diff --git a/checks/oracle_jobs b/checks/oracle_jobs index d1dca28..5b8d979 100644 --- a/checks/oracle_jobs +++ b/checks/oracle_jobs @@ -36,6 +36,22 @@ # IODBSZ1 EXFSYS RLM$SCHDNEGACTION SCHEDULED 0 18954 TRUE 23.04.13 14:51:57,000000 +02:00 - SUCCEEDED # IODBSZ1 EXFSYS RLM$EVTCLEANUP SCHEDULED 0 18202 TRUE 23.04.13 13:41:48,200000 +01:00 - SUCCEEDED +# new output +# <<<oracle_jobs:sep(124)>>> +# QS1|SYS|SM$CLEAN_AUTO_SPLIT_MERGE|SCHEDULED|1|877|TRUE|02-AUG-15 12.00.00.500000 AM EUROPE/VIENNA|-|SUCCEEDED +# QS1|SYS|RSE$CLEAN_RECOVERABLE_SCRIPT|SCHEDULED|0|877|TRUE|02-AUG-15 12.00.00.800000 AM EUROPE/VIENNA|-|SUCCEEDED +# QS1|SYS|FGR$AUTOPURGE_JOB|DISABLED||0|FALSE|01-JAN-70 12.00.00.000000 AM +02:00|-| +# QS1|SYS|BSLN_MAINTAIN_STATS_JOB|SCHEDULED|12|128|TRUE|02-AUG-15 12.00.00.600000 AM +01:00|BSLN_MAINTAIN_STATS_SCHED|SUCCEEDED +# QS1|SYS|DRA_REEVALUATE_OPEN_FAILURES|SCHEDULED|0|156|TRUE|01-JAN-70 12.00.00.000000 AM +02:00|MAINTENANCE_WINDOW_GROUP|SUCCEEDED +# QS1|SYS|HM_CREATE_OFFLINE_DICTIONARY|DISABLED||0|FALSE|01-JAN-70 12.00.00.000000 AM +02:00|MAINTENANCE_WINDOW_GROUP| +# QS1|SYS|ORA$AUTOTASK_CLEAN|SCHEDULED|0|877|TRUE|02-AUG-15 03.00.00.200000 AM EUROPE/VIENNA|DAILY_PURGE_SCHEDULE|SUCCEEDED +# QS1|SYS|FILE_WATCHER|DISABLED||0|FALSE|01-JAN-70 12.00.00.000000 AM +02:00|FILE_WATCHER_SCHEDULE| +# QS1|SYS|PURGE_LOG|SCHEDULED|0|877|TRUE|02-AUG-15 03.00.00.700000 AM EUROPE/VIENNA|DAILY_PURGE_SCHEDULE|SUCCEEDED +# QS1|ORACLE_OCM|MGMT_STATS_CONFIG_JOB|DISABLED|0|2|FALSE|01-MAY-15 01.01.01.100000 AM +01:00|-| +# QS1|ORACLE_OCM|MGMT_CONFIG_JOB|DISABLED|0|40|FALSE|08-APR-15 01.01.01.200000 AM +01:00|-| +# QS1|DBADMIN|DATENEXPORT-FUR|COMPLETED|0|3|FALSE|22-AUG-14 01.11.00.000000 AM EUROPE/BERLIN|-| + + factory_settings["oracle_jobs_defaults"] = { "disabled": True, @@ -136,7 +152,7 @@ def check_oracle_jobs(item, params, info): # 01.05.13 01:01:01,000000 +01:00 if job_nextrun.startswith("01.01.70 00:00:00"): - if job_schedule == "-": + if job_schedule == "-" and job_state != "DISABLED": job_nextrun = "not scheduled(!)" state = max(state, 1) else: @@ -149,11 +165,14 @@ def check_oracle_jobs(item, params, info): txt = 'Job is running forever' else: txt = "Last Run Status: %s" % (job_status) - if job_status != "SUCCEEDED": + if job_status != "SUCCEEDED" and job_status != "": txt += "(!!)" state = max(state, 2) output.append(txt) + if job_state == "DISABLED" and "status_disabled_jobs" in params: + state = params["status_disabled_jobs"] + return (state, ", ".join(output), perfdata) check_info['oracle_jobs'] = { diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 559329a..7194251 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4601,7 +4601,11 @@ register_check_parameters( ( True, _("Ignore the state of the Job")), ( False, _("Consider the state of the job")),], help = _("The state of the job is ignored per default.") - )),] + )), + ( "status_disabled_jobs", MonitoringState( + title = "Status of service in case of disabled job", default_value = 0 + )), + ] ), TextAscii( title = _("Scheduler Job Name"),