Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

by Simon Betz

Module: check_mk Branch: master Commit: e85f7893d370b199aff47304667e78eea7bc9f8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e85f7893d370b1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 31 16:50:41 2018 +0100 Adapted test Change-Id: I49bd74474392da51af676440f86c62a4b27c9d69 --- tests/cmk/structured_data/test_structured_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cmk/structured_data/test_structured_data.py b/tests/cmk/structured_data/test_structured_data.py index dd4fb17..ccaa0c0 100644 --- a/tests/cmk/structured_data/test_structured_data.py +++ b/tests/cmk/structured_data/test_structured_data.py @@ -366,7 +366,7 @@ def test_structured_data_StructuredDataTree_compare_with_self(tree): @pytest.mark.parametrize("tree_old,tree_new,result", zip( trees_old, trees_new, - [(2,2,1), (0,5,1), (1,0,1), (2,3,16), (1,1,1), (1,1,2),] + [(2,2,1), (0,2,1), (1,0,1), (2,3,16), (1,1,1), (1,1,2),] )) def test_structured_data_StructuredDataTree_compare_with(tree_old, tree_new, result): new, changed, removed, delta = tree_new.compare_with(tree_old)

6 years, 5 months

Do not compare python-sorted numerations

by Simon Betz

Module: check_mk Branch: master Commit: cab824626b4f2de041f0b616a071ba90baa9adf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cab824626b4f2d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 31 16:35:57 2018 +0100 Do not compare python-sorted numerations Change-Id: Iba6780e5e9bc3eb72486d6248708c91bb2200627 --- lib/structured_data.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/structured_data.py b/lib/structured_data.py index 451ef20..1527d55 100644 --- a/lib/structured_data.py +++ b/lib/structured_data.py @@ -741,7 +741,7 @@ class Numeration(Leaf): new, changed, removed = 0, 0, 0 data = [] for my_entries, old_entries in \ - zip(sorted(self._numeration), sorted(old._numeration)): + zip(self._numeration, old._numeration): new_entries, changed_entries, removed_entries, identical_entries = \ self._compare_entries(my_entries, old_entries) new += len(new_entries) @@ -818,6 +818,8 @@ class Numeration(Leaf): data.append({k: (None,v) for k,v in entry.iteritems()}) elif mode == "removed": data.append({k: (v,None) for k,v in entry.iteritems()}) + else: + break delta.set_child_data(data) return delta

6 years, 5 months

Windows: use crash_debug = yes in agent param tests

by Jukka Aro

Module: check_mk Branch: master Commit: 3a21e047129aeac20bd22d9cc66d60088699a9ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a21e047129aea… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jan 31 14:03:16 2018 +0100 Windows: use crash_debug = yes in agent param tests Enable logging also for all agent start parameter tests. This option was already in use for the rest of the integration tests. --- agents/windows/it/test_agent_start_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/it/test_agent_start_parameters.py b/agents/windows/it/test_agent_start_parameters.py index 95625f0..c125a6a 100644 --- a/agents/windows/it/test_agent_start_parameters.py +++ b/agents/windows/it/test_agent_start_parameters.py @@ -34,9 +34,9 @@ def testfile(): @pytest.fixture def testconfig(config): + config.set("global", "crash_debug", "yes") if Globals.param[0] == 'showconfig': config.set("global", "sections", ' '.join(Globals.sections)) - config.set("global", "crash_debug", "yes") for section in filter(lambda s: s != 'check_mk', Globals.sections): config.add_section(section) config.set('fileinfo', 'path', os.path.join(remotedir, '*.log'))

6 years, 5 months

5700 FIX Windows agent crashed while unpacking plugins

by Jukka Aro

Module: check_mk Branch: master Commit: 18a0d8f72843f9e1e56570accbda15b771291468 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18a0d8f72843f9… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Jan 26 14:49:51 2018 +0100 5700 FIX Windows agent crashed while unpacking plugins The agent updater and MSI installer call the Windows agent with a special parameter 'unpack' in order to extract plugins from the .cap-archive. The agent crashed if it could not write the batch file 'uninstall_plugins.bat' or any of the extracted plugin files. Now any errors with writing files are logged before interrupting the unpack process. After successfully unpacking the plugins, the agent checks recursively that all files in its installation directory are writable by the agent. The check stops at the first unwritable file and logs a corresponding error message before exiting. --- .werks/5700 | 19 ++ agents/windows/Makefile.am | 2 + agents/windows/WritableFile.cc | 108 +++++++++++ agents/windows/WritableFile.h | 102 +++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 234 +++++++++++++----------- agents/windows/test/CustomActions.h | 10 + agents/windows/test/EnvironmentTest.cc | 8 +- agents/windows/test/WritableFileTest.cc | 312 ++++++++++++++++++++++++++++++++ 9 files changed, 679 insertions(+), 118 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18a0d8f728…

6 years, 5 months

Do not filter inventory plugins at the moment

by Simon Betz

Module: check_mk Branch: master Commit: 7ea5a47aed7d35dfa6b41cd13019e181836e3e50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ea5a47aed7d35… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 31 14:53:13 2018 +0100 Do not filter inventory plugins at the moment Change-Id: I95df5ba565aa397dcb4609f836e44de1cba15a86 --- cmk_base/discovery.py | 5 ++++- cmk_base/inventory.py | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index b29bcbd..0086fa1 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -842,7 +842,10 @@ def snmp_scan(hostname, ipaddress, on_error="ignore", for_inv=False, do_snmp_sca if default_found: _output_snmp_check_plugins("SNMP without scan function", default_found) - filtered = _filter_by_management_board(hostname, found, for_mgmt_board) + if for_inv: + filtered = found + else: + filtered = _filter_by_management_board(hostname, found, for_mgmt_board) snmp.write_single_oid_cache(hostname) return sorted(filtered) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 19dd099..857c68e 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -260,8 +260,9 @@ def _do_inv_for_realhost(hostname, ipaddress, inventory_tree, status_data_tree): console.verbose(";") -def _gather_snmp_check_plugin_names_inventory(hostname, ipaddress, on_error, do_snmp_scan): - return discovery.gather_snmp_check_plugin_names(hostname, ipaddress, on_error, do_snmp_scan, for_inventory=True) +def _gather_snmp_check_plugin_names_inventory(hostname, ipaddress, on_error, do_snmp_scan, for_mgmt_board=False): + return discovery.gather_snmp_check_plugin_names(hostname, ipaddress, on_error, do_snmp_scan, + for_inventory=True, for_mgmt_board=for_mgmt_board) def _get_inv_params(hostname, section_name):

6 years, 5 months

Updated 'Testing time.clock in structured_data tests'

by Simon Betz

Module: check_mk Branch: master Commit: 175d9a35f2e63d49ada4d1afa1d0bdceffe8b54b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=175d9a35f2e63d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 31 13:51:43 2018 +0100 Updated 'Testing time.clock in structured_data tests' Change-Id: Ic42a0ea769eb0cc69967ac1b0f0ab2875d4f8344 --- tests/cmk/structured_data/test_structured_data.py | 72 +++++++++++++++-------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/tests/cmk/structured_data/test_structured_data.py b/tests/cmk/structured_data/test_structured_data.py index f5208f0..dd4fb17 100644 --- a/tests/cmk/structured_data/test_structured_data.py +++ b/tests/cmk/structured_data/test_structured_data.py @@ -550,7 +550,7 @@ def test_structured_data_StructuredDataTree_building_tree(): ((0, 16272, 0), (16270, 0, 16272)), ), ]) -def test_structured_data_StructuredDataTree_cpu_tracking_load_from(trees, stats, entries, results): +def test_structured_data_StructuredDataTree_performance(trees, stats, entries, results): tree_old_name, tree_new_fixed_name, tree_new_variable_name = trees time_loading_tree, time_delta_tree, time_count_entries = stats tree_old_entries, tree_new_fixed_entries, tree_new_variable_entries = entries @@ -596,50 +596,70 @@ def test_structured_data_StructuredDataTree_cpu_tracking_load_from(trees, stats, # ---count entries-------------------------------------------------------- - cpu_tracking.start("busy") + #TODO testing + start = time.clock() entries_old = tree_old.count_entries() - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #entries_old = tree_old.count_entries() + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert run_time < time_count_entries assert tree_old_entries == entries_old - cpu_tracking.start("busy") + #TODO testing + start = time.clock() entries_new_fixed = tree_new_fixed.count_entries() - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #entries_new_fixed = tree_new_fixed.count_entries() + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert run_time < time_count_entries assert tree_new_fixed_entries == entries_new_fixed - cpu_tracking.start("busy") + #TODO testing + start = time.clock() entries_new_variable = tree_new_variable.count_entries() - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #entries_new_variable = tree_new_variable.count_entries() + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert run_time < time_count_entries assert tree_new_variable_entries == entries_new_variable # ---delta tree computation----------------------------------------------- - cpu_tracking.start("busy") + #TODO testing + start = time.clock() n,c,r,d = tree_new_fixed.compare_with(tree_old) - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #n,c,r,d = tree_new_fixed.compare_with(tree_old) + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert compare_fixed_result == (n,c,r) assert run_time < time_delta_tree - cpu_tracking.start("busy") + #TODO testing + start = time.clock() n,c,r,d = tree_new_variable.compare_with(tree_old) - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #n,c,r,d = tree_new_variable.compare_with(tree_old) + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert compare_variable_result == (n,c,r) assert run_time < time_delta_tree

6 years, 5 months

5665 FIX Improved timeout error handling when trying to download agent output of a host

by Lars Michelsen

Module: check_mk Branch: master Commit: 652854aa9c1bdbc42a48c8f41c7190b309cb952c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=652854aa9c1bdb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 31 13:02:13 2018 +0100 5665 FIX Improved timeout error handling when trying to download agent output of a host Change-Id: Ie81aad0d056b16c1af5b361ffb90283581f947bb --- .werks/5665 | 10 ++++++++++ web/htdocs/wato.py | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/5665 b/.werks/5665 new file mode 100644 index 0000000..d390ef1 --- /dev/null +++ b/.werks/5665 @@ -0,0 +1,10 @@ +Title: Improved timeout error handling when trying to download agent output of a host +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517400098 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3926ade..dd36d82 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14818,8 +14818,12 @@ def page_download_agent_output(): raise MKGeneralException(_("Invalid host.")) host.need_permission("read") - success, output, agent_data = watolib.check_mk_automation(host.site_id(), "get-agent-output", + import htmllib + try: + success, output, agent_data = watolib.check_mk_automation(host.site_id(), "get-agent-output", [host_name, ty]) + except htmllib.RequestTimeout, e: + success, output, agent_data = False, "%s" % e, "" if success: html.set_output_format("text")

6 years, 5 months

Removed longer time obsoleted legacy perfometer definitions

by Lars Michelsen

Module: check_mk Branch: master Commit: 197b6c3d98914a114f86a9b22b09b593a143cc33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=197b6c3d98914a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 31 12:36:39 2018 +0100 Removed longer time obsoleted legacy perfometer definitions Change-Id: I0aaa3e5be3d2b1055c4ff856130c0e0d8b783adc --- web/plugins/perfometer/check_mk.py | 135 ------------------------------------- 1 file changed, 135 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index db5835a..21793ad 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1084,138 +1084,3 @@ def perfometer_f5_bigip_vserver(row, check_command, perf_data): return str(connections), perfometer_logarithmic(connections, 100, 2, "#46a") perfometers["check_mk-f5_bigip_vserver"] = perfometer_f5_bigip_vserver - - -#. -# .--Obsolete------------------------------------------------------------. -# | ___ _ _ _ | -# | / _ \| |__ ___ ___ | | ___| |_ ___ | -# | | | | | '_ \/ __|/ _ \| |/ _ \ __/ _ \ | -# | | |_| | |_) \__ \ (_) | | __/ || __/ | -# | \___/|_.__/|___/\___/|_|\___|\__\___| | -# | | -# +----------------------------------------------------------------------+ -# | These Perf-O-Meters are not longer needed since thery are being | -# | handled by the new metrics.py module. | -# '----------------------------------------------------------------------' -def perfometer_check_mk(row, check_command, perf_data): - # make maximum value at 90sec. - exectime = float(perf_data[0][1]) - perc = min(100.0, exectime / 90.0 * 100) - if exectime < 10: - color = "#2d3" - elif exectime < 30: - color = "#ff4" - elif exectime < 60: - color = "#f84" - else: - color = "#f44" - - return "%.1f s" % exectime, perfometer_linear(perc, color) -perfometers["check-mk"] = perfometer_check_mk - - -def perfometer_check_mk_cpu_loads(row, check_command, perf_data): - color = { 0: "#68f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[row["service_state"]] - load = float(perf_data[0][1]) - return "%.1f" % load, perfometer_logarithmic(load, 4, 2, color) - -perfometers["check_mk-cpu.loads"] = perfometer_check_mk_cpu_loads -perfometers["check_mk-ucd_cpu_load"] = perfometer_check_mk_cpu_loads -perfometers["check_mk-statgrab_load"] = perfometer_check_mk_cpu_loads -perfometers["check_mk-hpux_cpu"] = perfometer_check_mk_cpu_loads -perfometers["check_mk-blade_bx_load"] = perfometer_check_mk_cpu_loads - - -def perfometer_check_mk_df(row, check_command, perf_data): - varname, value, unit, warn, crit, minn, maxx = perf_data[0] - - hours_left = None - for data in perf_data: - if data[0] == "trend_hoursleft": - hours_left = float(data[1]) - break - - if not maxx: - return "", "" - - perc_used = 100 * (float(value) / float(maxx)) - perc_free = 100 - float(perc_used) - - table_1 = render_perfometer([(perc_used, "#00ffc6"), (perc_free, "white")]) - - if hours_left and hours_left == -1: - table_2 = render_perfometer([(100, "#39c456")]) - return "%0.1f%% / not growing" % (perc_used), html.render_div(table_1 + table_2, class_="stacked") - elif hours_left or hours_left == 0: - days_left = hours_left / 24 - if days_left > 30: - color = "#39c456" # OK - elif days_left < 7: - color = "#d94747" # CRIT - else: - color = "#d7d139" # WARN - - half = math.log(30.0, 2) # value to be displayed at 50% - pos = 50 + 10.0 * (math.log(days_left, 2) - half) - if pos < 2: - pos = 2 - if pos > 98: - pos = 98 - table_2 = render_perfometer([(100 - pos, color), (pos, "white")]) - if days_left > 365: - days_left = " >365" - else: - days_left = "%0.1f" % days_left - - return "%0.1f%%/%s days left" % (perc_used, days_left), html.render_div(table_1 + table_2, class_="stacked") - else: - return "%0.2f %%" % perc_used, table_1 - -perfometers["check_mk-df"] = perfometer_check_mk_df -perfometers["check_mk-vms_df"] = perfometer_check_mk_df -perfometers["check_mk-vms_diskstat.df"] = perfometer_check_mk_df -perfometers["check_disk"] = perfometer_check_mk_df -perfometers["check_mk-df_netapp"] = perfometer_check_mk_df -perfometers["check_mk-df_netapp32"] = perfometer_check_mk_df -perfometers["check_mk-zfsget"] = perfometer_check_mk_df -perfometers["check_mk-hr_fs"] = perfometer_check_mk_df -perfometers["check_mk-oracle_asm_diskgroup"] = perfometer_check_mk_df -perfometers["check_mk-mysql_capacity"] = perfometer_check_mk_df -perfometers["check_mk-esx_vsphere_counters.ramdisk"] = perfometer_check_mk_df -perfometers["check_mk-hitachi_hnas_span"] = perfometer_check_mk_df -perfometers["check_mk-hitachi_hnas_volume"] = perfometer_check_mk_df -perfometers["check_mk-hitachi_hnas_volume.virtual"] = perfometer_check_mk_df -perfometers["check_mk-emcvnx_raidgroups.capacity"] = perfometer_check_mk_df -perfometers["check_mk-emcvnx_raidgroups.capacity_contiguous"] = perfometer_check_mk_df -perfometers["check_mk-ibm_svc_mdiskgrp"] = perfometer_check_mk_df -perfometers["check_mk-fast_lta_silent_cubes.capacity"] = perfometer_check_mk_df -perfometers["check_mk-fast_lta_volumes"] = perfometer_check_mk_df -perfometers["check_mk-libelle_business_shadow.archive_dir"] = perfometer_check_mk_df -perfometers["check_mk-netapp_api_volumes"] = perfometer_check_mk_df -perfometers["check_mk-df_zos"] = perfometer_check_mk_df - -def perfometer_check_mk_kernel_util(row, check_command, perf_data): - total = sum([float(p[1]) for p in perf_data]) - data = [(perf_data[0][1], "#6f2"), (perf_data[1][1], "#f60"), - (perf_data[2][1], "#0bc"), (100.0 - total, "white")] - return "%d%%" % total, render_perfometer(data) - -perfometers["check_mk-kernel.util"] = perfometer_check_mk_kernel_util -perfometers["check_mk-vms_sys.util"] = perfometer_check_mk_kernel_util -perfometers["check_mk-vms_cpu"] = perfometer_check_mk_kernel_util -perfometers["check_mk-ucd_cpu_util"] = perfometer_check_mk_kernel_util -perfometers["check_mk-lparstat_aix.cpu_util"] = perfometer_check_mk_kernel_util -perfometers["check_mk-emc_isilon_cpu"] = perfometer_check_mk_kernel_util - -def perfometer_check_mk_cpu_threads(row, check_command, perf_data): - color = { 0: "#a4f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[row["service_state"]] - return "%d" % int(perf_data[0][1]), perfometer_logarithmic(perf_data[0][1], 400, 2, color) - -perfometers["check_mk-cpu.threads"] = perfometer_check_mk_cpu_threads - -def perfometer_docsis_snr(row, check_command, perf_data): - dbmv = float(perf_data[0][1]) - return "%.1f dB" % dbmv, perfometer_logarithmic(dbmv, 50, 2, "#ad6") - -perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr

6 years, 5 months

Converted legacy perfometer for MQ queues to new format

by Lars Michelsen

Module: check_mk Branch: master Commit: ed0802b0a2207c07ebb285d43036f0f13b8094a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed0802b0a2207c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 31 12:31:55 2018 +0100 Converted legacy perfometer for MQ queues to new format Change-Id: I5a217f03de6d21e159d792c7d26d4da568f8a1b0 --- web/plugins/metrics/check_mk.py | 20 ++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 8 -------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index a66f56f..d16dcb8 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4157,6 +4157,12 @@ metric_info["quarantine"] = { "color" : "43/b", } +metric_info["messages_in_queue"] = { + "title" : _("Messages in queue"), + "unit" : "count", + "color" : "#701141", +} + metric_info["mail_queue_hold_length"] = { "title" : _("Length of hold mail queue"), "unit" : "count", @@ -5090,6 +5096,13 @@ check_metrics["check_mk-cups_queues"] = { "jobs" : { "name" : "printer_queue" } } +mq_translation = { + "queue" : { "name" : "messages_in_queue" } +} +check_metrics['check_mk-mq_queues'] = mq_translation +check_metrics['check_mk-websphere_mq_channels'] = mq_translation +check_metrics['check_mk-websphere_mq_queues'] = mq_translation + check_metrics["check_mk-printer_pages"] = { "pages" : { "name" : "pages_total" } } @@ -6465,6 +6478,13 @@ perfometer_info.append({ 'exponent' : 2.0, }) +perfometer_info.append({ + 'type' : 'logarithmic', + 'metric' : 'messages_in_queue', + 'half_value': 1.0, + 'exponent' : 2.0, +}) + #. # .--Graphs--------------------------------------------------------------. # | ____ _ | diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 3812978..db5835a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -836,14 +836,6 @@ def perfometer_esx_vsphere_hostsystem_cpu(row, command, perf): perfometers['check_mk-esx_vsphere_hostsystem.cpu_usage'] = perfometer_esx_vsphere_hostsystem_cpu -def perfometer_mq_queues(row, command, perf): - size = int(perf[0][1]) - return "%s Messages" % size, perfometer_logarithmic(size, 1, 2, "#701141") - -perfometers['check_mk-mq_queues'] = perfometer_mq_queues -perfometers['check_mk-websphere_mq_channels'] = perfometer_mq_queues -perfometers['check_mk-websphere_mq_queues'] = perfometer_mq_queues - def perfometer_apc_mod_pdu_modules(row, check_command, perf_data): value = int(savefloat(perf_data[0][1]) * 100) return "%skw" % perf_data[0][1], perfometer_logarithmic(value, 500, 2, "#3366CC")

6 years, 5 months

Fixed bug in legacy logarithmic perfometer compatibility wrapper

by Lars Michelsen

Module: check_mk Branch: master Commit: cb4cb8c009402e9fa760857f5de11ff09309ce3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb4cb8c009402e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 31 12:18:37 2018 +0100 Fixed bug in legacy logarithmic perfometer compatibility wrapper Change-Id: Ie5f740bf5737bcd179bd562a980d8c45ddca415f --- web/htdocs/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index de830e9..a9287d3 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -950,7 +950,7 @@ class MetricometerRendererLogarithmic(MetricometerRenderer): def __init__(self, perfometer, translated_metrics): super(MetricometerRendererLogarithmic, self).__init__(perfometer, translated_metrics) - if "metric" not in self._perfometer: + if self._perfometer is not None and "metric" not in self._perfometer: raise MKGeneralException(_("Missing key \"metric\" in logarithmic perfometer: %r") % self._perfometer)

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018