[checkmk-commits] Check_MK Git: check_mk: FIX: mssql: Agent plugin now supports MSSQL Server 2012

Module: check_mk Branch: master Commit: 45160a65bef3ffa4beb60b594ec7ca0f099081d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45160a65bef3ff… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Mar 1 10:24:17 2013 +0100 FIX: mssql: Agent plugin now supports MSSQL Server 2012 --- ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7bca96..8724e0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * FIX: megaraid_bbu: deal with broken output ("Adpater") * FIX: check_ldap: added missing host address (check didn't work at all) * FIX: check_ldap: added missing version option -2, -3, -3 -T (TLS) + * FIX: mssql: Agent plugin now supports MSSQL Server 2012 * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index b143457..d990591 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -30,19 +30,26 @@ Set instIds = CreateObject("Scripting.Dictionary") ' Try different trees to handle different versions of MSSQL On Error Resume Next ' MSSQL >= 10 -Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") -If Err.Number <> 0 Then +' try SQL Server 2012: +Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement11") +If Err.Number 0 Then Err.Clear() - - ' MSSQL < 10 - Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") - If Err.Number <> 0 Then - wscript.echo "Error: " & Err.Number & " " & Err.Description + + ' try SQL Server 2008 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") + If Err.Number 0 Then Err.Clear() - wscript.quit() + + ' try MSSQL < 10 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") + If Err.Number 0 Then + wscript.echo "Error: " & Err.Number & " " & Err.Description + Err.Clear() + wscript.quit() + End If End If End If -On Error Goto 0 +On Error Goto 0 For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " & _ "SQLServiceType = 1 AND PropertyName = 'VERSION'")