Module: check_mk
Branch: master
Commit: 21a90c1105908427b657ddae00a7fa26e2c697d8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21a90c11059084…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Apr 10 10:38:55 2013 +0200
mssql.vbs: No longer queries stopped mssql instances
---
ChangeLog | 1 +
agents/windows/plugins/mssql.vbs | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d0f8a00..d76b342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,7 @@
* winperf_processor: introduce averaging, support predictive levels
* cpu_util.include: fixed bug when params are set to None
* predictive levels: fixed bug when existing predictive levels get new options
+ * windows_plugin mssql.vbs: No longer queries stopped mssql instances
Notifications:
* notify.py: unique spoolfiles name no longer created with uuid
diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs
index dc7eaa4..b9fc1c9 100644
--- a/agents/windows/plugins/mssql.vbs
+++ b/agents/windows/plugins/mssql.vbs
@@ -21,7 +21,7 @@
Option Explicit
-Dim WMI, prop, instId, instVersion, instIds, instName, output
+Dim WMI, prop, instId, instVersion, instIds, instName, output, WMIservice, colRunningServices, objService
WScript.Timeout = 10
@@ -64,9 +64,13 @@ If Err.Number <> 0 Then
End If
On Error Goto 0
+Set WMIservice = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2")
+
For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " & _
"SQLServiceType = 1 AND PropertyName = 'VERSION'")
+
+ Set colRunningServices = WMIservice.ExecQuery("SELECT State FROM Win32_Service WHERE Name = '" & prop.ServiceName & "'")
instId = Replace(prop.ServiceName, "$", "_")
instVersion = prop.PropertyStrValue
@@ -75,7 +79,11 @@ For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE "
' Now query the server instance for the databases
' Use name as key and always empty value for the moment
- instIds.add instId, ""
+ For Each objService In colRunningServices
+ If objService.State = "Running" Then
+ instIds.add instId, ""
+ End If
+ Next
Next
Set WMI = nothing
Module: check_mk
Branch: master
Commit: 7572e5a666e3026311c499e68581025d65668cbf
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7572e5a666e302…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 9 14:17:06 2013 +0200
FIX: correctly quote ! and \ in active checks for Nagios
Conflicts:
ChangeLog
---
ChangeLog | 4 ++++
modules/check_mk_base.py | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a7deb2c..6e7c1c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,10 @@
* Configuration of an alternativ host check command
* Inventory: Display link symbol for ps ruleset
+1.2.2p1:
+ Core:
+ * FIX: correctly quote ! and \ in active checks for Nagios
+
1.2.2:
Core:
* Added $HOSTURL$ and $SERVICEURL$ to notification macros which contain an
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 46a7b57..46b61f7 100755
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1449,9 +1449,10 @@ def get_age_human_readable(secs):
return "%d days" % days
# Quote string for use as arguments on the shell (for usage
-# in command definitions as $ARG1$)
+# in command definitions as $ARG1$). Please note that also
+# quoting for ! and \ vor Nagios itself takes place here.
def quote_shell_string(s):
- return "'" + s.replace("'", "'\"'\"'") + "'"
+ return "'" + s.replace('\\', '\\\\').replace("'", "'\"'\"'").replace('!', '\\!') + "'"
# Check if a timeperiod is currently active. We have no other way than