Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64655 discussions

Check_MK Git: check_mk: fixed exception when querying esx host

by Andreas Boesl

Module: check_mk Branch: master Commit: c1a1268f2c0daa8c5a1d1bd59f632b2eba052469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1a1268f2c0daa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 18 11:48:54 2014 +0200 fixed exception when querying esx host --- agents/special/agent_vsphere | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 45edf35..12b034d 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -642,7 +642,7 @@ try: systeminfo[entry] = function and function(element[0]) or element[0] elif name == "login": my_cookie = reply_headers.get("Set-Cookie") - if reply_msg != "OK": + if "InvalidLogin" in reply_data: raise Exception("Login response is not 'OK'. Please check the credentials") except Exception, e: @@ -890,7 +890,8 @@ if not error: print "<<<esx_vsphere_objects:sep(9)>>>" if "hostsystem" in query_objects: if opt_direct and opt_hostname: - print "hostsystem\t%s\t\t%s" % ( opt_hostname, hostsystems_properties[hostname]["runtime.powerState"][0] ) + for hostname, data in hostsystems_properties.items(): + print "hostsystem\t%s\t\t%s" % ( opt_hostname, hostsystems_properties[hostname]["runtime.powerState"][0] ) else: for hostname, data in hostsystems_properties.items(): print "hostsystem\t%s\t\t%s" % ( convert_hostname(hostsystems_properties[hostname]["name"][0]),

10 years

Check_MK Git: check_mk: agent_vsphere: fixed invalid piggyback section when using direct mode

by Andreas Boesl

Module: check_mk Branch: master Commit: fad58d937377cdc284023bfdbdd720d06033803f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fad58d937377cd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 18 11:26:03 2014 +0200 agent_vsphere: fixed invalid piggyback section when using direct mode --- agents/special/agent_vsphere | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 8d2410a..45edf35 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -807,9 +807,7 @@ if not error: # TODO: improve error handling: check if multiple results and opt_direct for hostname, properties in hostsystems_properties.items(): - if opt_direct and opt_hostname: - print "<<<<%s>>>>" % opt_hostname - else: + if not opt_direct: print "<<<<%s>>>>" % convert_hostname(properties["name"][0]) print "<<<esx_vsphere_hostsystem>>>"

10 years

Check_MK Git: check_mk: #1402 FIX Fixed cased where counting events did not reach required count

by Mathias Kettner

Module: check_mk Branch: master Commit: c3702f776df8dc87b8495b864ece66bdbd26f2db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3702f776df8dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 17 15:17:18 2014 +0200 #1402 FIX Fixed cased where counting events did not reach required count This bug was found and fixed by Andreas Döhler! --- .werks/1402 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1402 b/.werks/1402 new file mode 100644 index 0000000..9f7dc27 --- /dev/null +++ b/.werks/1402 @@ -0,0 +1,9 @@ +Title: Fixed cased where counting events did not reach required count +Level: 2 +Component: ec +Compatible: compat +Version: 1.2.5i6 +Date: 1410959775 +Class: fix + +This bug was found and fixed by Andreas Döhler! diff --git a/ChangeLog b/ChangeLog index c73328e..49e2596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 1395 Event Console can now create notifications via Check_MK RBN... * 1007 FIX: check_mkevents: fix case where events contain binary zeroes * 1399 FIX: Fix left-over tac processes when showing Event Console history... + * 1402 FIX: Fixed cased where counting events did not reach required count... HW/SW-Inventory: * 0643 windows inventory: OS now contains the install date, reg_uninstall now contains the path... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index ee18dc5..9a59be8 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1206,7 +1206,7 @@ class EventServer: if event["first"] + count["period"] <= now: # End of period reached log("Rule %s: reached only %d out of %d events within %d seconds. " "Resetting to zero." % (rule["id"], event["count"], count["count"], count["period"])) - event["phase"] = closed + event["phase"] = "closed" log_event_history(event, "COUNTFAILED") events_to_delete.append(nr)

10 years

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 2c249f93a2cfd540c7b6e8c261f4856afc8fc18d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c249f93a2cfd5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 17 15:15:59 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 accf44d..5b23536 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1402 +1412

10 years

Check_MK Git: check_mk: fixed werk display

by Andreas Boesl

Module: check_mk Branch: master Commit: a208610496861ac83c7279260a0c71fe05029a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a208610496861a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 17 11:54:34 2014 +0200 fixed werk display --- .werks/973 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/973 b/.werks/973 index 7d8eaed..7e06f22 100644 --- a/.werks/973 +++ b/.werks/973 @@ -13,7 +13,7 @@ Renaming a host is a complex precedure that will not only rename the host in WAT but also in: <ul> -<li>all rules from <i>Host & Service Parameters</i></li> +<li>all rules from Host & Service Parameters</li> <li>cluster's node definitions</li> <li>a host's parent definitions</li> <li>Business Intelligence rules</li>

10 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits