Module: check_mk
Branch: master
Commit: cb576da7f098b93ad4a5702c7f7d0543ad24840b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb576da7f098b9…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Mon May 4 16:24:00 2015 +0200
#1244 FIX windows_tasks: Fixed handling of tasks manually stopped by admin
If a Windows Administrator manually stops a task it will be ignored now and not
longer results in an error now.
---
.werks/1244 | 11 +++++++++++
ChangeLog | 1 +
checks/windows_tasks | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/1244 b/.werks/1244
new file mode 100644
index 0000000..e7c954b
--- /dev/null
+++ b/.werks/1244
@@ -0,0 +1,11 @@
+Title: windows_tasks: Fixed handling of tasks manually stopped by admin
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1430749274
+
+If a Windows Administrator manually stops a task it will be ignored now and not
+longer results in an error now.
diff --git a/ChangeLog b/ChangeLog
index c16bbc3..854b854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -352,6 +352,7 @@
* 2072 FIX: agent_netapp, netapp_api_volumes, netapp_api_disks: Improved check
output...
* 2075 FIX: check_mk_agent: fixed formatting error for windows eventlog entries >
2048 characters...
* 2077 FIX: Windows MSI Installer: fixed automatical install of agent plugins...
+ * 1244 FIX: windows_tasks: Fixed handling of tasks manually stopped by admin...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/checks/windows_tasks b/checks/windows_tasks
index 2c520b2..f9ef25d 100644
--- a/checks/windows_tasks
+++ b/checks/windows_tasks
@@ -67,7 +67,7 @@ def check_windows_tasks(item, _no_params, info):
state = 0
label = ""
msg = []
- if last_result not in [ 0, 0x00041301, 0x00041325 ]: # SCHED_S_TASK_RUNNING,
SCHED_S_TASK_QUEUED
+ if last_result not in [ 0, 0x00041301, 0x00041325, 0x00041306 ]: # RUNNING,
QUEUED, CANCELD
state = 2
label = "(!!)"
msg.append("Service in state: %s%s" % ( last_result, label ) )