Module: check_mk
Branch: master
Commit: 65a6f0cea00a2197d7054115cc05b8d15d9eb7d1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65a6f0cea00a21…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon May 30 14:10:19 2016 +0200
3581 mssql_versions: Added product name to inventory information
---
.werks/3581 | 9 +++++++++
ChangeLog | 1 +
inventory/mssql_versions | 21 +++++++++++++++++++++
web/plugins/views/inventory.py | 2 +-
4 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/.werks/3581 b/.werks/3581
new file mode 100644
index 0000000..361a894
--- /dev/null
+++ b/.werks/3581
@@ -0,0 +1,9 @@
+Title: mssql_versions: Added product name to inventory information
+Level: 1
+Component: inv
+Compatible: compat
+Version: 1.2.9i1
+Date: 1464610188
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 92c431d..74378f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -464,6 +464,7 @@
* 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and
service tag...
* 3028 statgrab_mem, solaris_mem: updated inventory plugins for solaris systems...
* 3447 mssql_versions: Added inventory plugin for MSSQL instances
+ * 3581 mssql_versions: Added product name to inventory information
* 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly
* 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\
* 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl
only in global zone
diff --git a/inventory/mssql_versions b/inventory/mssql_versions
index f0e6080..7d5421a 100644
--- a/inventory/mssql_versions
+++ b/inventory/mssql_versions
@@ -35,6 +35,26 @@
def inv_mssql_versions(info):
node = inv_tree_list("software.applications.mssql.instances:")
+ def product(v):
+ parts = map(int, v.split("."))
+ if parts[0] == 12:
+ return "SQL Server 2014"
+ elif parts[0] == 11:
+ return "SQL Server 2012"
+ elif parts[0] == 10:
+ if parts[1] == 50:
+ return "SQL Server 2005 R2"
+ else:
+ return "SQL Server 2005"
+ elif parts[0] == 9:
+ return "SQL Server 2005"
+ elif parts[0] == 8:
+ return "SQL Server 2000"
+ elif parts[0] == 7:
+ return "SQL Server 7.0"
+ else:
+ return "Unknown Product"
+
for line in info:
if len(line) not in [2, 4]:
continue
@@ -48,6 +68,7 @@ def inv_mssql_versions(info):
instance = {
"name" : instance_id,
"version" : version,
+ "product" : product(version),
"edition" : edition,
"clustered" : clustered,
"cluster_name" : cluster_name,
diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py
index 6caaea0..012ee83 100644
--- a/web/plugins/views/inventory.py
+++ b/web/plugins/views/inventory.py
@@ -695,7 +695,7 @@ inventory_displayhints.update({
".software.applications.mssql." : { "title" :
_("MSSQL") },
".software.applications.mssql.instances:" : { "title" :
_("Instances"), "render" : render_inv_dicttable,
- "keyorder" : [
"name", "edition", "version", "clustered",
"cluster_name" ],
+ "keyorder" : [
"name", "product", "edition", "version",
"clustered", "cluster_name" ],
},
".software.applications.mssql.instances:*.clustered" : { "title"
: _("Clustered"), "paint" : "mssql_is_clustered"},