Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 471b9f6c439793fcdaa6fea6772462d8d1faa329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=471b9f6c439793… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 27 10:57:24 2015 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e64ac59..b54ebd4 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2243 +2263

9 years, 7 months

Check_MK Git: check_mk: #2233 FIX Fixed WATO folder view and Host Tags search with HTML Entity encoding

by Sven Rueß

Module: check_mk Branch: master Commit: 37d4c5ae0c625f9ea74596fb2bb9d536e4e91c5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d4c5ae0c625f… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Apr 27 09:41:59 2015 +0200 #2233 FIX Fixed WATO folder view and Host Tags search with HTML Entity encoding Fixed WATO folder view to show correct indent of folder structure again without escaping HTML Entities. Fixed Host Tags search to show correct operators without escaping HTML Entities. --- .werks/2233 | 12 ++++++++++++ ChangeLog | 1 + Makefile | 2 +- web/htdocs/htmllib.py | 25 +++++++++++++++++++------ web/plugins/visuals/filters.py | 2 +- web/plugins/visuals/wato.py | 2 +- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.werks/2233 b/.werks/2233 new file mode 100644 index 0000000..2d325b4 --- /dev/null +++ b/.werks/2233 @@ -0,0 +1,12 @@ +Title: Fixed WATO folder view and Host Tags search with HTML Entity encoding +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430120013 + +Fixed WATO folder view to show correct indent of folder structure again without +escaping HTML Entities. +Fixed Host Tags search to show correct operators without escaping HTML Entities. diff --git a/ChangeLog b/ChangeLog index 7b65cb3..46960a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -412,6 +412,7 @@ * 2168 FIX: Fixed automation actions with transid=-1 when using basic authentication * 2177 FIX: Host/Service statistics dashlets honor the site filter correctly now * 1957 FIX: Fixed default value for text input fields in notification plugins... + * 2233 FIX: Fixed WATO folder view and Host Tags search with HTML Entity encoding... WATO: * 1760 Added search form to manual checks page diff --git a/Makefile b/Makefile index ce7eee2..aa50058 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ CONFDIR = /etc/$(NAME) LIBDIR = $(PREFIX)/lib/$(NAME) DISTNAME = $(NAME)-$(VERSION) TAROPTS = --owner=root --group=root --exclude=.svn --exclude=*~ \ - --exclude=.gitignore --exclude=.*.swp --exclude=.f12 + --exclude=.gitignore --exclude=*.swp --exclude=.f12 # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 857f142..c5bfe1a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -559,9 +559,23 @@ class html: self.form_vars.append(varname) def sorted_select(self, varname, choices, deflt="", onchange=None, attrs = {}): + def sort_function(a, b): + aStr = bStr = '' + + if isinstance(a[1], HTML): + aStr = a[1].value + else: + aStr = a[1] + if isinstance(b[1], HTML): + bStr = b[1].value + else: + bStr = b[1] + + return cmp(aStr.lower(), bStr.lower()) + # Sort according to display texts, not keys sorted = choices[:] - sorted.sort(lambda a,b: cmp(a[1].lower(), b[1].lower())) + sorted.sort(sort_function) self.select(varname, sorted, deflt, onchange, attrs) # Choices is a list pairs of (key, title). They keys of the choices @@ -572,15 +586,14 @@ class html: attrs.setdefault('size', 1) attributes = ' ' + ' '.join([ '%s="%s"' % (k, v) for k, v in attrs.iteritems() ]) - self.write("<select%s name=\"%s\" id=\"%s\"%s>\n" % - (onchange_code, varname, varname, attributes)) + self.write("<select%s name=\"%s\" id=\"%s\"%s>\n" % (onchange_code, varname, varname, attributes)) for value, text in choices: if value == None: value = "" - sel = value == current and " selected" or "" - self.write("<option value=\"%s\"%s>%s</option>\n" % + sel = value == current and " SELECTED" or "" + self.write('<option value="%s"%s>%s</option>\n' % (self.attrencode(value), sel, self.attrencode(text))) - self.write("</select>\n") + self.write('</select>\n') if varname: self.form_vars.append(varname) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 5fb04c8..255ecba 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -887,7 +887,7 @@ class FilterHostTags(Filter): groups = [ (e[0], e[1].lstrip("/") ) for e in config.wato_host_tags ] operators = [ ("is", _("=")), - ("isnot", _("≠")), + ("isnot", HTML(_("≠"))), ] # replace unicode strings, before writing out as "json" diff --git a/web/plugins/visuals/wato.py b/web/plugins/visuals/wato.py index 4185f7d..f464219 100644 --- a/web/plugins/visuals/wato.py +++ b/web/plugins/visuals/wato.py @@ -88,7 +88,7 @@ class FilterWatoFile(Filter): else: title_prefix = "" self.path_to_tree[my_path] = folder["title"] - sel = [ (my_path , title_prefix + folder["title"]) ] + sel = [ (my_path , HTML(title_prefix + html.attrencode(folder["title"]))) ] sel += self.sublist(folder.get(".folders", {}), my_path, depth) return sel

9 years, 7 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: ecaf4094daf1c32091fac0b9f49847978e462da3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecaf4094daf1c3… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Apr 27 09:32:06 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f9bef4a..e64ac59 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2233 +2243

9 years, 7 months

Check_MK Git: check_mk: if.include: Added comment

by Konstantin Büttner

Module: check_mk Branch: master Commit: cb403dfcd8cc757365135864904640000829e17e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb403dfcd8cc75… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 24 17:31:16 2015 +0200 if.include: Added comment --- checks/if.include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checks/if.include b/checks/if.include index 88bcd27..657c37e 100644 --- a/checks/if.include +++ b/checks/if.include @@ -512,6 +512,9 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou return check_if_common_single(item, params, info, has_nodeinfo=has_nodeinfo, group_name = group_name) +# TODO: Check what the relationship between Errors, Discards, and ucast/mcast actually is. +# One case of winperf_if appeared to indicate that in that case Errors = Discards. + def check_if_common_single(item, params, info, force_counter_wrap = False, has_nodeinfo = False, group_members = None, group_name = "Group"): # Params now must be a dict. Some keys might

9 years, 7 months

Check_MK Git: check_mk: #2214 icom_repeater: New set of checks for Icom repeaters

by Konstantin Büttner

Module: check_mk Branch: master Commit: 10e14099e34e85df0b9dbf5bbb7f3a7f13fb896f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10e14099e34e85… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 24 17:21:03 2015 +0200 #2214 icom_repeater: New set of checks for Icom repeaters New set of checks to monitor temperature, power supply voltage, PLL lock voltage and operation status for Icom repeater devices. --- .werks/2214 | 10 ++ ChangeLog | 1 + checks/icom_repeater | 213 ++++++++++++++++++++++++++++++---- web/plugins/metrics/check_mk.py | 3 + web/plugins/wato/check_parameters.py | 80 +++++++++++++ 5 files changed, 287 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=10e14099e3…

9 years, 7 months

Check_MK Git: check_mk: printer_io.include: Support for yet unkown unit

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4bf7dd97a6156ed147071d90f36d516a0aa88474 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bf7dd97a6156e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Apr 24 13:30:43 2015 +0200 printer_io.include: Support for yet unkown unit --- checks/printer_io.include | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/checks/printer_io.include b/checks/printer_io.include index f52dbf3..79599f1 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -25,13 +25,14 @@ # Boston, MA 02110-1301 USA. printer_io_units = { - '3': 'tenThousandthsOfInches', - '4': 'micrometers', - '8': 'sheets', - '16': 'feet', - '17': 'meters', - '18': 'items', - '19': 'percent', + '-1' : "unk.", + '3' : 'tenThousandthsOfInches', + '4' : 'micrometers', + '8' : 'sheets', + '16' : 'feet', + '17' : 'meters', + '18' : 'items', + '19' : 'percent', } printer_io_states = {

9 years, 7 months

Check_MK Git: check_mk: Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 9f22aa7769654326351e97b5d1331dcddfebb961 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f22aa77696543… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 24 12:11:19 2015 +0200 Updated Werk description --- .werks/2204 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.werks/2204 b/.werks/2204 index 14a3d4f..3e3b413 100644 --- a/.werks/2204 +++ b/.werks/2204 @@ -12,3 +12,7 @@ network interfaces (switch ports). The latter are available in a new status view, where you can search ports for various criteria - e.g. all ports where the type is Ethernet and that are down for at least one month. All you need to do is to activate the HW/SW-Inventory for such devices. + +There is also a view with overal statistics of used and free ethernet ports +of hosts. You can configure via a new rule set <i>Parameters for switch port +inventory</i> which ports should be considere used and free.

9 years, 7 months

Check_MK Git: check_mk: #2224 FIX Fixed sorting in inventory based views

by Mathias Kettner

Module: check_mk Branch: master Commit: 5b82c73eff28ff0765689005d1cca4f58c4acc58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b82c73eff28ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 24 12:09:29 2015 +0200 #2224 FIX Fixed sorting in inventory based views When sorting an inventory base table like <i>CPU related inventory of hosts</i> and the sort column was one of the inventory columns then the sorting was wrong. This has been fixed. --- .werks/2224 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2224 b/.werks/2224 new file mode 100644 index 0000000..fd5237a --- /dev/null +++ b/.werks/2224 @@ -0,0 +1,12 @@ +Title: Fixed sorting in inventory based views +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429870112 + +When sorting an inventory base table like <i>CPU related inventory of hosts</i> +and the sort column was one of the inventory columns then the sorting was +wrong. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 99ce600..34307d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -527,6 +527,7 @@ * 2148 FIX: win_os: Fixed inventory of OS with older powershell versions * 2108 FIX: win_bios win_disks win_system win_video: these inventory checks can now handle colons in the output * 2197 FIX: win_reg_uninstall: Fix exception in case of invalid output line... + * 2224 FIX: Fixed sorting in inventory based views... 1.2.6b1: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index c6fcf1c..17b2742 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -46,7 +46,7 @@ def paint_host_inventory(row, invpath): def cmp_inventory_node(a, b, invpath): val_a = inventory.get(a["host_inventory"], invpath) val_b = inventory.get(b["host_inventory"], invpath) - return cmp(a, b) + return cmp(val_a, val_b) inv_filter_info = { "bytes" : { "unit" : _("MB"), "scale" : 1024*1024 },

9 years, 7 months

Check_MK Git: check_mk: Switch port inventory: new view with overal statistics

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d85b3e501074219f5d14fb6ef168af89ff146d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d85b3e5010742… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 24 12:08:04 2015 +0200 Switch port inventory: new view with overal statistics --- inventory/if | 5 ++++- web/plugins/views/inventory.py | 48 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/inventory/if b/inventory/if index 68c39a4..8cb77a2 100644 --- a/inventory/if +++ b/inventory/if @@ -79,7 +79,10 @@ def inv_if(info, params): else: if_available = None - + node = inv_tree("networking.") + node["available_ethernet_ports"] = available_ethernet_ports + node["total_ethernet_ports"] = total_ethernet_ports + node["total_interfaces"] = len(info) inv_info['inv_if'] = { "inv_function" : inv_if, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index fcc5706..c6fcf1c 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -528,6 +528,7 @@ inventory_displayhints.update({ ".hardware.memory.arrays:*.devices:*.size" : { "title" : _("Size"), "paint" : "bytes", }, ".hardware.memory.arrays:*.devices:*.speed" : { "title" : _("Speed"), "paint" : "hz", }, ".hardware.system." : { "title" : _("System") }, + ".hardware.system.product" : { "title" : _("Product") }, ".hardware.storage." : { "title" : _("Storage") }, ".hardware.storage.disks:" : { "title" : _("Block Devices") }, ".hardware.storage.disks:*." : { "title" : _("Block Device %d") }, @@ -579,6 +580,9 @@ inventory_displayhints.update({ ".software.packages:*.path" : { "title" : _("Path"), }, ".networking." : { "title" : _("Networking"), "icon" : "networking" }, + ".networking.total_interfaces" : { "title" : _("Interfaces"), "paint" : "count", }, + ".networking.total_ethernet_ports" : { "title" : _("Ports"), "paint" : "count", }, + ".networking.available_ethernet_ports" : { "title" : _("Ports available"), "paint" : "count", }, ".networking.interfaces:" : { "title" : _("Interfaces"), "render" : render_inv_dicttable, "keyorder" : [ "index", "description", "oper_status", "admin_status", "available", "speed" ], "view" : "invinterface_of_host", }, ".networking.interfaces:*.index" : { "title" : _("Index"), "paint" : "number", "filter" : visuals.FilterInvtableIDRange }, @@ -597,7 +601,7 @@ for invpath, hint in inventory_displayhints.items(): if "*" not in invpath: datatype = hint.get("paint", "str") long_title = inv_titleinfo_long(invpath, None) - declare_inv_column(invpath, datatype, long_title, hint.get("short", long_title)) + declare_inv_column(invpath, datatype, long_title, hint.get("short", hint["title"])) #. @@ -899,6 +903,8 @@ multisite_builtin_views["inv_host"] = { 'sorters' : [], } +generic_host_filters = multisite_builtin_views["allhosts"]["show_filters"] + # View with table of all hosts, with some basic information multisite_builtin_views["inv_hosts_cpu"] = { # General options @@ -951,6 +957,46 @@ multisite_builtin_views["inv_hosts_cpu"] = { } +# View with available and used ethernet ports +multisite_builtin_views["inv_hosts_ports"] = { + # General options + 'datasource' : 'hosts', + 'topic' : _('Inventory'), + 'title' : _('Switch port statisticss'), + 'linktitle' : _('Switch ports (all Hosts)'), + 'description' : _('A list of all hosts with statistics about total, used and free networking interfaces'), + 'public' : True, + 'hidden' : False, + + # Layout options + 'layout' : 'table', + 'num_columns' : 1, + 'browser_reload' : 0, + 'column_headers' : 'pergroup', + 'user_sortable' : True, + 'play_sounds' : False, + 'force_checkboxes' : False, + 'mustsearch' : False, + 'mobile' : False, + + # Columns + 'group_painters' : [], + 'painters' : [ + ('host', 'invinterface_of_host', ''), + ('inv_hardware_system_product', None, ''), + ('inv_networking_total_interfaces', None, ''), + ('inv_networking_total_ethernet_ports', None, ''), + ('inv_networking_available_ethernet_ports', None, ''), + ], + + # Filters + 'hard_filters' : [ 'has_inv' ], + 'hard_filtervars' : [ ('is_has_inv', '1' ), ], + 'hide_filters' : [], + 'show_filters' : generic_host_filters + [], + 'sorters' : [ ('inv_networking_available_ethernet_ports', True) ], +} + #.

9 years, 7 months

Check_MK Git: check_mk: Inventory of switch ports: new column for port availability

by Mathias Kettner

Module: check_mk Branch: master Commit: b719a03eebe26dbe24265af77f6c2ad5f1414bee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b719a03eebe26d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 24 11:40:29 2015 +0200 Inventory of switch ports: new column for port availability A port can now be used or free. You can configure the criteria for that in a new WATO rule in the folder HW/SW-inventory --- inventory/if | 20 +++++++++++++++++++- modules/config.py | 1 + modules/discovery.py | 2 +- modules/inventory.py | 12 +++++++++++- web/htdocs/lib.py | 7 +++++++ web/htdocs/pages.css | 4 ++++ web/htdocs/valuespec.py | 4 ++++ web/htdocs/views.css | 11 +++++++++++ web/plugins/views/inventory.py | 10 +++++++++- web/plugins/visuals/inventory.py | 36 ++++++++++++++++++++++++++++++++---- web/plugins/wato/inventory.py | 27 +++++++++++++++++++++++++++ 11 files changed, 126 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b719a03eeb…

9 years, 7 months

← Newer
1
2
3
4
5
6
7
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015