[checkmk-commits] 6139 mssql_instance: Displays more detailed information of instance version and edition

Module: check_mk Branch: master Commit: 0d14337fd4e02b53144344addb6c0f393bf07734 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d14337fd4e02b… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Mon Jun 25 15:00:20 2018 +0200 6139 mssql_instance: Displays more detailed information of instance version and edition In order to use this feature please install the newest version of the {{mssql.vbs}} agent plugin. Change-Id: I0261f4e6f95bd143eb18f8b09f1183e6430791e7 --- .werks/6139 | 11 +++++++++ agents/windows/plugins/mssql.vbs | 8 +++++++ checks/mssql_instance | 51 +++++++++++++++++++++++++++++++++------- 3 files changed, 62 insertions(+), 8 deletions(-) diff --git a/.werks/6139 b/.werks/6139 new file mode 100644 index 0000000..e570f74 --- /dev/null +++ b/.werks/6139 @@ -0,0 +1,11 @@ +Title: mssql_instance: Displays more detailed information of instance version and edition +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1529931499 +Class: feature + +In order to use this feature please install the newest +version of the {{mssql.vbs}} agent plugin. diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index ef30a2d..f7e7921 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -271,6 +271,14 @@ For Each instance_id In instances.Keys: Do ' Continue trick Exit Do End If + ' add detailed information about version and patchrelease + RS.Open "SELECT SERVERPROPERTY('productversion') as prodversion," & _ + "SERVERPROPERTY ('productlevel') as prodlevel," & _ + "SERVERPROPERTY ('edition') as prodedition", CONN + addOutput("MSSQL_" & instance_id & "|details|" & RS("prodversion") & "|" & _ + RS("prodlevel") & "|" & RS("prodedition")) + RS.Close + ' Get counter data for the whole instance addOutput(sections("counters")) RS.Open "SELECT GETUTCDATE() as utc_date", CONN diff --git a/checks/mssql_instance b/checks/mssql_instance index 4aaa042..31feeb7 100644 --- a/checks/mssql_instance +++ b/checks/mssql_instance @@ -40,9 +40,31 @@ # <<<mssql_instance:sep(124)>>> # ERROR: Failed to gather SQL server instances + +def _parse_prod_version(entry): + if entry.startswith("8."): + version = "2000" + elif entry.startswith("9."): + version = "2005" + elif entry.startswith("10.0"): + version = "2008" + elif entry.startswith("10.50"): + version = "2008R2" + elif entry.startswith("11."): + version = "2012" + elif entry.startswith("12."): + version = "2014" + elif entry.startswith("13."): + version = "2016" + elif entry.startswith("14."): + version = "2017" + else: + return "UNKNOWN" + return "Microsoft SQL Server %s" % version + + def parse_mssql_instance(info): parsed = {} - for line in info: if line[0].startswith("ERROR:"): continue @@ -60,21 +82,28 @@ def parse_mssql_instance(info): if line[1] == "config": instance.update({ - "version" : line[2], - "edition" : line[3], + "version_info" : "%s - %s" % (line[2], line[3]), "cluster_name" : line[4], }) elif line[1] == "state": instance.update({ - "state" : line[2], - "error_msg" : "|".join(line[3:]), + "state" : line[2], + "error_msg" : "|".join(line[3:]), + }) + + elif line[1] == "details": + _parse_prod_version(line[2]) + instance.update({ + "prod_version_info": "%s (%s) (%s) - %s" % ( + _parse_prod_version(line[2]), line[3], line[2], line[4] + ) }) return parsed def inventory_mssql_instance(parsed): - for instance_id, instance in parsed.items(): + for instance_id in parsed.iterkeys(): yield instance_id, {} @@ -91,10 +120,16 @@ def check_mssql_instance(item, params, parsed): if instance["state"] == "0": yield state, "Failed to connect to database (%s)" % instance["error_msg"] - yield 0, "Server is running version %s, %s" % (instance["version"], instance["edition"]) + if "prod_version_info" in instance: + # Newer output of version info + version_info = instance["prod_version_info"] + else: + # Fallback, is always reported by agent plugin + version_info = instance["version_info"] + yield 0, "Version: %s" % version_info if instance["cluster_name"] != "": - yield 0, "clustered as %s" % instance["cluster_name"] + yield 0, "Clustered as %s" % instance["cluster_name"] check_info["mssql_instance"] = {