Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1818 FIX dell_poweredge_cpu: Fix exception where BrandName is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: a2417078b8caeeb30752e82eddf531a376f597eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2417078b8caee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 28 15:57:54 2014 +0100 #1818 FIX dell_poweredge_cpu: Fix exception where BrandName is missing --- .werks/1818 | 10 ++++++++ ChangeLog | 1 + checks/dell_poweredge_cpu | 61 ++++++++++++++++++++++----------------------- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/.werks/1818 b/.werks/1818 new file mode 100644 index 0000000..d952968 --- /dev/null +++ b/.werks/1818 @@ -0,0 +1,10 @@ +Title: dell_poweredge_cpu: Fix exception where BrandName is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1419778658 + + diff --git a/ChangeLog b/ChangeLog index 9520bde..5d7bb3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * 1793 FIX: fritz: avoid Exception in inventory function of fritz checks if agent output is empty * 1795 FIX: Fix internal exception in WATO rule for filesystems... * 1522 FIX: quantum_libsmall_door, quantum libsmall_status: Fixed broken scan function + * 1818 FIX: dell_poweredge_cpu: Fix exception where BrandName is missing Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/dell_poweredge_cpu b/checks/dell_poweredge_cpu index 5c13a34..7886a45 100644 --- a/checks/dell_poweredge_cpu +++ b/checks/dell_poweredge_cpu @@ -24,55 +24,54 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def inventory_dell_poweredge_cpu(info): - inventory = [] - for line in info[0]: - if line[5] != "" and line[2] != "1": - inventory.append( ( line[5], None ) ) - return inventory + for chassisIndex, Index, StateSettings, Status, LocationName in info[0]: + if LocationName != "" and StateSettings != "1": + yield LocationName, None + def check_dell_poweredge_cpu(item, _no_params, info): - for chassisIndex, Index, StateSettings, Status, Reading, LocationName in info[0]: + for chassisIndex, Index, StateSettings, Status, LocationName in info[0]: if item == LocationName: + BrandName = None for line in info[1]: if line[0] == chassisIndex and line[1] == Index: BrandName = line[2] state_table = { - "1" : ( "other", 1 ), - "2" : ( "unknown", 1 ), - "3" : ( "", 0 ), - "4" : ( "nonCritical", 1 ), - "5" : ( "Critical", 2 ), - "6" : ( "NonRecoverable", 2 ), + "1" : ("other", 1), + "2" : ("unknown", 1), + "3" : ("", 0), + "4" : ("non-critical", 1), + "5" : ("critical", 2), + "6" : ("non-recoverable", 2), } - state_txt, state = state_table.get(Status, ( "unknown state", 2 )) - infotext = "%s %s" % ( BrandName, state_txt ) + + infotext, state = state_table.get(Status, ( "unknown state", 2 )) + if BrandName: + infotext += " " + BrandName return state, infotext - return 3, "CPU not found" check_info["dell_poweredge_cpu"] = { "check_function" : check_dell_poweredge_cpu, "inventory_function" : inventory_dell_poweredge_cpu, "service_description" : "%s", - "has_perfdata" : False, - "snmp_info" : [ ( ".1.3.6.1.4.1.674.10892.5.4.1100.32.1", [ - "1", # processorDevicechassisIndex - "2", # processorDeviceIndex - #"3", # processorDeviceStateCapabilities - "4", # processorDeviceStateSettings - "5", # processorDeviceStatus - "6", # processorDeviceReading - "7", # processorDeviceLocationName - ]), - ( ".1.3.6.1.4.1.674.10892.5.4.1100.30.1", [ - "1", # processorDevicechassisIndex - "2", # processorDeviceIndex - "23", # processorDeviceBrandName - ]), - ], + "snmp_info" : [( ".1.3.6.1.4.1.674.10892.5.4.1100.32.1", [ + 1, # processorDevicechassisIndex + 2, # processorDeviceIndex + 4, # processorDeviceStateSettings + 5, # processorDeviceStatus + 7, # processorDeviceLocationName + ]), + ( ".1.3.6.1.4.1.674.10892.5.4.1100.30.1", [ + 1, # processorDevicechassisIndex + 2, # processorDeviceIndex + 23, # processorDeviceBrandName + ]) + ], "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.5", }

9 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 215e7fec7a15ecd66f10315a293d13b2dc405342 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=215e7fec7a15ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 28 15:56:06 2014 +0100 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 179dea5..c6aaf49 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1818 +1838

9 years, 9 months

Check_MK Git: check_mk: #1797 FIX Fix incomplete configuration during checking when using CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: 1c4e1bcca78b550eec65bad3b92e9a3b2dee0fa8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c4e1bcca78b55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 11:36:15 2014 +0100 #1797 FIX Fix incomplete configuration during checking when using CMC This also affected the Discovery checks - which didn't honor any rules that affected the service discovery (e.g. diskstat inventory mode). --- .werks/1797 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk.py | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1797 b/.werks/1797 new file mode 100644 index 0000000..0c754d1 --- /dev/null +++ b/.werks/1797 @@ -0,0 +1,11 @@ +Title: Fix incomplete configuration during checking when using CMC +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1419330925 + +This also affected the Discovery checks - which didn't honor any rules that +affected the service discovery (e.g. diskstat inventory mode). diff --git a/ChangeLog b/ChangeLog index b4d664e..9520bde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package... * 1791 FIX: Fix problem where many bogus RRD files for Check_MK service would be created... * 1792 FIX: Fix path to special agents in case of manual installation + * 1797 FIX: Fix incomplete configuration during checking when using CMC... Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index 045a7d3..f5b6e1c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -330,7 +330,7 @@ def load_checks(): value = None ignored_variable_types = [ type(lambda: None), type(os) ] - known_vars = set(vars().keys()) # track new configuration variables + known_vars = set(globals().keys()) # track new configuration variables for f in filelist: if not f.endswith("~"): # ignore emacs-like backup files @@ -342,7 +342,7 @@ def load_checks(): raise sys.exit(5) - for varname, value in vars().iteritems(): + for varname, value in globals().iteritems(): if varname[0] != '_' \ and varname not in known_vars \ and type(value) not in ignored_variable_types: @@ -351,6 +351,8 @@ def load_checks(): # Now convert check_info to new format. convert_check_info() +load_checks() + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ |

9 years, 9 months

Check_MK Git: check_mk: #1522 FIX quantum_libsmall_door,

by Konstantin Büttner

quantum libsmall_status: Fixed broken scan function Message-ID: <5499449a.cqCoeVWKmG91My/8%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 80f86ae5488d6cb6adcb31c9c24eda9e51046b0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80f86ae5488d6c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 23 11:26:04 2014 +0100 #1522 FIX quantum_libsmall_door, quantum libsmall_status: Fixed broken scan function --- .werks/1522 | 10 ++++++++++ ChangeLog | 1 + checks/quantum_libsmall_door | 3 +-- checks/quantum_libsmall_status | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/1522 b/.werks/1522 new file mode 100644 index 0000000..60a7c3e --- /dev/null +++ b/.werks/1522 @@ -0,0 +1,10 @@ +Title: quantum_libsmall_door, quantum libsmall_status: Fixed broken scan function +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1419330317 + + diff --git a/ChangeLog b/ChangeLog index 49a0bd5..b4d664e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 1772 FIX: lparstat_aix: Check handles already working agent output again * 1793 FIX: fritz: avoid Exception in inventory function of fritz checks if agent output is empty * 1795 FIX: Fix internal exception in WATO rule for filesystems... + * 1522 FIX: quantum_libsmall_door, quantum libsmall_status: Fixed broken scan function Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/quantum_libsmall_door b/checks/quantum_libsmall_door index cd4d1ea..0fde464 100644 --- a/checks/quantum_libsmall_door +++ b/checks/quantum_libsmall_door @@ -45,6 +45,5 @@ check_info['quantum_libsmall_door'] = { "inventory_function" : inventory_quantum_libsmall_door, "service_description" : "Tape library door", "snmp_info" : (".1.3.6.1.4.1.3697.1.10.10.1.15.2", [ "0" ]), - "snmp_scan_function" : lambda oid: "library" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function" : lambda oid: "library" in oid(".1.3.6.1.2.1.1.6.0").lower(), } - diff --git a/checks/quantum_libsmall_status b/checks/quantum_libsmall_status index abe9377..0e2ce63 100644 --- a/checks/quantum_libsmall_status +++ b/checks/quantum_libsmall_status @@ -73,6 +73,6 @@ check_info['quantum_libsmall_status'] = { OID_END, "10", ]), - "snmp_scan_function" : lambda oid: "library" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "snmp_scan_function" : lambda oid: "library" in oid(".1.3.6.1.2.1.1.6.0").lower(), }

9 years, 9 months

Check_MK Git: check_mk: #1796 FIX Fix filtering in Multisite View BI Boxes

by Mathias Kettner

Module: check_mk Branch: master Commit: 491d6e91e51539e3a7c9af4994ebe0b0d368acca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=491d6e91e51539… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 11:19:29 2014 +0100 #1796 FIX Fix filtering in Multisite View BI Boxes In this view always all hosts would be displayed, not just those of the group in question. This has been fixed. --- .werks/1796 | 11 ++++++++ ChangeLog | 1 + web/htdocs/bi.py | 17 +++++++----- web/plugins/views/bi.py | 9 ++++++ web/plugins/views/builtin.py | 63 +++++++++++++++++++++++------------------- 5 files changed, 65 insertions(+), 36 deletions(-) diff --git a/.werks/1796 b/.werks/1796 new file mode 100644 index 0000000..8adae8b --- /dev/null +++ b/.werks/1796 @@ -0,0 +1,11 @@ +Title: Fix filtering in Multisite View BI Boxes +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1419329931 + +In this view always all hosts would be displayed, not just those of the +group in question. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 9271e43..49a0bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 1798 FIX: Filters are now retained when adding a view to a dashboard... * 1799 FIX: Dashboards: Existing views added to dashboards now get a correct title / title_url * 1800 FIX: Fixed umlauts and HTML tags in exception texts... + * 1796 FIX: Fix filtering in Multisite View BI Boxes... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 12f5f51..95d74ce 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1181,14 +1181,14 @@ def get_status_info(required_hosts): # This variant of the function is configured not with a list of # hosts but with a livestatus filter header and a list of columns # that need to be fetched in any case -def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetch_parents = True): +def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetch_parents = True, bygroup=False): columns = [ "name", "state", "hard_state", "plugin_output", "scheduled_downtime_depth", "acknowledged", "services_with_fullstate", "parents" ] + add_columns html.live.set_only_sites(only_sites) html.live.set_prepend_site(True) - query = "GET hosts\n" + query = "GET hosts%s\n" % (bygroup and "bygroup" or "") query += "Columns: " + (" ".join(columns)) + "\n" query += filter_header @@ -1220,7 +1220,7 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc parent_filter += [ 'Filter: name = %s\n' % p for p in row[7] ] parent_filter_txt = ''.join(parent_filter) parent_filter_txt += 'Or: %d\n' % len(parent_filter) - for row in get_status_info_filtered(filter_header, only_sites, limit, add_columns, False): + for row in get_status_info_filtered(filter_header, only_sites, limit, add_columns, False, bygroup): if row['name'] not in hostnames: rows.append(row) @@ -1788,12 +1788,15 @@ def table(columns, add_headers, only_sites, limit, filters): # Table of all host aggregations, i.e. aggregations using data from exactly one host def hostname_table(columns, add_headers, only_sites, limit, filters): - return singlehost_table(columns, add_headers, only_sites, limit, filters, True) + return singlehost_table(columns, add_headers, only_sites, limit, filters, True, bygroup=False) + +def hostname_by_group_table(columns, add_headers, only_sites, limit, filters): + return singlehost_table(columns, add_headers, only_sites, limit, filters, True, bygroup=True) def host_table(columns, add_headers, only_sites, limit, filters): - return singlehost_table(columns, add_headers, only_sites, limit, filters, False) + return singlehost_table(columns, add_headers, only_sites, limit, filters, False, bygroup=False) -def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbyname): +def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbyname, bygroup): log("--------------------------------------------------------------------\n") log("* Starting to compute singlehost_table (joinbyname = %s)\n" % joinbyname) load_assumptions() # user specific, always loaded @@ -1810,7 +1813,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam log("* Getting status information about hosts...\n") host_columns = filter(lambda c: c.startswith("host_"), columns) - hostrows = get_status_info_filtered(filter_code, only_sites, limit, host_columns, config.bi_precompile_on_demand) + hostrows = get_status_info_filtered(filter_code, only_sites, limit, host_columns, config.bi_precompile_on_demand, bygroup) log("* Got %d host rows\n" % len(hostrows)) # if limit: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index d5476da..86ba469 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -60,6 +60,15 @@ multisite_datasources["bi_hostname_aggregations"] = { "idkeys" : [ 'aggr_name' ], } +# The same but with group information +multisite_datasources["bi_hostnamebygroup_aggregations"] = { + "title" : _("BI Hostname by Hostgroup Aggregations"), + "table" : bi.hostname_by_group_table, + "infos" : [ "host", "aggr", "hostgroup" ], + "keys" : [], + "idkeys" : [ 'aggr_name' ], +} + # ____ _ _ # | _ \ __ _(_)_ __ | |_ ___ _ __ ___ diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index d2d6dfb..a0714b4 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2861,35 +2861,40 @@ multisite_builtin_views.update({ 'user_sortable': 'on'}, # Hostgroup with boxed BIs for each host -'aggr_hostgroup_boxed': {'browser_reload': 0, - 'column_headers': 'off', - 'datasource': 'bi_hostname_aggregations', - 'description': _('Hostgroup with boxed BIs for each host'), - 'group_painters': [('site_icon', None), - ('sitealias', 'sitehosts')], - 'hard_filters': [], - 'hard_filtervars': [], - 'hidden': True, - 'hide_filters': ['hostgroup'], - 'icon' : 'aggr', - 'layout': 'boxed', - 'linktitle': _('BI Boxes'), - 'mustsearch': False, - 'name': 'hostgroup', - 'num_columns': 2, - 'owner': 'admin', - 'painters': [('host_state', None), - ('host', 'host'), - ('host_icons', None), - ('alias', None), - ('aggr_treestate_boxed', None), - ], - 'play_sounds': False, - 'public': True, - 'show_filters': [ 'siteopt', 'hostregex', 'aggr_group' ], - 'sorters': [('site', False), ('site_host', False)], - 'title': _('Hostgroup with BI state'), - 'topic': _('hidden')}, +'aggr_hostgroup_boxed': { + 'browser_reload' : 0, + 'column_headers' : 'off', + 'context' : { + 'aggr_group': {'aggr_group' : ''}, + 'hostregex' : {'host_regex' : ''}, + }, + 'datasource' : 'bi_hostnamebygroup_aggregations', + 'description' : u'Hostgroup with boxed BIs for each host\n', + 'group_painters' : [ + ('site_icon', '', None), + ('sitealias', 'sitehosts', None), + ], + 'hidden' : True, + 'hidebutton' : False, + 'icon' : 'aggr', + 'layout' : 'boxed', + 'linktitle' : u'BI Boxes', + 'name' : 'aggr_hostgroup_boxed', + 'num_columns' : 2, + 'painters' : [ + ('host_state', None, None), + ('host', 'host', None), + ('host_icons', None, None), + ('alias', None, None), + ('aggr_treestate_boxed', None, None), + ], + 'public' : True, + 'single_infos' : ['hostgroup'], + 'sorters' : [('site', False), ('site_host', False)], + 'title' : u'Hostgroup with BI state', + 'topic' : u'hidden', + 'user_sortable' : True +}, # +----------------------------------------------------------------------+

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2267

by Mathias Kettner

Module: check_mk Branch: master Commit: af109c80354711f1152ece3523b583fe6e7f7436 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af109c80354711… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 09:39:37 2014 +0100 Updated bug entries #2267 --- .bugs/2267 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2267 b/.bugs/2267 new file mode 100644 index 0000000..2bef5f1 --- /dev/null +++ b/.bugs/2267 @@ -0,0 +1,12 @@ +Title: Handle situations with too many open events better +Component: ec +State: open +Date: 2014-12-23 09:38:15 +Targetversion: 1.2.5i1 +Class: nastiness + +We need to add a configurable upper limit for the number of open +events and handle this gracefully. We could e.g. create a new +artificial event "Too many open Events". If we are in the state of +too many open events further events should just be archived with +a special state "OVERFLOW".

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2266

by Mathias Kettner

Module: check_mk Branch: master Commit: e3606d767df2a798b9dda4941b65becf10f684b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3606d767df2a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 09:30:21 2014 +0100 Updated bug entries #2266 --- .bugs/2266 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2266 b/.bugs/2266 new file mode 100644 index 0000000..655d015 --- /dev/null +++ b/.bugs/2266 @@ -0,0 +1,11 @@ +Title: LDAP-Logfile create exception if directory does not exist +Component: wato +State: open +Date: 2014-12-23 09:28:57 +Targetversion: 1.2.5i1 +Class: bug + +Anyway we should move the log messages of the LDAP connecttor +to some central place. It needn't be a separate Logfile. We should +create one central multisite.log or the like and put everything there. +With log levels and a similar format as cmc.log.

9 years, 9 months

Check_MK Git: check_mk: Fix missing var_dir in Event Console web GUI for non-OMD installations

by Mathias Kettner

Module: check_mk Branch: master Commit: ab559e59c80369d8bef3bfc06acbb9092574e56c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab559e59c80369… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 10:17:57 2014 +0100 Fix missing var_dir in Event Console web GUI for non-OMD installations --- mkeventd/web/htdocs/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index ba5c480..737d1a1 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -37,7 +37,7 @@ except: run_dir = defaults.livestatus_unix_socket.rsplit("/",1)[0] socket_path = run_dir + "/mkeventd/status" pipe_path = run_dir + "/mkeventd/events" - snmp_mibs_dir = var_dir + "/mkeventd/mibs" + snmp_mibs_dir = defaults.var_dir + "/mkeventd/mibs" syslog_priorities = [ (0, "emerg" ),

9 years, 9 months

Check_MK Git: check_mk: Updated ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: e3cd64f5f08091a4a239532dfd77fcfef25e8056 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3cd64f5f08091… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 22 16:44:49 2014 +0100 Updated ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index f990db4..9271e43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 1208 FIX: cifsmounts: Detects now unreachable CIFS mounts * 1772 FIX: lparstat_aix: Check handles already working agent output again * 1793 FIX: fritz: avoid Exception in inventory function of fritz checks if agent output is empty + * 1795 FIX: Fix internal exception in WATO rule for filesystems... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...

9 years, 9 months

Check_MK Git: check_mk: #1795 Fix internal exception in WATO rule for filesystems

by Mathias Kettner

Module: check_mk Branch: master Commit: d5d8ff5b4054ac23cb82e75c218628eba70a3d45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5d8ff5b4054ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 22 16:44:15 2014 +0100 #1795 Fix internal exception in WATO rule for filesystems In the WATO rule for filesystems there was a bug such that you could not configure any filesystem levels. This has been fixed. The bug had been introduced recently. --- .werks/1795 | 11 +++++++++++ web/htdocs/htmllib.py | 3 ++- web/htdocs/valuespec.py | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1795 b/.werks/1795 new file mode 100644 index 0000000..0d4c285 --- /dev/null +++ b/.werks/1795 @@ -0,0 +1,11 @@ +Title: Fix internal exception in WATO rule for filesystems +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1419262975 +Class: fix + +In the WATO rule for filesystems there was a bug such that you +could not configure any filesystem levels. This has been fixed. +The bug had been introduced recently. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index cf2bd5d..12d7912 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -529,7 +529,8 @@ class html: sorted.sort(lambda a,b: cmp(a[1].lower(), b[1].lower())) self.select(varname, sorted, deflt, onchange, attrs) - # Choices is a list pairs of (key, title) + # Choices is a list pairs of (key, title). They keys of the choices + # and the default value must be of type None, str or unicode. def select(self, varname, choices, deflt="", onchange=None, attrs = {}): current = self.var_utf8(varname, deflt) onchange_code = onchange and " onchange=\"%s\"" % (onchange) or "" diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5d14de3..14568e1 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -323,7 +323,8 @@ class Filesize(Integer): exp, count = self.get_exponent(value) html.number_input(varprefix + '_size', count, size = self._size) html.write(" ") - html.select(varprefix + '_unit', enumerate(self._names), exp) + choices = [ (str(nr), name) for (nr, name) in enumerate(self._names) ] + html.select(varprefix + '_unit', choices, str(exp)) def from_html_vars(self, varprefix): try:

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014