Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 8136ca8ddc5daee2545dfff6924e748f1eb783bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8136ca8ddc5dae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 12:58:07 2014 +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 8fef301..accf44d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1392 +1402

10 years

Check_MK Git: check_mk: Fix bug when displaying contact group alias in WATO folder details

by Mathias Kettner

Module: check_mk Branch: master Commit: 23fc1edaa23c440819198b3d6838c577b4c7b071 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23fc1edaa23c44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 12:38:06 2014 +0200 Fix bug when displaying contact group alias in WATO folder details --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ef453c0..ea635b4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5904,9 +5904,9 @@ class ContactGroupsAttribute(Attribute): self.load_data() items = self._contactgroups.items() items.sort(cmp = lambda a,b: cmp(a[1]['alias'], b[1]['alias'])) - for name, alias in items: + for name, cgroup in items: if name in value["groups"]: - display_name = alias and alias or name + display_name = cgroup.get("alias", name) texts.append('<a href="wato.py?mode=edit_contact_group&edit=%s">%s</a>' % (name, display_name)) result = ", ".join(texts) if texts and value["use"]:

10 years

Check_MK Git: check_mk: Fix bug in contact group editor if no NagVis maps exist

by Mathias Kettner

Module: check_mk Branch: master Commit: d2cb583f97f18e1b87fb3a1f320cf8b8d1749248 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2cb583f97f18e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 12:28:49 2014 +0200 Fix bug in contact group editor if no NagVis maps exist --- web/htdocs/wato.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a25e844..ef453c0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7909,7 +7909,7 @@ def mode_edit_group(phase, what): ) if not new: - permitted_maps = groups[name]['nagvis_maps'] + permitted_maps = groups[name].get('nagvis_maps', []) else: permitted_maps = [] @@ -7980,7 +7980,8 @@ def mode_edit_group(phase, what): alias = name html.text_input("alias", alias) - if edit_nagvis_map_permissions: + # Show permissions for NagVis maps if any of those exist + if edit_nagvis_map_permissions and get_nagvis_maps(): forms.header(_("Permissions")) forms.section(_("Access to NagVis Maps")) html.help(_("Configure access permissions to NagVis maps."))

10 years

Check_MK Git: check_mk: Visuals: fix two bugs in edit mode for views

by Mathias Kettner

Module: check_mk Branch: master Commit: 7c75931eeac50982a651c23214583c45ebca1d4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c75931eeac509… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 12:21:43 2014 +0200 Visuals: fix two bugs in edit mode for views --- web/htdocs/views.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0d4a3a0..d6ba10d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -622,7 +622,7 @@ def render_view_config(view): for ident, vs in view_editor_specs(view['context_type'], ds_name): ty = visuals.context_types[view['context_type']] if ident == 'filters' and type(ty['parameters']) == list: - value = view[ident] + value = view.get(ident, []) # "filters" might be missing, for single-context views else: value = view vs.render_input(ident, value) @@ -1393,13 +1393,16 @@ def get_limit(): return config.soft_query_limit def view_title(view): - extra_titles = [ ] + extra_titles = [] datasource = multisite_datasources[view["datasource"]] tablename = datasource["table"] context_type = visuals.context_types[view['context_type']] if context_type['single']: - extra_titles = [ v for k, v in visuals.get_context_html_vars(view) ] + # Beware: if a single context view is being visited *without* a context, then + # the value of the context variable(s) is None. In order to avoid exceptions, + # we simply drop these here. + extra_titles = [ v for k, v in visuals.get_context_html_vars(view) if v != None ] else: used_filters = [ multisite_filters[fn] for fn in view["context"].keys() ] for filt in used_filters: @@ -1407,7 +1410,9 @@ def view_title(view): if heading: extra_titles.append(heading) - title = _u(view["title"]) + " " + ", ".join(extra_titles) + title = _u(view["title"]) + if extra_titles: + title += " " + ", ".join(extra_titles) for fn in ubiquitary_filters: # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view

10 years

Check_MK Git: check_mk: Updated bug entries #2160, #2161

by Mathias Kettner

Module: check_mk Branch: master Commit: 081ca5531b8e91fb1ecac526c528709e80d864d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=081ca5531b8e91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 12:21:20 2014 +0200 Updated bug entries #2160, #2161 --- .bugs/2160 | 10 ++++++++++ .bugs/2161 | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/.bugs/2160 b/.bugs/2160 new file mode 100644 index 0000000..9ab473d --- /dev/null +++ b/.bugs/2160 @@ -0,0 +1,10 @@ +Title: Visuals: when single-context views are shown without context, show proper error +Component: multisite +State: open +Date: 2014-09-02 12:18:00 +Targetversion: future +Class: bug + +In the table of all views, a single-context view should either not be clickable +(except it has its context hard coded). Also we should display a useful error +if the view is being called directly via URL. diff --git a/.bugs/2161 b/.bugs/2161 new file mode 100644 index 0000000..47e1fd1 --- /dev/null +++ b/.bugs/2161 @@ -0,0 +1,11 @@ +Title: Visual: single-context views with hardcoded context should not display filter +Component: multisite +State: open +Date: 2014-09-02 12:20:34 +Targetversion: future +Class: bug + +Currently the filter is being displayed, with an Warning icon, and any changes are silently +ignored. + +The filter should not be visible in that case.

10 years

Check_MK Git: check_mk: New internal function time time measurement

by Mathias Kettner

Module: check_mk Branch: master Commit: 9eb49e281280b336707e209f974900860fe44a5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eb49e281280b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 2 11:52:04 2014 +0200 New internal function time time measurement --- web/htdocs/htmllib.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 48215ac..9486e38 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -79,6 +79,11 @@ class html: self.current_transid = None self.page_context = {} + # Time measurement + self.times = {} + self.start_time = time.time() + self.last_measurement = self.start_time + RETURN = 13 SHIFT = 16 CTRL = 17 @@ -849,6 +854,15 @@ class html: (url, img, tooltip) else: h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) + + if self.times: + self.measure_time('body') + h += '<div class=execution_times>' + entries = self.times.items() + entries.sort() + for name, duration in entries: + h += "<div>%s: %.1fms</div>" % (name, duration * 1000) + h += '</div>' return h def show_error(self, msg): @@ -1374,3 +1388,11 @@ class html: def get_cached(self, name): return self.caches.get(name) + + def measure_time(self, name): + self.times.setdefault(name, 0.0) + now = time.time() + elapsed = now - self.last_measurement + self.times[name] += elapsed + self.last_measurement = now +

10 years

Check_MK Git: check_mk: logwatch: Fixed inventory

by Bastian Kuhn

Module: check_mk Branch: master Commit: 28f56214f4a61309082139b3e77d4a28a6b72850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28f56214f4a613… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Sep 2 11:35:05 2014 +0200 logwatch: Fixed inventory --- checks/logwatch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index bd4065e..549ea5a 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -83,7 +83,7 @@ def inventory_logwatch(info): if groups: continue else: - inventory.append((logfile, None)) + inventory.append((logfile, [])) return inventory @@ -283,7 +283,7 @@ def inventory_logwatch_groups(info): for group in groups: if group not in added_groups: added_groups.append(group) - inventory.append((group, None )) + inventory.append((group, [] )) return inventory def check_logwatch_groups(item, params, info):

10 years

Check_MK Git: check_mk: Wato Filesystem Rule:

by Bastian Kuhn

trend_showtimeleft can now be disabled Message-ID: <5404923f.dzvLVCTlzG1LHIbH%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 4c71cf17dac5e86d3d98e87eddeb72ec672e72a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c71cf17dac5e8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 1 17:35:11 2014 +0200 Wato Filesystem Rule: trend_showtimeleft can now be disabled --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index dee31e8..063bb47 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1956,7 +1956,7 @@ filesystem_elements = [ Integer(title = _("Critical if below"), unit = _("hours"), default_value = 6, ), ])), ( "trend_showtimeleft", - FixedValue(True, title = _("Display timeleft in check output"), totext = "", + Checkbox( title = _("Display timeleft in check output"), label = _("Enable"), help = _("Normally the timeleft until disk full is only displayed when " "the configured levels have been breached. If you set this option " "the check always reports this information"))

10 years

Check_MK Git: check_mk: #0656 brocade_fcport: inventory rule can now choose upon physical und operations states as well, state choices were also updated

by Goetz Golla

Module: check_mk Branch: master Commit: 359e639588c9500db22de5faa0c7f8f5522b1ad3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=359e639588c950… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 1 17:04:30 2014 +0200 #0656 brocade_fcport: inventory rule can now choose upon physical und operations states as well, state choices were also updated --- .werks/656 | 9 +++++++++ ChangeLog | 1 + checks/brocade_fcport | 7 +++++-- web/plugins/wato/check_mk_configuration.py | 24 ++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 18 +++++++++++++++++- 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/.werks/656 b/.werks/656 new file mode 100644 index 0000000..c06b0f2 --- /dev/null +++ b/.werks/656 @@ -0,0 +1,9 @@ +Title: brocade_fcport: inventory rule can now choose upon physical und operations states as well, state choices were also updated +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1409583785 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fe7d199..9a938af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 1150 netstat: new check for monitoring TCP/UDP connections and Linux and AIX... * 0654 oracle_instance: now also monitors the log mode * 1176 winperf_msx_queues: The list of counters for inventory can now be configured host based using wato + * 0656 brocade_fcport: inventory rule can now choose upon physical und operations states as well, state choices were also updated * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 21fc214..3e1fbb9 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -27,7 +27,8 @@ # lookup tables for check implementation # Taken from swFCPortPhyState brocade_fcport_phystates = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', - 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef' ] + 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef', + 'validating', 'invalidModule', 'noSigDet', 'unkown' ] # Taken from swFCPortOpStatus brocade_fcport_opstates = [ 'unknown', 'online', 'offline', 'testing', 'faulty' ] # Taken from swFCPortAdmStatus @@ -50,7 +51,7 @@ isl_speed = { } # settings for inventory: which ports should be inventorized -brocade_fcport_inventory_phystates = [ 3, 4, 5, 6, 7, 8, 9, ] +brocade_fcport_inventory_phystates = [ 3, 4, 5, 6, 7, 8, 9, 10 ] brocade_fcport_inventory_opstates = [ 1, 2, 3, 4, ] brocade_fcport_inventory_admstates = [ 1, 3, 4, ] brocade_fcport_inventory_use_portname = True # use swFCPortName as part of service description @@ -87,6 +88,8 @@ def inventory_brocade_fcport(info): uses_portname = settings.get('use_portname', brocade_fcport_inventory_use_portname) shows_isl = settings.get('show_isl', brocade_fcport_inventory_show_isl) admstates = settings.get('admstates', brocade_fcport_inventory_admstates) + opstates = settings.get('opstates', brocade_fcport_inventory_opstates) + phystates = settings.get('phystates', brocade_fcport_inventory_phystates) inventory = [] isl_ports = {} diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5af2c78..6f19786 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1264,6 +1264,30 @@ _brocade_fcport_adm_choices = [ ( 4, 'faulty(4)'), ] +_brocade_fcport_op_choices = [ + ( 0, 'unkown(0)'), + ( 1, 'online(1)'), + ( 2, 'offline(2)'), + ( 3, 'testing(3)'), + ( 4, 'faulty(4)'), + ] + +_brocade_fcport_phy_choices = [ + ( 1, 'noCard(1)'), + ( 2, 'noTransceiver(2)'), + ( 3, 'laserFault(3)'), + ( 4, 'noLight(4)'), + ( 5, 'noSync(5)'), + ( 6, 'inSync(6)'), + ( 7, 'portFault(7)'), + ( 8, 'diagFault(8)'), + ( 9, 'lockRef(9)'), + ( 10, 'validating(10)'), + ( 11, 'invalidModule(11)'), + ( 14, 'noSigDet(14)'), + ( 255, 'unkown(255)'), + ] + _if_porttype_choices = [ ("1", "other(1)" ), ("2", "regular1822(2)" ), ("3", "hdh1822(3)" ), ("4", "ddnX25(4)" ), ("5", "rfc877x25(5)" ), ("6", "ethernetCsmacd(6)" ), ("7", "iso88023Csmacd(7)" ), ("8", diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index dee31e8..42d9b8b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -298,8 +298,24 @@ register_rule(group + '/' + subgroup_inventory, toggle_all = True, default_value = ['1', '3', '4' ], )), + ("phystates", ListChoice(title = _("Physical port states to inventorize"), + help = _("When doing inventory on brocade switches only ports with the given physical " + "states will be added to the monitoring system."), + choices = _brocade_fcport_phy_choices, + columns = 1, + toggle_all = True, + default_value = [ 3, 4, 5, 6, 7, 8, 9, 10 ] + )), + ("opstates", ListChoice(title = _("Operational port states to inventorize"), + help = _("When doing inventory on brocade switches only ports with the given operational " + "states will be added to the monitoring system."), + choices = _brocade_fcport_op_choices, + columns = 1, + toggle_all = True, + default_value = [ 1, 2, 3, 4 ] + )), ], - help = _('This mule can be used to control the inventory for brocade ports. ' + help = _('This rule can be used to control the inventory for brocade ports. ' 'You can configure the port states for inventory ' 'and the use of the description as service name.'), ),

10 years

Check_MK Git: check_mk: #1151 Add variables (HOST/SERVICE)ACK(AUTHOR/ COMMENT) to notification context

by Mathias Kettner

Module: check_mk Branch: master Commit: 00c51f41b625ef8b8077470056c632797e25fe8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00c51f41b625ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 1 16:50:06 2014 +0200 #1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context The four variables <tt>HOSTACKAUTHOR</tt>, <tt>HOSTACKCOMMENT</tt>, <tt>SERVICEACKAUTHOR</tt> and <tt>SERVICEACKCOMMENT</tt> can now be used. In notifications for acknowledgements these variables reflect the author and the comment of the acknowledgement. --- .werks/1151 | 13 +++++++++++++ ChangeLog | 1 + check_mk_templates.cfg | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/.werks/1151 b/.werks/1151 new file mode 100644 index 0000000..229a7fe --- /dev/null +++ b/.werks/1151 @@ -0,0 +1,13 @@ +Title: Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1409582877 +Class: feature + +The four variables <tt>HOSTACKAUTHOR</tt>, <tt>HOSTACKCOMMENT</tt>, +<tt>SERVICEACKAUTHOR</tt> and <tt>SERVICEACKCOMMENT</tt> can now be used. In +notifications for acknowledgements these variables reflect the author and +the comment of the acknowledgement. + diff --git a/ChangeLog b/ChangeLog index 02982da..ec60de6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ * 1101 FIX: WATO check parameter: renamed 'Nominal Voltages' to 'Voltage Levels..' Notifications: + * 1151 Add variables (HOST/SERVICE)ACK(AUTHOR/COMMENT) to notification context... * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index d0469b5..7cef53f 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -395,6 +395,10 @@ define command { NOTIFY_NOTIFICATIONAUTHOR='$NOTIFICATIONAUTHOR$' \ NOTIFY_NOTIFICATIONAUTHORNAME='$NOTIFICATIONAUTHORNAME$' \ NOTIFY_NOTIFICATIONAUTHORALIAS='$NOTIFICATIONAUTHORALIAS$' \ + NOTIFY_SERVICEACKAUTHOR='$SERVICEACKAUTHOR$' \ + NOTIFY_SERVICEACKCOMMENT='$SERVICEACKCOMMENT$' \ + NOTIFY_HOSTACKAUTHOR='$HOSTACKAUTHOR$' \ + NOTIFY_HOSTACKCOMMENT='$HOSTACKCOMMENT$' \ NOTIFY_HOSTGROUPNAMES='$HOSTGROUPNAMES$' \ NOTIFY_HOSTTAGS='$_HOSTTAGS$' \ NOTIFY_HOST_SL='$_HOSTEC_SL$' \

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014