Module: check_mk
Branch: master
Commit: a838fac5c2ba7a9a7622bd7828e5d08b4dbbf636
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a838fac5c2ba7a…
Author: Marcel Schulte <ms(a)mathias-kettner.de>
Date: Thu Apr 19 10:53:17 2018 +0200
5840 FIX MSSQL plugin: fixed detecting of default instance MSSQLSERVER in AlwaysOn
environments
Change-Id: Id3d7976cc7d6827b1da12f2094976f800917e005
---
.werks/5840 | 10 ++++++++++
agents/windows/plugins/mssql.vbs | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/5840 b/.werks/5840
new file mode 100644
index 0000000..528940a
--- /dev/null
+++ b/.werks/5840
@@ -0,0 +1,10 @@
+Title: MSSQL plugin: fixed detecting of default instance MSSQLSERVER in AlwaysOn
environments
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1524127879
+Class: fix
+
+
diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs
index 92dfb92..e5a8d7d 100644
--- a/agents/windows/plugins/mssql.vbs
+++ b/agents/windows/plugins/mssql.vbs
@@ -183,7 +183,7 @@ For Each rk In regkeys
' Only collect results for instances which services are currently
running
Set service = WMI.ExecQuery("SELECT State FROM Win32_Service "
& _
- "WHERE Name = 'MSSQL$" & instance_id
& "' AND State = 'Running'")
+ "WHERE Name = 'MSSQL$" & instance_id
& "' AND State = 'Running' OR Name = 'MSSQLSERVER' AND State
= 'Running'")
If Not IsNull(service) Then
instances.add instance_id, cluster_name
End If