[checkmk-commits] Check_MK Git: check_mk: #1716 FIX windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now

Module: check_mk Branch: master Commit: 775619ca0fee7525f1b427851ce1823e83b4f642 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=775619ca0fee75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 8 18:10:42 2014 +0100 #1716 FIX windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now --- .werks/1716 | 9 +++++++++ ChangeLog | 1 + checks/windows_tasks | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1716 b/.werks/1716 new file mode 100644 index 0000000..b90f2b5 --- /dev/null +++ b/.werks/1716 @@ -0,0 +1,9 @@ +Title: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418058616 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a28ed89..9fd9228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 1711 FIX: win_printers.ps1: ignore temporary printers created by RDP terminal sessions... * 1712 FIX: hyper_vms: fixed for snapshot VMs with (...) in their names... * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... + * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/windows_tasks b/checks/windows_tasks index b921361..2c520b2 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -38,6 +38,8 @@ # Last Result : 1 # Scheduled Task State : Disabled +# A list of all task state can be found here: +# http://msdn.microsoft.com/en-us/library/aa383604%28VS.85%29.aspx def windows_tasks_convert(info): data = {} @@ -65,12 +67,14 @@ def check_windows_tasks(item, _no_params, info): state = 0 label = "" msg = [] - if last_result not in [ 0, 0x00041301 ]: # SCHED_S_TASK_RUNNING + if last_result not in [ 0, 0x00041301, 0x00041325 ]: # SCHED_S_TASK_RUNNING, SCHED_S_TASK_QUEUED state = 2 label = "(!!)" msg.append("Service in state: %s%s" % ( last_result, label ) ) if last_result == 0x00041301: msg[-1] += " (currently running)" + elif last_result == 0x00041325: + msg[-1] += " (queued)" if values['Scheduled Task State'] != 'Enabled': msg.append("Task not Enabled(!!)")