Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: add two missing attrencodes

by Andreas Boesl

Module: check_mk Branch: master Commit: 94f013303467fcfd3c532141485230005c205ed2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94f013303467fc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 17 11:14:19 2014 +0200 add two missing attrencodes --- web/plugins/views/painters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 35b2220..1cd0f17 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -465,14 +465,14 @@ multisite_painters["svc_check_command"] = { "title" : _("Service check command"), "short" : _("Check command"), "columns" : ["service_check_command"], - "paint" : lambda row: (None, row["service_check_command"]), + "paint" : lambda row: (None, html.attrencode(row["service_check_command"])), } multisite_painters["svc_check_command_expanded"] = { "title" : _("Service check command expanded"), "short" : _("Check command expanded"), "columns" : ["service_check_command_expanded"], - "paint" : lambda row: (None, row["service_check_command_expanded"]), + "paint" : lambda row: (None, html.attrencode(row["service_check_command_expanded"])), } multisite_painters["svc_contacts"] = {

10 years

Check_MK Git: check_mk: fixed exception in uptime calculation

by Andreas Boesl

Module: check_mk Branch: master Commit: e355a3a496d15813416254b2019a6d56496ba2b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e355a3a496d158… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 16 14:31:06 2014 +0200 fixed exception in uptime calculation --- checks/hivemanager_devices | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index e3ca09d..6de033a 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -75,11 +75,11 @@ def check_hivemanager_devices(item, params, info): #Uptime if uptime != 'down': - days, hrs, mins, secs = map(int, uptime.split()[::2]) - uptime_secs = secs - uptime_secs += days * 86400 - uptime_secs += hrs * 3600 - uptime_secs += mins * 60 + uptime_tokens = map(int, uptime.split()[-2::-2]) + token_multiplier = [1, 60, 3600, 86400] + uptime_secs = 0 + for idx, entry in enumerate(uptime_tokens): + uptime_secs += token_multiplier[idx] * entry infotext = "Uptime: %s" % get_age_human_readable(uptime_secs) state = 0

10 years

Check_MK Git: check_mk: View editor: only show datasource that make sense

by Mathias Kettner

Module: check_mk Branch: master Commit: 7cf1b0dc7ceb6b6514ede0f8bc2c01a74b5ce979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cf1b0dc7ceb6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 16 14:19:18 2014 +0200 View editor: only show datasource that make sense --- web/htdocs/valuespec.py | 7 ++++++- web/htdocs/views.py | 22 ++++++++++++++++------ web/htdocs/visuals.py | 11 +++++++++-- web/plugins/visuals/context_types.py | 26 +++++++++++++++++++++++--- 4 files changed, 54 insertions(+), 12 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9801552..654a983 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1343,7 +1343,12 @@ class RadioChoice(DropdownChoice): html.write("<table class=radiochoice>") html.write("<tr>") - for n, entry in enumerate(self._choices): + if self._sorted: + choices = self._choices[:] + choices.sort(cmp=lambda a,b: cmp(a[1], b[1])) + else: + choices = self._choices + for n, entry in enumerate(choices): if self._columns != None: html.write("<td>") if len(entry) > 2 and entry[2] != None: # icon! diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8865787..64be415 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -322,24 +322,34 @@ def page_create_view(): # Seconds step: Select the data source def page_create_view_ds(next_url = 'edit_view.py?context_type=%s&datasource=%s'): - context_type = html.var('context_type') + context_type_name = html.var('context_type') available = visuals.context_types.keys() available.remove('global') - if context_type not in available: + if context_type_name not in available: raise MKGeneralException(_('The context type is missing')) + context_type = visuals.context_types[context_type_name] # Filter out datasources which are available for this context type. The # matching is done based on the "info" available for each datasource datasources = [] for ds_name, ds in multisite_datasources.items(): - datasources.append((ds_name, ds['title'], None, ds.get('description'))) - - vs_ds = RadioChoice( + if "infos" in context_type: + skip = False + for needed_info in context_type["infos"]: + if needed_info not in ds["infos"]: + skip = True + break + if not skip: + datasources.append((ds_name, ds['title'])) + + vs_ds = DropdownChoice( title = _('Datasource'), choices = datasources, + sorted = True, help = _('The datasources defines which type of objects should be displayed with this view.'), columns = 1, + default_value = "service", ) html.header(_('Create View'), stylesheets=["pages"]) @@ -353,7 +363,7 @@ def page_create_view_ds(next_url = 'edit_view.py?context_type=%s&datasource=%s') ds = vs_ds.from_html_vars('ds') vs_ds.validate_value(ds, 'ds') - html.http_redirect(next_url % (context_type, ds)) + html.http_redirect(next_url % (context_type_name, ds)) return except MKUserError, e: diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index a208d8f..e1b65b9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -345,10 +345,17 @@ def page_list(what, title, visuals, custom_columns = []): def page_create_visual(what, allow_global = False, next_url = None): what_s = what[:-1] + def cmp_context_titles(a, b): + return - cmp(context_types[a[0]]["single"], context_types[b[0]]["single"]) \ + or cmp(a[1], b[1]) + context_choices = [ (k, v['title']) + for (k, v) in context_types.items() + if (allow_global or k != 'global') ] + context_choices.sort(cmp=cmp_context_titles) + vs_type = DropdownChoice( title = _('Context Type'), - choices = [(None, _('--- Select a Context type ---'))] - + [ (k, v['title']) for k, v in context_types.items() if allow_global or k != 'global' ], + choices = context_choices, help = _('The context of a %s controls the type of objects to be shown. It ' 'also sets wether single or multiple objects are displayed. The context ' 'type of a %s can not be changed anymore.') % (what_s, what_s), diff --git a/web/plugins/visuals/context_types.py b/web/plugins/visuals/context_types.py index 05b287e..7f75b06 100644 --- a/web/plugins/visuals/context_types.py +++ b/web/plugins/visuals/context_types.py @@ -33,6 +33,7 @@ context_types['global'] = { context_types['host'] = { 'title' : _('Single Host'), 'single' : True, + 'infos' : [ "host" ], 'parameters' : [ ('host', TextUnicode( title = _('Hostname'), @@ -43,11 +44,13 @@ context_types['host'] = { context_types['hosts'] = { 'title' : _('Multiple Hosts'), 'single' : False, + 'infos' : [ "host" ], 'parameters' : VisualFilterList(['host']), } context_types['service'] = { 'title' : _('Single Service'), + 'infos' : [ "host", "service" ], 'single' : True, 'parameters' : [ ('host', TextUnicode( @@ -62,12 +65,14 @@ context_types['service'] = { context_types['services'] = { 'title' : _('Multiple Services'), 'single' : False, + 'infos' : [ "host", "service" ], 'parameters' : VisualFilterList(['service', 'host']), } context_types['service_on_hosts'] = { 'title' : _('Single Service on multiple hosts'), 'single' : True, + 'infos' : [ "service" ], 'parameters' : [ ('service', TextUnicode( title = _('Service Description'), @@ -78,6 +83,7 @@ context_types['service_on_hosts'] = { context_types['hostgroup'] = { 'title' : _('Single Hostgroups'), 'single' : True, + 'infos' : [ "hostgroup" ], 'parameters' : [ ('hostgroup', TextUnicode( title = _('Hostgroup Name'), @@ -88,12 +94,14 @@ context_types['hostgroup'] = { context_types['hostgroups'] = { 'title' : _('Multiple Hostgroups'), 'single' : False, + 'infos' : [ "hostgroup" ], 'parameters' : VisualFilterList(['hostgroup', 'hostgroups']), } context_types['servicegroup'] = { 'title' : _('Single Servicegroups'), 'single' : True, + 'infos' : [ "servicegroup" ], 'parameters' : [ ('servicegroup', TextUnicode( title = _('Servicegroup Name'), @@ -104,30 +112,35 @@ context_types['servicegroup'] = { context_types['servicegroups'] = { 'title' : _('Multiple Servicegroups'), 'single' : False, + 'infos' : [ "servicegroup" ], 'parameters' : VisualFilterList(['servicegroup']), } context_types['comments'] = { 'title' : _('Multiple Comments'), 'single' : False, + 'infos' : [ "host", "service" ], 'parameters' : VisualFilterList(['comment', 'host', 'service']), } context_types['downtimes'] = { 'title' : _('Multiple Downtimes'), 'single' : False, + 'infos' : [ "host", "service" ], 'parameters' : VisualFilterList(['downtime', 'host', 'service']), } context_types['logs'] = { 'title' : _('Multiple Log Entries'), 'single' : False, + 'infos' : [ "log", "host", "service" ], 'parameters' : VisualFilterList(['log', 'host', 'service', 'contact', 'command']), } context_types['logs_contact'] = { - 'title' : _('Single Contact Log Entries'), - 'single' : False, + 'title' : _('Single Contact Log Entry'), + 'single' : True, + 'infos' : [ "log", "host", "service" ], 'parameters' : [ ('log_contact_name', TextAscii( title = _('Contact Name'), @@ -138,6 +151,7 @@ context_types['logs_contact'] = { context_types['bi_aggregation'] = { 'title' : _('Single BI Aggregation'), 'single' : True, + 'infos' : [ "aggr" ], 'parameters' : [ ('aggr_name', TextAscii( title = _('Aggregation Name'), @@ -146,14 +160,16 @@ context_types['bi_aggregation'] = { } context_types['bi_aggregations'] = { - 'title' : _('Multiple BI Aggregation'), + 'title' : _('Multiple BI Aggregations'), 'single' : False, + 'infos' : [ "aggr" ], 'parameters' : VisualFilterList(['aggr']), } context_types['bi_host_aggregation'] = { 'title' : _('Single BI Aggregation affected by one host'), 'single' : True, + 'infos' : [ "aggr", "host" ], 'parameters' : [ ('aggr_host', TextAscii( title = _('Hostname'), @@ -164,18 +180,21 @@ context_types['bi_host_aggregation'] = { context_types['bi_host_aggregations'] = { 'title' : _('Multiple Single Host BI Aggregations'), 'single' : False, + 'infos' : [ "aggr", "host" ], 'parameters' : VisualFilterList(['aggr', 'host']), } context_types['bi_hostname_aggregations'] = { 'title' : _('Multiple Single Host BI Aggregations (Aggregation name joined)'), 'single' : False, + 'infos' : [ "aggr", "host" ], 'parameters' : VisualFilterList(['aggr', 'host']), } context_types['bi_aggregation_group'] = { 'title' : _('Single BI Aggregation group'), 'single' : True, + 'infos' : [ "aggr" ], 'parameters' : [ ('aggr_group', TextAscii( title = _('Hostname'), @@ -186,5 +205,6 @@ context_types['bi_aggregation_group'] = { context_types['invswpacs'] = { 'title' : _('Multiple Software Packages'), 'single' : False, + "infos" : [ "host", "invswpac" ], 'parameters' : VisualFilterList(['invswpac', 'host']), }

10 years

Check_MK Git: check_mk: #1401 FIX Display options in views are now again persistent

by Mathias Kettner

Module: check_mk Branch: master Commit: c38a6e78a021c8d27f5339e66889a08489a5a153 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c38a6e78a021c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 16 11:27:04 2014 +0200 #1401 FIX Display options in views are now again persistent When you change a "Display Option" in a view - such as the <i>Time stamp format</i>, then this option was only valid whilst you were visiting that view. This was due to a bug, which was introduced in Januar 2014. This has been fixed now. If you are visiting a view again after changing display options, then these will be persisted forever. Note: the persistance is on a per-user-base and per-view-base. --- .werks/1401 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 43 ++++++++++++++++++++++++------------------- web/htdocs/valuespec.py | 12 ++++++------ web/htdocs/views.py | 35 +++++++++++++++++++++++++---------- 5 files changed, 69 insertions(+), 35 deletions(-) diff --git a/.werks/1401 b/.werks/1401 new file mode 100644 index 0000000..16d7555 --- /dev/null +++ b/.werks/1401 @@ -0,0 +1,13 @@ +Title: Display options in views are now again persistent +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1410859507 +Class: fix + +When you change a "Display Option" in a view - such as the <i>Time stamp format</i>, then +this option was only valid whilst you were visiting that view. This was due to a bug, which +was introduced in Januar 2014. This has been fixed now. If you are visiting a view again +after changing display options, then these will be persisted forever. Note: the persistance +is on a per-user-base and per-view-base. diff --git a/ChangeLog b/ChangeLog index 1532aad..c73328e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... + * 1401 FIX: Display options in views are now again persistent... WATO: * 1096 New WATO webservices: manage hosts via webinterface... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9486e38..3de2f9f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -917,7 +917,31 @@ class html: def set_focus(self, varname): self.focus_object = (self.form_name, varname) + def debug_vars(self, prefix=None, hide_with_mouse=True): + if hide_with_mouse: + hover = ' onmouseover="this.style.display=\'none\';"' + else: + hover = "" + self.lowlevel_write('<table %s class=debug_vars>' % hover) + self.lowlevel_write("<tr><th colspan=2>POST / GET Variables</th></tr>") + for name, value in sorted(self.vars.items()): + if not prefix or name.startswith(prefix): + self.write("<tr><td class=left>%s</td><td class=right>%s</td></tr>\n" % + (self.attrencode(name), self.attrencode(value))) + self.write("</table>") + def var(self, varname, deflt = None): + return self.vars.get(varname, deflt) + + def has_var(self, varname): + return varname in self.vars + + # Checks if a variable with a given prefix is present + def has_var_prefix(self, prefix): + for varname in self.vars: + if varname.startswith(prefix): + return True + return False def var_utf8(self, varname, deflt = None): val = self.vars.get(varname, deflt) @@ -1116,25 +1140,6 @@ class html: self.lowlevel_write("<pre>%s</pre>\n" % pprint.pformat(element)) - def debug_vars(self, prefix=None, hide_with_mouse=True): - if hide_with_mouse: - hover = ' onmouseover="this.style.display=\'none\';"' - else: - hover = "" - self.lowlevel_write('<table %s class=debug_vars>' % hover) - self.lowlevel_write("<tr><th colspan=2>POST / GET Variables</th></tr>") - for name, value in sorted(self.vars.items()): - if not prefix or name.startswith(prefix): - self.write("<tr><td class=left>%s</td><td class=right>%s</td></tr>\n" % - (self.attrencode(name), self.attrencode(value))) - self.write("</table>") - - def var(self, varname, deflt = None): - return self.vars.get(varname, deflt) - - def has_var(self, varname): - return varname in self.vars - def has_cookie(self, varname): return varname in self.cookies diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 593f59b..9801552 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -186,12 +186,12 @@ class Age(ValueSpec): html.write("</div>") def from_html_vars(self, varprefix): - return ( - saveint(html.var(varprefix+'_days')) * 3600 * 24 - + saveint(html.var(varprefix+'_hours')) * 3600 - + saveint(html.var(varprefix+'_minutes')) * 60 - + saveint(html.var(varprefix+'_seconds')) - ) + return ( + saveint(html.var(varprefix+'_days')) * 3600 * 24 + + saveint(html.var(varprefix+'_hours')) * 3600 + + saveint(html.var(varprefix+'_minutes')) * 60 + + saveint(html.var(varprefix+'_seconds')) + ) def value_to_text(self, value): days, rest = divmod(value, 60*60*24) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d4bdb79..8865787 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1302,28 +1302,43 @@ def render_view(view, rows, datasource, group_painters, painters, if 'H' in display_options: html.body_end() +# We should rename this into "painter_options". Also the saved file. def view_options(viewname): # Options are stored per view. Get all options for all views vo = config.load_user_file("viewoptions", {}) + # Now get options for the view in question v = vo.get(viewname, {}) must_save = False + # Now override the loaded options with new option settings that are + # provided by the URL. Our problem: we do not know the URL variables + # that a valuespec expects. But we know the common prefix of all + # variables for each option. if config.may("general.painter_options"): - for on, opt in multisite_painter_options.items(): - vs = opt['valuespec'] - value = vs.from_html_vars('po_' + on) - if value is None: - value = vs.default_value() + for option_name, opt in multisite_painter_options.items(): + old_value = v.get(option_name) + var_prefix = 'po_' + option_name - old_value = v.get(on) + # Are there settings for this painter option present? + if html.has_var_prefix(var_prefix): - v[on] = value - opt['value'] = value + # Get new value for the option from the value spec + vs = opt['valuespec'] + value = vs.from_html_vars(var_prefix) - if v[on] != old_value: - must_save = True + v[option_name] = value + opt['value'] = value # make globally present for painters + + if v[option_name] != old_value: + must_save = True + + else: + opt['value'] = old_value # make globally present for painters + # If the user has no permission for changing painter options + # (or has *lost* his permission) then we need to remove all + # of the options. But we do not save. else: for on, opt in multisite_painter_options.items(): if on in v:

10 years

Check_MK Git: check_mk: #0658 brocade_info: new check to retrieve informational data about Brocade switches

by Goetz Golla

Module: check_mk Branch: master Commit: 8e3595d41637f7228832cc44f821674df2aca527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e3595d41637f7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 15 16:21:53 2014 +0200 #0658 brocade_info: new check to retrieve informational data about Brocade switches --- .werks/658 | 9 +++++ ChangeLog | 1 + checkman/brocade_info | 14 ++++++++ checks/brocade_info | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+) diff --git a/.werks/658 b/.werks/658 new file mode 100644 index 0000000..0963c9c --- /dev/null +++ b/.werks/658 @@ -0,0 +1,9 @@ +Title: brocade_info: new check to retrieve informational data about Brocade switches +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410790889 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1f57693..1532aad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 0657 diskstat: cluster support added for single disk modes * 1111 vCenter monitoring: greatly improved performance (at least 40 times faster)... * 1112 esx_vsphere_hostsystem.mem_usage_cluster: allows to monitor total RAM usage of all nodes in a cluster... + * 0658 brocade_info: new check to retrieve informational data about Brocade switches * 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/checkman/brocade_info b/checkman/brocade_info new file mode 100644 index 0000000..3e5a83f --- /dev/null +++ b/checkman/brocade_info @@ -0,0 +1,14 @@ +title: Retrieve informational SNMP data about Brocade switches +agents: snmp +catalog: hw/storagehw/brocade +license: GPL +distribution: check_mk +description: + This check retrieves the {model name}, {soft serial number}, {firmware + version}, and {WWN} of Brocade switches using SNMP. + + Depending on the firmware version only part of the information may be + available. + +inventory: + One check per host will be created. diff --git a/checks/brocade_info b/checks/brocade_info new file mode 100644 index 0000000..f11bd03 --- /dev/null +++ b/checks/brocade_info @@ -0,0 +1,95 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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_brocade_info(info): + data = "".join(brocade_info_try_it(info)) + if data != "----": + return [ ( None, None ) ] + +def brocade_info_try_it(info): + try: + model = info[0][0][0] + except: + model = "-" + try: + wwn = info[2][0][0] + except: + wwn = "-" + try: + fw = info[1][0][0] + except: + fw = "-" + try: + ssn = info[1][0][1] + except: + ssn = "-" + + return model, ssn, fw, wwn + +def brocade_info_parse_wwn(val): + if val == "": + val = "-" + elif val != "-": + val = ":".join(val.split(" ")[:8]) + return val + +def check_brocade_info(item, params, info): + model, ssn, fw, wwn = brocade_info_try_it(info) + data = "".join((model, ssn, fw, wwn)) + if data != "----": + wwn = brocade_info_parse_wwn(wwn) + infotext = "Model: %s, SSN: %s, Firmware Version: %s, WWN: %s" % ( model, ssn, fw, wwn ) + return 0, infotext + else: + return 3, "no information found" + +check_info["brocade_info"] = { + 'check_function' : check_brocade_info, + 'inventory_function' : inventory_brocade_info, + 'service_description' : 'Brocade Info', + 'has_perfdata' : False, + 'snmp_info' : [ + ( ".1.3.6.1.2.1.47.1.1.1.1.2", + [ + 1, # entPhysicalDescr.1 + ], + ), + ( ".1.3.6.1.4.1.1588.2.1.1.1.1", + [ + 6, # swFirmwareVersion + 10, # swSsn + ] + ), + ( ".1.3.6.1.3.94.1.6.1", + [ + 1, # connUnitId + ], + ), + ], + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1"), +}

10 years

Check_MK Git: check_mk: #1116 FIX megaraid_ldisk: now longer raises an exception for adapters with ' No Virtual Drive Configured'

by Andreas Boesl

Module: check_mk Branch: master Commit: 74a5358a72c3a12670d8285a833265aa389e4e04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74a5358a72c3a1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 15 16:01:46 2014 +0200 #1116 FIX megaraid_ldisk: now longer raises an exception for adapters with 'No Virtual Drive Configured' --- .werks/1116 | 9 +++++++++ ChangeLog | 1 + checks/megaraid_ldisks | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/1116 b/.werks/1116 new file mode 100644 index 0000000..f19949b --- /dev/null +++ b/.werks/1116 @@ -0,0 +1,9 @@ +Title: megaraid_ldisk: now longer raises an exception for adapters with 'No Virtual Drive Configured' +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410789580 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7769aab..1f57693 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 1110 FIX: windows agent: fixed missing agent section problem if a cached script ran into a timeout... * 1113 FIX: oracle_rman: fixed exception when backup was currently running * 1114 FIX: bluecat_threads: no longer detected on wrong systems... + * 1116 FIX: megaraid_ldisk: now longer raises an exception for adapters with 'No Virtual Drive Configured' Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/megaraid_ldisks b/checks/megaraid_ldisks index 59f69e8..097fa40 100644 --- a/checks/megaraid_ldisks +++ b/checks/megaraid_ldisks @@ -47,6 +47,7 @@ def inventory_megaraid_ldisks(info): def check_megaraid_ldisks(item, _no_params, info): adapter = None + found = False for line in info: l = ' '.join(line) if line[0] == "Adapter" and not l.endswith('No Virtual Drive Configured.'):

10 years

Check_MK Git: check_mk: diskstat: fix old checks for item "read" and "write "

by Mathias Kettner

Module: check_mk Branch: master Commit: 503cee725a10e00de930f0fa3f5179bd17faf1ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=503cee725a10e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 15 14:31:05 2014 +0200 diskstat: fix old checks for item "read" and "write" --- checks/diskstat.include | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index 6d2690e..a095b8a 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -251,16 +251,15 @@ def check_diskstat_old(item, params, this_time, info): else: return (3, "invalid item %s" % (item,)) - #this_val = sum([int(x[index]) for x in info if ' ' not in x[1]]) this_val = 0 for line in info: if line[0] != None: return 3, "read/write mode not supported in a cluster" if ' ' not in line[1]: - thisval += int(x[index]) + this_val += int(line[index]) timedif, per_sec = get_counter("diskstat." + item, this_time, this_val) mb_per_s = per_sec / 2048.0 # Diskstat output is in sectors a 512 Byte kb_per_s = per_sec / 2.0 perfdata = [ (item, "%f" % kb_per_s ) ] - return (0, "%.1fMB/s (in last %d secs)" % (mb_per_s, timedif), perfdata) + return (0, "%.1f MB/s (in last %d secs)" % (mb_per_s, timedif), perfdata)

10 years

Check_MK Git: check_mk: Main dashboard: *really* show only unack' ed host problems

by Mathias Kettner

Module: check_mk Branch: master Commit: 727c8e56752dd6f79419120a02c452b7933a69e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=727c8e56752dd6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 15 12:41:08 2014 +0200 Main dashboard: *really* show only unack'ed host problems --- web/plugins/dashboard/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 58877c1..c6f5659 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -71,7 +71,7 @@ builtin_dashboards["main"] = { 'hstp': '', }, 'summary_host': {'is_summary_host': '0'}, - 'host_acknowledged': {'is_host_acknowledged': '-1'}, + 'host_acknowledged': {'is_host_acknowledged': '0'}, 'host_scheduled_downtime_depth': {'is_host_scheduled_downtime_depth': '0'}, }, 'hidden': True,

10 years

Check_MK Git: check_mk: Minor code cleanup in oracle_recovery_status

by Mathias Kettner

Module: check_mk Branch: master Commit: 876aa303f6ea87e122fc11f2f09881dd9f8695f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=876aa303f6ea87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 15 12:07:58 2014 +0200 Minor code cleanup in oracle_recovery_status --- checks/oracle_recovery_status | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/oracle_recovery_status b/checks/oracle_recovery_status index af29600..2c7eaf9 100644 --- a/checks/oracle_recovery_status +++ b/checks/oracle_recovery_status @@ -65,7 +65,7 @@ def check_oracle_recovery_status(item, params, info): if oldest_checkpoint_age == -1: infotext += ", no online datafiles found(!!)" - state = max(2, state) + state = 2 else: infotext += ", oldest Checkpoint %s ago" \ % (get_age_human_readable(int(oldest_checkpoint_age))) @@ -87,7 +87,7 @@ def check_oracle_recovery_status(item, params, info): # check the checkpoint age on a non primary database! if oldest_checkpoint_age >= crit: infotext += '(!!)' - state = max(2, state) + state = 2 elif oldest_checkpoint_age >= warn: infotext += '(!)' state = max(1, state) @@ -95,7 +95,7 @@ def check_oracle_recovery_status(item, params, info): if offlinecount > 0: infotext += " %i datafiles offline(!!)" \ % (offlinecount) - state = max(2, state) + state = 2 return state, infotext, perfdata

10 years

Check_MK Git: check_mk: Made texts in new visuals better l10nable

by Mathias Kettner

Module: check_mk Branch: master Commit: d3edbb873e230feba70e944dc0a5e5170610ad45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3edbb873e230f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 15 12:05:05 2014 +0200 Made texts in new visuals better l10nable --- web/htdocs/dashboard.py | 2 +- web/htdocs/views.py | 2 +- web/htdocs/visuals.py | 18 +++++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 6253536..d29e416 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -592,7 +592,7 @@ def ajax_dashlet(): def page_edit_dashboards(): load_dashboards() - visuals.page_list('dashboards', dashboards) + visuals.page_list('dashboards', _("Edit Dashboards"), dashboards) #. # .--Create Dashb.-------------------------------------------------------. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index dfaa22f..d4bdb79 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -302,7 +302,7 @@ def save_views(us): def page_edit_views(): load_views() cols = [ (_('Datasource'), lambda v: multisite_datasources[v["datasource"]]['title']) ] - visuals.page_list('views', multisite_views, cols) + visuals.page_list('views', _("Edit Views"), multisite_views, cols) #. # .--Create View---------------------------------------------------------. diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 21316fc..a208d8f 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -229,18 +229,15 @@ def available(what, all_visuals): # | Show a list of all visuals with actions to delete/clone/edit | # '----------------------------------------------------------------------' -def page_list(what, visuals, custom_columns = []): +def page_list(what, title, visuals, custom_columns = []): what_s = what[:-1] if not config.may("general.edit_" + what): - raise MKAuthException(_("You are not allowed to edit %s.") % what) + raise MKAuthException(_("Sorry, you lack the permission for editing this type of visuals.")) - html.header(_("Edit %s") % what, stylesheets=["pages","views","status"]) - html.help(_("Here you can create and edit customizable <b>views</b>. A view " - "displays monitoring status or log data by combining filters, sortings, " - "groupings and other aspects.")) + html.header(title, stylesheets=["pages", "views", "status"]) html.begin_context_buttons() - html.context_button(_('Create %s') % what_s.title(), 'create_%s.py' % what_s, what_s) + html.context_button(_('New'), 'create_%s.py' % what_s, "new") if what != 'views': html.context_button(_('Views'), 'edit_views.py', 'view') if what != 'dashboards': @@ -277,7 +274,7 @@ def page_list(what, visuals, custom_columns = []): builtin.append((owner, visualname, visual)) for title, items in [ (_('Custom'), custom), (_('Builtin'), builtin) ]: - html.write('<h3>' + title + ' ' + what.title() + '</h3>') + html.write('<h3>' + title + '</h3>') table.begin(css = 'data', limit = None) @@ -292,8 +289,7 @@ def page_list(what, visuals, custom_columns = []): html.icon_button("edit_%s.py?load_name=%s" % (what_s, visualname), _("Edit"), "edit") # Clone / Customize - buttontext = not owner and _("Customize this %s") % what_s \ - or _("Create a clone of this %s") % what_s + buttontext = _("Create a customized copy of this") backurl = html.urlencode(html.makeuri([])) clone_url = "edit_%s.py?load_user=%s&load_name=%s&back=%s" \ % (what_s, owner, visualname, backurl) @@ -302,7 +298,7 @@ def page_list(what, visuals, custom_columns = []): # Delete if owner == config.user_id: html.icon_button(html.makeactionuri([('_delete', visualname)]), - _("Delete this %s!") % what_s, "delete") + _("Delete!"), "delete") # visual Name table.cell(_('ID'), visualname)

10 years

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014