Module: check_mk
Branch: master
Commit: 324079221210c64477836092e8904761775e828c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324079221210c6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Oct 14 11:17:43 2011 +0200
FIX: fixed sorting of multiple joined columns
---
ChangeLog | 1 +
web/htdocs/views.py | 39 ++++++++++++++++++++++++---------------
2 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 54b872f..e9c8057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
* FIX: fix URL-too-long in permissions page
* FIX: fix permission computation
* FIX: fixed sorting of service perfdata columns
+ * FIX: fixed sorting of multiple joined columns in some cases
* Cleanup permissions page optically, add comments for views and snapins
* Added some missing i18n strings in general HTML functions
* Added display_option "w" to disable limit messages and livestatus errors in views
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index a59a8fa..cf8af93 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1752,29 +1752,38 @@ def sort_data(data, sorters):
if len(sorters) == 0:
return
- # Join the data in case of sorting with joined data
- # FIXME: Problem: What to do in case of several joined
- # columns of different services which use the same cols?
- for row in data:
- for s in sorters:
- if len(s) > 2:
- row.update(row.get("JOIN", {}).get(s[2], {}))
-
- if len(sorters) == 1:
- data.sort(sorters[0][0]["cmp"], None, sorters[0][1])
- return
+ # Handle case where join columns are not present for all rows
+ def save_compare(compfunc, row1, row2):
+ if row1 == None and row2 == None:
+ return 0
+ elif row1 == None:
+ return -1
+ elif row2 == None:
+ return 1
+ else:
+ return compfunc(row1, row2)
- sort_cmps = [(s[0]["cmp"], (s[1] and -1 or 1)) for s in sorters]
+ sort_cmps = []
+ for s in sorters:
+ cmpfunc = s[0]["cmp"]
+ negate = s[1] and -1 or 1
+ if len(s) > 2:
+ joinkey = s[2] # e.g. service description
+ else:
+ joinkey = None
+ sort_cmps.append((cmpfunc, negate, joinkey))
def multisort(e1, e2):
- for func, neg in sort_cmps:
- c = neg * func(e1, e2)
+ for func, neg, joinkey in sort_cmps:
+ if joinkey: # Sorter for join column, use JOIN info
+ c = neg * save_compare(func, e1["JOIN"].get(joinkey), e2["JOIN"].get(joinkey))
+ else:
+ c = neg * func(e1, e2)
if c != 0: return c
return 0 # equal
data.sort(multisort)
-
# Create a list of filters allowed for a certain data source.
# Each filter is valid for a special info, e.g. "host" or
# "service". or always (info is None in that case).
Module: check_mk
Branch: master
Commit: 324004bd25daff64f55127dfdf65efedfd78da1e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324004bd25daff…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Oct 14 12:04:33 2011 +0200
FIX: fixed sorting of multiple joined columns in some cases
---
web/htdocs/views.py | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index cf8af93..0d470e4 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -2388,12 +2388,7 @@ def get_separated_sorters(view):
return group_sort, user_sort, view_sort
-def get_painter_join_index(view, painter):
- for e in view["painters"]:
- if e[0] == painter['name'] and len(e) >= 5:
- return e[3]
-
-def sort_url(view, painter):
+def sort_url(view, painter, join_index):
"""
The following sorters need to be handled in this order:
@@ -2408,9 +2403,6 @@ def sort_url(view, painter):
sorter = group_sort + user_sort + view_sort
- # When painter is joined, then add the join index as 3rd attribute to tuple
- join_index = get_painter_join_index(view, painter)
-
# Now apply the sorter of the current column:
# - Negate/Disable when at first position
# - Move to the first position when already in sorters
@@ -2451,9 +2443,11 @@ def sort_url(view, painter):
def paint_header(view, p):
painter = p[0]
+ join_index = None
if len(p) >= 4: # join column
if len(p) >= 5 and p[4]:
- t = p[4]
+ t = p[4]
+ join_index = p[3]
else:
t = p[3]
else:
@@ -2472,7 +2466,7 @@ def paint_header(view, p):
and view.get('user_sortable', True) \
and get_sorter_name_of_painter(painter) is not None:
params = [
- ('sort', sort_url(view, painter)),
+ ('sort', sort_url(view, painter, join_index)),
]
if html.has_var('_body_class'):
params.append(('_body_class', html.var('_body_class')))
Module: check_mk
Branch: master
Commit: 0b15164d2a0a8f7d080385851b2eea3f4b5c2c58
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b15164d2a0a8f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 12 09:02:49 2011 +0200
New check bintec_info
New check bintec_info to gather the software version and serial number of bintec routers
---
ChangeLog | 2 ++
checkman/bintec_info | 16 ++++++++++++++++
checks/bintec_info | 47 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c8b53e9..54b872f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
* FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds
* FIX: ntp: Handling large times in "poll" column correctly
* New check dmi_sysinfo to gather basic hardware information
+ * New check bintec_info to gather the software version and serial number
+ of bintec routers
Multisite:
* FIX: fix rescheduling of host check
diff --git a/checkman/bintec_info b/checkman/bintec_info
new file mode 100644
index 0000000..afaa329
--- /dev/null
+++ b/checkman/bintec_info
@@ -0,0 +1,16 @@
+title: Retrieve informational SNMP data about bintec routers
+agents: snmp
+author: Lars Michelsen <lm(a)mathias-kettner.de
+license: GPL
+distribution: check_mk
+description:
+ This check retrieves the {software version} and the {serial number} of bintec
+ routers using SNMP.
+
+ Other needed information like location etc. can be fetched using the snmp_info
+ check.
+
+ The check always reports an OK state.
+
+inventory:
+ One check per SNMP host will be created.
diff --git a/checks/bintec_info b/checks/bintec_info
new file mode 100644
index 0000000..2a21dc8
--- /dev/null
+++ b/checks/bintec_info
@@ -0,0 +1,47 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+def inventory_bintec_info(info):
+ if len(info[0]) >= 1:
+ return [ (None, None) ]
+
+def check_bintec_info(checktype, params, info):
+ if len(info[0]) < 2:
+ return (3, "UNKNOWN - No data retrieved")
+ sw_version, serial = info[0]
+ return (0, "Serial: %s, Software: %s" % (serial, sw_version))
+
+check_info['bintec_info'] = (check_bintec_info, "Bintec Info", 0, inventory_bintec_info)
+# 1.3.6.1.4.1.272.4.1.26.0 SW Version
+# 1.3.6.1.4.1.272.4.1.31.0 S/N
+snmp_info['bintec_info'] = ( ".1.3.6.1.4.1.272.4.1", [
+ '26.0', # SW Version
+ '31.0', # S/N
+ ] )
+
+# This check works on all SNMP hosts
+snmp_scan_functions['bintec_info'] = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == \
+ ".1.3.6.1.4.1.272.4.200.83.88.67.66.0.0"
Module: check_mk
Branch: master
Commit: 90ffb0b658ec09bcddae638d62c25cf04ae929de
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90ffb0b658ec09…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 12 08:59:14 2011 +0200
New check dmi_sysinfo to gather basic hardware information
---
ChangeLog | 1 +
agents/plugins/dmi_sysinfo | 6 +++++
checkman/dmi_sysinfo | 16 ++++++++++++++
checks/dmi_sysinfo | 50 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a53518a..c8b53e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
not on clients
* FIX: mbg_lantime_state: Fixed output UOM to really be miliseconds
* FIX: ntp: Handling large times in "poll" column correctly
+ * New check dmi_sysinfo to gather basic hardware information
Multisite:
* FIX: fix rescheduling of host check
diff --git a/agents/plugins/dmi_sysinfo b/agents/plugins/dmi_sysinfo
new file mode 100644
index 0000000..d0ed1c8
--- /dev/null
+++ b/agents/plugins/dmi_sysinfo
@@ -0,0 +1,6 @@
+#/bin/sh
+
+if which dmidecode >/dev/null 2>&1; then
+ echo "<<<dmi_sysinfo>>>"
+ dmidecode -t 1 -q
+fi
diff --git a/checkman/dmi_sysinfo b/checkman/dmi_sysinfo
new file mode 100644
index 0000000..b6edb6c
--- /dev/null
+++ b/checkman/dmi_sysinfo
@@ -0,0 +1,16 @@
+title: Collects basic hardware infos using dmi
+agents: linux
+author: Lars Michelsen <lm(a)mathias-kettner.de>
+license: GPL
+distribution: check_mk
+description:
+ This check displays basic dmi information provided by hosts using dmidecode like
+ the manufacturer, product-name, version and serial number.
+ The check always reports OK.
+
+ To be able to use this check the binary {dmidecode} needs to be installed on the
+ monitored host and the agent plugin {agents/plugins/dmi_sysinfo} needs to be
+ installed on the system to be monitored.
+
+inventory:
+ One service per host will be created when all requirements are met.
diff --git a/checks/dmi_sysinfo b/checks/dmi_sysinfo
new file mode 100644
index 0000000..936a215
--- /dev/null
+++ b/checks/dmi_sysinfo
@@ -0,0 +1,50 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+# Target
+
+def inventory_dmi_sysinfo(checkname, info):
+ if len(info) > 0 and info[0] == ['System', 'Information']:
+ return [(None, None)]
+
+def check_dmi_sysinfo(item, param, info):
+ if len(info) == 0 or info[0] != ['System', 'Information']:
+ return (3, "UNKNOWN - Invalid information")
+ data = {}
+ for line in info:
+ line = " ".join(line)
+ if ":" in line:
+ key, value = line.split(":")
+ data[key.strip()] = value.strip()
+
+ return (0, "Manufacturer: %s, Product-Name: %s, Version: %s, S/N: %s" % (
+ data.get("Manufacturer", "Unknown"),
+ data.get("Product Name", "Unknown"),
+ data.get("Version", "Unknown"),
+ data.get("Serial Number", "Unknown"),
+ ))
+
+
+check_info['dmi_sysinfo'] = (check_dmi_sysinfo, "DMI Sysinfo", 0, inventory_dmi_sysinfo)