Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 0e65ad076fbc52fa7a91f71c9a7ae7654a829157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e65ad076fbc52… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 31 17:17:56 2017 +0100 Test commit. Change-Id: I79a89285107fdd66bad5ca91885830b7fcb33a0b --- gb | 1 - 1 file changed, 1 deletion(-) diff --git a/gb b/gb index 1d47532..166eca9 100755 --- a/gb +++ b/gb @@ -661,4 +661,3 @@ elif len(hits) > 1: else: hits[0][1](sys.argv[2:]) -

7 years, 4 months

Fixed accidently sidebar folding when selecting a site from a performance snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: b515966a6c0460e320eb4c651c3a6910b38051ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b515966a6c0460… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 15:20:58 2017 +0100 Fixed accidently sidebar folding when selecting a site from a performance snapin Change-Id: I9cd026ba56b4b5e919717cac2354d15ff12b28d5 --- web/htdocs/js/checkmk.js | 1 - web/htdocs/js/sidebar.js | 67 ++++++++++++++++++++++++++---------------------- web/htdocs/sidebar.py | 2 +- 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 025de3b..0d8e22b 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1678,7 +1678,6 @@ function table_init_rowselect(oTable) { return highlight_row(this, false); }; elem.onclick = function(e) { - console.log(this.parentNode); return toggle_row(e, this); }; elem = null; diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 9289f83..229a66c 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -427,40 +427,42 @@ var startY = 0; var startScroll = 0; function startDragScroll(event) { - if (!event) - event = window.event; + if (!event) + event = window.event; - if (g_sidebar_folded) { - unfold_sidebar(); - return false; - } - else if (!g_sidebar_folded && event.clientX < 10) { - fold_sidebar(); - return false; - } + var target = getTarget(event); + var button = getButton(event); + if (button != 'LEFT') + return true; // only care about left clicks! - var target = getTarget(event); - var button = getButton(event); + if (g_sidebar_folded) { + unfold_sidebar(); + return prevent_default_events(event); + } + else if (!g_sidebar_folded && event.clientX < 10 && target.tagName != "OPTION") { + // When clicking on an <option> of the "core performance" snapins, an event + // with event.clientX equal 0 is triggered, don't know why. Filter out clicks + // on OPTION tags. + fold_sidebar(); + return prevent_default_events(event); + } - if (dragging === false && button == 'LEFT' - && target.tagName != 'A' - && target.tagName != 'INPUT' - && target.tagName != 'SELECT' - && !(target.tagName == 'DIV' && target.className == 'heading')) { - if (event.preventDefault) - event.preventDefault(); - if (event.stopPropagation) - event.stopPropagation(); - event.returnValue = false; + if (dragging === false + && target.tagName != 'A' + && target.tagName != 'INPUT' + && target.tagName != 'SELECT' + && target.tagName != 'OPTION' + && !(target.tagName == 'DIV' && target.className == 'heading')) { - dragging = event; - startY = event.clientY; - startScroll = document.getElementById('side_content').scrollTop; + dragging = event; + startY = event.clientY; + startScroll = document.getElementById('side_content').scrollTop; - return false; - } - return true; + return prevent_default_events(event); + } + + return true; } function stopDragScroll(event){ @@ -902,9 +904,14 @@ function add_html_var(url, varname, value) { * Event console site selection *************************************************/ -function set_snapin_site(ident, select_field) { - get_url('sidebar_ajax_set_snapin_site.py?ident=' + encodeURIComponent(ident) + '&site=' + encodeURIComponent(select_field.value)); +function set_snapin_site(event, ident, select_field) { + if (!event) + event = window.event; + + get_url('sidebar_ajax_set_snapin_site.py?ident=' + encodeURIComponent(ident) + + '&site=' + encodeURIComponent(select_field.value)); location.reload(); + return prevent_default_events(event); } /************************************************ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e30c66f..57575f6 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -149,7 +149,7 @@ def snapin_site_choice(ident, choices): return None site_choices = [ ("", _("All sites")), ] + site_choices - html.select("site", site_choices, site, onchange="set_snapin_site(%s, this)" % json.dumps(ident)) + html.select("site", site_choices, site, onchange="set_snapin_site(event, %s, this)" % json.dumps(ident)) return only_sites

7 years, 4 months

fixed 'invalid parameters' in services-of-host view

by Simon Betz

Module: check_mk Branch: master Commit: 7a1513acdf88e6da3d5b59cafcc8ee92b3cf2970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a1513acdf88e6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 31 15:51:19 2017 +0100 fixed 'invalid parameters' in services-of-host view Change-Id: I28bea4f4200bb2ceb8a970e14cc94995afcb36ba --- checks/hp_procurve_cpu | 4 +++- checks/hp_procurve_mem | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/checks/hp_procurve_cpu b/checks/hp_procurve_cpu index e49a7ec..9a45fef 100644 --- a/checks/hp_procurve_cpu +++ b/checks/hp_procurve_cpu @@ -27,7 +27,9 @@ # Relevant SNMP OIDs: # 1.3.6.1.4.1.11.2.14.11.5.1.9.6.1 -hp_procurve_cpu_default_levels = (80, 90) + +hp_procurve_cpu_default_levels = (80.0, 90.0) + def inventory_hp_procurve_cpu(info): if len(info) == 1 and int(info[0][0]) >= 0 <= 100: diff --git a/checks/hp_procurve_mem b/checks/hp_procurve_mem index 7de18d8..b3fc5e1 100644 --- a/checks/hp_procurve_mem +++ b/checks/hp_procurve_mem @@ -31,7 +31,8 @@ # hpLocalMemFreeBytes 1.3.6.1.4.1.11.2.14.11.5.1.1.2.1.1.1.6 # hpLocalMemAllocBytes 1.3.6.1.4.1.11.2.14.11.5.1.1.2.1.1.1.7 -factory_settings["hp_procurve_mem_default_levels"] = { "levels" : ("perc_used", (80, 90)) } + +factory_settings["hp_procurve_mem_default_levels"] = { "levels" : ("perc_used", (80.0, 90.0)) } def inventory_hp_procurve_mem(info):

7 years, 4 months

updated werk 4262

by Simon Betz

Module: check_mk Branch: master Commit: 0a6a1edee7a9ead679098ac1809e157bfc156994 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a6a1edee7a9ea… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 31 12:47:59 2017 +0100 updated werk 4262 Change-Id: Ice94f2bc11e81c6467053f44137f19d9a1722130 --- .werks/4262 | 2 +- checks/wmi_cpuload | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.werks/4262 b/.werks/4262 index 50dae10..9dc65f5 100644 --- a/.werks/4262 +++ b/.werks/4262 @@ -7,4 +7,4 @@ State: unknown Version: 1.4.0i4 Date: 1484124769 -If computer system section is missing then we assume that there's one core. + diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index 94ef88d..76d2d49 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -39,13 +39,13 @@ def check_wmi_cpuload(item, params, parsed): try: computer_system = parsed["computer_system"] except KeyError: - computer_system = {} + return 3, "Missing information from agent" try: cores = int(computer_system.get(0, "NumberOfLogicalProcessors")) except ValueError: # NumberOfLogicalProcessors can be an empty string, not sure why - cores = 1 + cores = int(computer_system.get(0, "NumberOfProcessors")) return check_cpu_load_generic(params, (load, load5min, load15min), cores)

7 years, 4 months

Added new marker for classifying HTML test generators

by Lars Michelsen

Module: check_mk Branch: master Commit: 0518deb75e24845c6362d92835bc668c98a51027 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0518deb75e2484… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 11:48:34 2017 +0100 Added new marker for classifying HTML test generators Change-Id: I38c3167094a19838cb0b9fe97a43c20c3bb7ca44 --- pytest.ini | 1 + tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index 6426817..e1e59d1 100644 --- a/pytest.ini +++ b/pytest.ini @@ -8,3 +8,4 @@ markers = pylint: Mark a test as pylint test. git: Mark a test to be executed in the Git repository context packaging: This is a test to execute to verify the packaging of the testbuilds. + html_gentest: Generate test cases for htmllib refactoring. diff --git a/tests/conftest.py b/tests/conftest.py index fbcd902..ebb7d16 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -57,7 +57,7 @@ def pytest_runtest_setup(item): def pytest_cmdline_main(config): # Some special tests are not executed in a site environment - if config.getoption('markexpr') in [ "packaging", "git" ]: + if config.getoption('markexpr') in [ "packaging", "git", "html_gentest" ]: return setup_site_and_switch_user()

7 years, 4 months

updated werk 4333

by Simon Betz

Module: check_mk Branch: master Commit: d143a5983317987d55d09fbdcef916aed6a4eec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d143a598331798… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 31 09:50:06 2017 +0100 updated werk 4333 Change-Id: I81dda7e9e79d5ae7f71c96b18b8c32e72c1a653f --- checks/tsm_storagepools | 61 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/checks/tsm_storagepools b/checks/tsm_storagepools index c27ad69..ea62eb2 100644 --- a/checks/tsm_storagepools +++ b/checks/tsm_storagepools @@ -24,36 +24,61 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # <<<tsm_storagepool>>> # tsmfarm2 Bkup LTOBACK 1399378.64 # tsmfarm2 Arch LTOARCHCOPY 157288.14 +# <<<tsm_storagepool>>> +# default Bkup VP4200.GOLD 254776345.58^M +# default Bkup VP4200.TDP 204386407.76^M +# default Bkup VP860.CM 122661787.24^M +# default DPC.EXC.2013 ^M +# default DPC.EXC.CM ^M +# default DPC.EXCDAG ^M +# default DPC.GOLD.ALL ^M +# default DPC.GOLD.UNIX ^M +# default DPC.GOLD.VE + -def inventory_tsm_storagepools(info): - inventory = [] - for inst, stype, name, size in info: +def parse_tsm_storagepools(info): + parsed = {} + for line in info: + if len(line) < 4: + continue + + inst, stype, name, size = line[:4] if inst == "default": item = name else: item = inst + " / " + name - inventory.append((item, None)) - return inventory + parsed.setdefault(item, {"type" : stype, "size" : size}) + + return parsed + + +def inventory_tsm_storagepools(parsed): + for inst in parsed: + yield inst, None + + +def check_tsm_storagepools(item, _no_params, parsed): + if item not in parsed: + return 3, "no such storage pool" -def check_tsm_storagepools(item, _no_params, info): - for inst, stype, name, size in info: - if item == name or item == inst + " / " + name: - return (0, "%s used - %s" % - (get_bytes_human_readable(int(float(size) * 1024 * 1024)), stype), - [ ("used", float(size)) ]) - return 3, "no such storage pool" + data = parsed[item] + stype = data["type"] + size = data["size"] + return 0, "Used size: %s, Type: %s" % \ + (get_bytes_human_readable(int(float(size) * 1024 * 1024)), stype), \ + [ ("used", float(size)) ] check_info['tsm_storagepools'] = { - "check_function" : check_tsm_storagepools, - "inventory_function" : inventory_tsm_storagepools, - "service_description" : "TSM Storagepool %s", - "has_perfdata" : True, - "group" : "tsm_storagepools", - "default_levels_variable" : "tsm_storagepools_default_levels", + "parse_function" : parse_tsm_storagepools, + "inventory_function" : inventory_tsm_storagepools, + "check_function" : check_tsm_storagepools, + "service_description" : "TSM Storagepool %s", + "has_perfdata" : True, }

7 years, 4 months

4333 FIX tsm_storage_pools: fixed incomplete data handling

by Simon Betz

Module: check_mk Branch: master Commit: 5f41050ef5dbf9b35dd118841e7b54bb53bb64ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f41050ef5dbf9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 31 09:45:30 2017 +0100 4333 FIX tsm_storage_pools: fixed incomplete data handling Change-Id: Ic2e6a235eec6c35ef7f4ffe9d149dafe07eb7dc5 --- .werks/4333 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/4333 b/.werks/4333 new file mode 100644 index 0000000..d12bd6a --- /dev/null +++ b/.werks/4333 @@ -0,0 +1,10 @@ +Title: tsm_storage_pools: fixed incomplete data handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485852302 + + diff --git a/ChangeLog b/ChangeLog index e6a1f2e..8d73c60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 4313 FIX: ps: Improved performance of ps check on systems with a large number of processes * 4016 FIX: Windows Agents: fixed broken custom windows performance counter monitoring (winperf section) * 4306 FIX: cisco_fru_power: fixed empty FRU current handling + * 4333 FIX: tsm_storage_pools: fixed incomplete data handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings....

7 years, 4 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: c2ceaa49b6e51b4b3290100b203cbdef24ac519c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2ceaa49b6e51b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 31 09:44:44 2017 +0100 Reserved 10 Werk IDS Change-Id: I4b8238e399dd9e5e73d1707b81dfad5121fd3b12 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 736d2a9..1349f6f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4333 +4343

7 years, 4 months

hp_webmgmt_status: Fix broken discovery

by Konstantin Büttner

Module: check_mk Branch: master Commit: 17866250c3d4f96df51ecd930a2a2a478792f7b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17866250c3d4f9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jan 30 16:47:58 2017 +0100 hp_webmgmt_status: Fix broken discovery Change-Id: Id527c2af487a00ed29ad6cf27f231f2b3370a7ba --- checks/hp_webmgmt_status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hp_webmgmt_status b/checks/hp_webmgmt_status index 97c073a..5b2228a 100644 --- a/checks/hp_webmgmt_status +++ b/checks/hp_webmgmt_status @@ -26,7 +26,7 @@ def inventory_hp_webmgmt_status(info): - for index, health in info: + for index, health in info[0]: yield index, None

7 years, 4 months

WATO: Fixed broken randomize secret button for automation users

by Lars Michelsen

Module: check_mk Branch: master Commit: 71e63c92a6ffd74c0a8991b12732fb9b3055316a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71e63c92a6ffd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 12:05:58 2017 +0100 WATO: Fixed broken randomize secret button for automation users Change-Id: I8b0191c8f24580a6dc6dfada062a06494b5f4db6 --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8b4fe71..05d3aea 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10232,7 +10232,7 @@ def mode_edit_user(phase): html.open_ul() html.text_input("secret", user.get("automation_secret", ""), size=30, - id="automation_secret") + id_="automation_secret") html.write_text(" ") html.open_b(style=["position: relative", "top: 4px;"]) html.write("  ")

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017