Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Fix rendering of network interface speeds

by Mathias Kettner

Module: check_mk Branch: master Commit: c0dd4945e9e52f293d7a2fafa01dbcb2809048f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0dd4945e9e52f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 17 16:51:05 2015 +0200 Fix rendering of network interface speeds --- modules/check_mk_base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 746b585..b0c9784 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1952,11 +1952,11 @@ def get_nic_speed_human_readable(speed): speed = "100 Mbit/s" elif speedi == 1000000000: speed = "1 Gbit/s" - elif speed < 1500: + elif speedi < 1500: speed = "%d bit/s" % speedi - elif speed < 1000000: + elif speedi < 1000000: speed = "%.1f Kbit/s" % (speedi / 1000.0) - elif speed < 1000000000: + elif speedi < 1000000000: speed = "%.2f Mbit/s" % (speedi / 1000000.0) else: speed = "%.2f Gbit/s" % (speedi / 1000000000.0)

9 years, 5 months

Check_MK Git: check_mk: aix_packages: fix exception when section is empty

by Mathias Kettner

Module: check_mk Branch: master Commit: a2e463bd71e7305e01b53897956cbdda3c4af6ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2e463bd71e730… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 17 16:53:39 2015 +0200 aix_packages: fix exception when section is empty --- inventory/aix_packages | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inventory/aix_packages b/inventory/aix_packages index 7bbeb31..199c177 100644 --- a/inventory/aix_packages +++ b/inventory/aix_packages @@ -36,6 +36,9 @@ def inv_aix_packages(info): + if not info: + return # Empty section + paclist = inv_tree("software.packages:") headers = info[0] headers[0] = headers[0].lstrip("#")

9 years, 5 months

Check_MK Git: check_mk: Disabled new graphing in mobile GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 7383a6c94e263f38096ea3b4ac07805bf61a6a01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7383a6c94e263f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 16:49:43 2015 +0200 Disabled new graphing in mobile GUI --- web/htdocs/htmllib.py | 3 +++ web/plugins/views/painters.py | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0f5d08f..13d78de 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -128,6 +128,9 @@ class html: BACKSPACE = 8 F1 = 112 + def is_mobile(self): + return self.mobile + def get_user_agent(self): return self.req.headers_in.get('User-Agent', '') diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 95242ac..3c0282b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -798,8 +798,10 @@ multisite_painters["svc_group_memberlist"] = { } def paint_graph(row): - # Filter some clients which do not support our graphing, for example IE < 8 - try_time_graph = True + # Filter cases where our graphing is not possible: + # - mobile GUI + # - for example IE < 8 + try_time_graph = not html.is_mobile() user_agent = html.get_user_agent() if 'MSIE' in user_agent:

9 years, 5 months

Check_MK Git: check_mk: Fixed js error in mobile GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: c5f48388f6df94f04ecf430d5c16d1ce766536a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5f48388f6df94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 16:36:01 2015 +0200 Fixed js error in mobile GUI --- web/htdocs/mobile.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 751d798..00e205b 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -58,13 +58,12 @@ def mobile_html_head(title, ready_code=""): <script type='text/javascript'> $(document).ready(function() { %s }); $(document).ready(function() { - $("a").click(function (event) { - event.preventDefault(); - window.location = $(this).attr("href"); + $("a").click(function (event) { + event.preventDefault(); + window.location = $(this).attr("href"); + }); }); - </script> - </head> <body class=mobile> """ % (title, ready_code))

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2311

by Mathias Kettner

Module: check_mk Branch: master Commit: 2394b6da540ae20d3c0d42c583079104206c5326 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2394b6da540ae2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 16 14:18:15 2015 +0200 Updated bug entries #2311 --- .bugs/2311 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2311 b/.bugs/2311 new file mode 100644 index 0000000..57b3a87 --- /dev/null +++ b/.bugs/2311 @@ -0,0 +1,7 @@ +Title: Button for deleting host directly in host details (not only in list) +Component: wato +State: open +Date: 2015-04-16 14:17:49 +Targetversion: future +Class: todo +

9 years, 5 months

Check_MK Git: check_mk: Customized graph viewport is now maintained during view updates

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b6aaa10287bbb34eadb3d57d70e47d98212bc4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b6aaa10287bbb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 15:59:47 2015 +0200 Customized graph viewport is now maintained during view updates --- web/htdocs/htmllib.py | 3 +- web/htdocs/js/checkmk.js | 176 +++++++++++++++++++++++++++------------------- web/htdocs/valuespec.py | 2 +- 3 files changed, 105 insertions(+), 76 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 956eaa6..0f5d08f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -959,8 +959,7 @@ class html: encoded_vars[k] = v self.popup_trigger( - '<img class=statusicon src="images/status_add_dashlet.png" ' - 'title="%s"></a></div>\n' % _("Add this view to..."), + '<img class=statusicon src="images/status_add_dashlet.png" title="%s">\n' % _("Add this view to..."), 'add_visual', 'add_visual', data='[\'%s\', %s, {\'name\': \'%s\'}]' % (mode_name, self.attrencode(repr(encoded_vars)), self.var('view_name'))) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 3c149ae..d759765 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -197,6 +197,34 @@ function rad(g) { return (g * 360 / 100 * Math.PI) / 180; } + +// simple implementation of function default arguments when +// using objects as function parameters. Example: +// function xxx(args) { +// args = merge_args({ +// 'arg2': 'default_val', +// }); +// } +// xxx({ +// 'arg1': 'val1', +// 'arg3': 'val3', +// }) +function merge_args() +{ + var defaults = arguments[0]; + var args = arguments[1] || {}; + + for (var name in args) + defaults[name] = args[name]; + + return defaults; +} + +function has_graphing() +{ + return typeof g_graphs !== 'undefined'; +} + //#. //# .-Events-------------------------------------------------------------. //# | _____ _ | @@ -373,37 +401,43 @@ if (navigator.appVersion.indexOf("MSIE 7.") != -1) //# | AJAX call related functions | //# '--------------------------------------------------------------------' -function get_url(url, handler, data, errorHandler, addAjaxId) +function call_ajax(url, args) { - if (window.XMLHttpRequest) { - var AJAX = new XMLHttpRequest(); - } else { - var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); - } - - var addAjaxId = (typeof addAjaxId === "undefined") ? true : addAjaxId; + args = merge_args({ + add_ajax_id : true, + response_handler : null, + error_handler : null, + handler_data : null, + method : "GET", + post_data : null, + sync : false + }, args); + + var AJAX = window.XMLHttpRequest ? new XMLHttpRequest() + : new ActiveXObject("Microsoft.XMLHTTP"); + if (!AJAX) + return null; // Dynamic part to prevent caching - var dyn = ''; - if (addAjaxId) { - dyn = "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000); - if (url.indexOf('\?') !== -1) { - dyn = "&"+dyn; - } else { - dyn = "?"+dyn; - } + if (args.add_ajax_id) { + url += url.indexOf('\?') !== -1 ? "&" : "?"; + url += "_ajaxid="+Math.floor(Date.parse(new Date()) / 1000); } - if (!AJAX) { - return null; + AJAX.open(args.method, url, !args.sync); + + if (args.method == "POST") { + AJAX.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + AJAX.setRequestHeader("Content-length", args.post_data.length); + AJAX.setRequestHeader("Connection", "close"); } - AJAX.open("GET", url + dyn, true); - if (typeof handler === 'function') { + if (!args.sync) { AJAX.onreadystatechange = function() { if (AJAX && AJAX.readyState == 4) { if (AJAX.status == 200) { - handler(data, AJAX.responseText); + if (args.response_handler) + args.response_handler(args.handler_data, AJAX.responseText); } else if (AJAX.status == 401) { // This is reached when someone is not authenticated anymore @@ -416,64 +450,41 @@ function get_url(url, handler, data, errorHandler, addAjaxId) document.location.reload(); } else { - if (typeof errorHandler !== 'undefined') - errorHandler(data, AJAX.status); + if (args.error_handler) + args.error_handler(args.handler_data, AJAX.status); } } } } - AJAX.send(null); + AJAX.send(args.post_data); return AJAX; } -function get_url_sync(url) +function get_url(url, handler, data, errorHandler, addAjaxId) { - if (window.XMLHttpRequest) { - var AJAX = new XMLHttpRequest(); - } else { - var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); - } + call_ajax(url, { + response_handler : handler, + handler_data : data, + error_handler : errorHandler, + add_ajax_id : addAjaxId + }); +} - AJAX.open("GET", url, false); - AJAX.send(null); +function get_url_sync(url) +{ + var AJAX = call_ajax(url, {sync:true}); return AJAX.responseText; } -function post_url(url, params) { - if (window.XMLHttpRequest) { - var AJAX = new XMLHttpRequest(); - } else { - var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); - } - - AJAX.open("POST", url); - - AJAX.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - AJAX.setRequestHeader("Content-length", params.length); - AJAX.setRequestHeader("Connection", "close"); - - AJAX.onreadystatechange = function() { - if (AJAX && AJAX.readyState == 4) { - if (AJAX.status == 401) { - // This is reached when someone is not authenticated anymore - // but has some webservices running which are still fetching - // infos via AJAX. Reload the whole frameset or only the - // single page in that case. - if(top) - top.location.reload(); - else - document.location.reload(); - } - else if (AJAX.status != 200) { - alert('Error ' + AJAX.status + ' during POST to URL ' + url); - } - } - } - AJAX.send(params); +function post_url(url, params) +{ + call_ajax(url, { + method: "POST", + post_data: params + }); } - function bulkUpdateContents(ids, codes) { var codes = eval(codes); @@ -601,7 +612,8 @@ function makeuri(addvars, url) { // GUI styling // ---------------------------------------------------------------------------- -function update_togglebutton(id, enabled) { +function update_togglebutton(id, enabled) +{ var on = document.getElementById(id + '_on'); var off = document.getElementById(id + '_off'); if (!on || !off) @@ -991,7 +1003,7 @@ function handle_content_reload(_unused, code) { schedule_reload(); } -function handle_content_reload_error(data, status_code) +function handle_content_reload_error(_unused, status_code) { if(!g_reload_error) { var o = document.getElementById('data_container'); @@ -1004,6 +1016,24 @@ function handle_content_reload_error(data, status_code) schedule_reload(); } +function get_content_reload_data() +{ + var data = {}; + + if (has_graphing()) + data = merge_args(data, get_modified_graph_contextes()); + + // now urlencode the data + var params = []; + for (var name in data) + params.push(name + '=' + encodeURIComponent(data[name])); + + if (params) + return params.join('&'); + else + return null; +} + function do_reload(url) { // Nicht mehr die ganze Seite neu laden, wenn es ein DIV "data_container" gibt. @@ -1029,15 +1059,13 @@ function do_reload(url) else display_options += opts[i]; } - opts = null; // Add optional display_options if not defined in original display_options - var opts = [ 'w' ]; + opts = [ 'w' ]; for (var i = 0; i < opts.length; i++) { if (display_options.indexOf(opts[i].toUpperCase()) == -1) display_options += opts[i]; } - opts = null; var params = {'_display_options': display_options}; var real_display_options = getUrlParam('display_options'); @@ -1046,10 +1074,12 @@ function do_reload(url) params['_do_actions'] = getUrlParam('_do_actions') - var url = makeuri(params); - display_options = null; - get_url(url, handle_content_reload, '', handle_content_reload_error); - url = null; + call_ajax(makeuri(params), { + response_handler : handle_content_reload, + error_handler : handle_content_reload_error, + method : 'POST', + post_data : get_content_reload_data() + }); } } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cec47d9..d2b73fd 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1919,7 +1919,7 @@ class AbsoluteDate(ValueSpec): if self._include_time: if self._show_titles: - html.write('<td>&nbsp</td><td>') + html.write('<td> </td><td>') else: html.write(" ") html.number_input(varprefix + "_hour", hour, size=2)

9 years, 5 months

Check_MK Git: check_mk: #2213 FIX cisco_temperature: Fixed behaviour in cases where device reports status but no temperature

by Konstantin Büttner

Module: check_mk Branch: master Commit: c0cfb6bc13096647e5f343bd2af30666474e4741 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0cfb6bc130966… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 17 14:31:03 2015 +0200 #2213 FIX cisco_temperature: Fixed behaviour in cases where device reports status but no temperature Previously, the check would report unknown in cases where the device reports an ok status but no valid temperature. This behaviour differed from the way the old cisco_temp_perf check handled this. This has been fixed to be consistent with the old behaviour. --- .werks/2213 | 12 ++++++++ ChangeLog | 1 + checks/cisco_temperature | 70 +++++++++++++++++++++++++--------------------- 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/.werks/2213 b/.werks/2213 new file mode 100644 index 0000000..061d46c --- /dev/null +++ b/.werks/2213 @@ -0,0 +1,12 @@ +Title: cisco_temperature: Fixed behaviour in cases where device reports status but no temperature +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429273644 + +Previously, the check would report unknown in cases where the device reports an ok status but no valid +temperature. This behaviour differed from the way the old cisco_temp_perf check handled this. This has +been fixed to be consistent with the old behaviour. diff --git a/ChangeLog b/ChangeLog index b0b324e..e441f67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -332,6 +332,7 @@ * 2179 FIX: apc_symmetra: Fixed regression introduced with last release when output state is empty * 2067 FIX: windows agent: product version is no longer set to 1.0.0... * 2068 FIX: Filesystem checks: Fix crash when legacy parameters (tuple) were used... + * 2213 FIX: cisco_temperature: Fixed behaviour in cases where device reports status but no temperature... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/cisco_temperature b/checks/cisco_temperature index 5f31bfe..01c6051 100644 --- a/checks/cisco_temperature +++ b/checks/cisco_temperature @@ -49,24 +49,26 @@ def parse_cisco_temperature(info): else: descr = sensor_id if descr and sensortype == '8': - entity_parsed[descr] = {} - scale = 10**int(magnitude) - if scalecode == '8': - scale *= 1000 - entity_parsed[descr]['temp'] = float(value) / scale - - if len(thresholds[sensor_id]) in [ 2, 4 ]: - warnraw, critraw = thresholds[sensor_id][0:2] - dev_levels = (float(warnraw)/scale, float(critraw)/scale) - else: - dev_levels = None - entity_parsed[descr]['dev_levels'] = dev_levels if sensorstate == '2': - entity_parsed[descr]['unknown'] = (3, "Data from sensor currently not available") + entity_parsed[descr] = (3, "Data from sensor currently not available") elif sensorstate == '3': - entity_parsed[descr]['unknown'] = (3, "Sensor is broken") - entity_parsed[descr]['dev_status'] = None + entity_parsed[descr] = (3, "Sensor is broken") + else: + entity_parsed[descr] = {} + scale = 10**int(magnitude) + if scalecode == '8': + scale *= 1000 + entity_parsed[descr]['temp'] = float(value) / scale + + if len(thresholds[sensor_id]) in [ 2, 4 ]: + warnraw, critraw = thresholds[sensor_id][0:2] + dev_levels = (float(warnraw)/scale, float(critraw)/scale) + else: + dev_levels = None + entity_parsed[descr]['dev_levels'] = dev_levels + + entity_parsed[descr]['dev_status'] = None # Now parse OIDs described by CISCO-ENVMON-MIB envmon_states = { @@ -81,25 +83,29 @@ def parse_cisco_temperature(info): parsed = {} for statustext, temp, max_temp, state, oid_end in perfstuff: item = cisco_sensor_item(statustext, oid_end) - parsed[item] = {} - parsed[item]['temp'] = int(temp) if state in ['5', '6']: - parsed[item]['unknown'] = (3, "Sensor %s" % envmon_states[state]) + parsed[item] = (3, "Sensor %s" % envmon_states[state]) elif int(temp) == 0: - parsed[item]['unknown'] = (3, "Sensor defect") - elif max_temp and int(max_temp): - parsed[item]['dev_status'] = None - parsed[item]['dev_levels'] = (int(max_temp), int(max_temp)) + if state in ('123'): + parsed[item] = ( int(state) - 1, "Sensor reports %s state" % envmon_states[state] ) + else: + parsed[item] = (3, "Sensor defect") else: - parsed[item]['dev_levels'] = None - if state == '1': - parsed[item]['dev_status'] = 0 - elif state == '2': - parsed[item]['dev_status'] = 1 - elif state in '34': - parsed[item]['dev_status'] = 2 + parsed[item] = {} + parsed[item]['temp'] = int(temp) + if max_temp and int(max_temp): + parsed[item]['dev_status'] = None + parsed[item]['dev_levels'] = (int(max_temp), int(max_temp)) else: - parsed[item]['unknown'] = (3, "Sensor reports unknown status code") + parsed[item]['dev_levels'] = None + if state == '1': + parsed[item]['dev_status'] = 0 + elif state == '2': + parsed[item]['dev_status'] = 1 + elif state in '34': + parsed[item]['dev_status'] = 2 + else: + parsed[item] = (3, "Sensor reports unknown status code") # Merge the two dicts, preferring keys generated from ENTITY data parsed.update(entity_parsed) @@ -114,8 +120,8 @@ def inventory_cisco_temperature(parsed): def check_cisco_temperature(item, params, parsed): if item in parsed: - if parsed[item].get('unknown', None): - return parsed[item]['unknown'] + if type(parsed[item]) == tuple: + return parsed[item] else: return check_temperature(parsed[item]['temp'], params, dev_levels = parsed[item]['dev_levels'],

9 years, 5 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 886a9f40972b0f030bb3c8d9dec33bd4fe603623 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=886a9f40972b0f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 17 14:26:45 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e22951f..4c5fe94 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2213 +2223

9 years, 5 months

Check_MK Git: check_mk: increased files_older_than minimum value for new spoolfiles

by Andreas Boesl

Module: check_mk Branch: master Commit: b2f688ec079f5f17e5809720d9c79fbbe0bce9e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2f688ec079f5f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 17 14:16:28 2015 +0200 increased files_older_than minimum value for new spoolfiles there were lots of "corrupted" spoolfiles on systems with high disk wait --- doc/treasures/mknotifyd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 21975fc..292f44d 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -245,7 +245,7 @@ def check_config_change(): # '----------------------------------------------------------------------' def handle_spool_files(): - process_spool_directory(g_spool_dir, 0) + process_spool_directory(g_spool_dir, 3) process_spool_directory(g_deferred_dir, g_config["deferred_cooldown"])

9 years, 5 months

Check_MK Git: check_mk: fixed broken reschedule button in dashboards, when its set to "toplevel"

by Andreas Boesl

Module: check_mk Branch: master Commit: bde6c1bfe9ff1e2a0b242050f4251fcd678a9c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bde6c1bfe9ff1e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 17 12:30:31 2015 +0200 fixed broken reschedule button in dashboards, when its set to "toplevel" --- web/plugins/icons/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index a1a5de8..5c78cec 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -130,7 +130,7 @@ def paint_reschedule(what, row, tags, host_custom_vars): return icon, txt, url multisite_icons.append({ - 'columns': [ 'active_checks_enabled' ], + 'columns': [ 'active_checks_enabled', 'check_command' ], 'paint': paint_reschedule, 'toplevel': False, })

9 years, 5 months

← Newer
1
...
7
8
9
10
11
12
13
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015