Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Add MockHostExtraConf object to checktestlib.py

by Moritz Kiemer

Module: check_mk Branch: master Commit: cdbbec9d85ea62f0d0a27504817ad29db07e3d55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdbbec9d85ea62… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jun 26 11:34:26 2018 +0200 Add MockHostExtraConf object to checktestlib.py and apply in test_df_checks.py Change-Id: I8749a85648ce724b9f31b62b8eaf71a816f35b51 --- tests/unit/checks/checktestlib.py | 53 ++++++++++++++++++++++++++++++++++++++ tests/unit/checks/test_df_check.py | 23 ++++++++++------- 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 94f4feb..a3fbc47 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -395,3 +395,56 @@ class assertMKCounterWrapped(object): assert self.msg == str(ex), "%r != %r" % (self.msg, str(ex)) return True + +class MockHostExtraConf(object): + """Mock the calls to host_extra_conf. + + Due to our rather unorthodox import structure, we cannot mock + host_extra_conf_merged directly (it's a global var in running checks!) + Instead, we mock the calls to cmk_base.config.host_extra_conf. + + Passing a single dict to this objects init method will result in + host_extra_conf_merged returning said dict. + + You can also pass a list of dicts, but that's rather pointless, as + host_extra_conf_merged will return a merged dict, the result of + + merged_dict = {} + for d in reversed(list_of_dicts): + merged_dict.update(d) + . + + Usage: + + with MockHostExtraConf(mockconfig): + # run your check test here, + # host_extra_conf_merged in your check will return + # mockconfig + + See for example 'test_df_check.py'. + """ + TARGET = 'cmk_base.config.host_extra_conf' + + def __init__(self, mock_config): + self.context = None + assert type(mock_config) in (dict, list) + if isinstance(mock_config, dict): + self.config = [mock_config] + else: + self.config = mock_config + + def __call__(self, _hostname, _ruleset): + # ensure the default value is sane + return self.config + + def __enter__(self): + '''The default context: just mock get_item_state''' + self.context = mock.patch(MockHostExtraConf.TARGET, + # I'm the MockObj myself! + new_callable=lambda: self) + return self.context.__enter__() + + def __exit__(self, *exc_info): + return self.context.__exit__(*exc_info) + + diff --git a/tests/unit/checks/test_df_check.py b/tests/unit/checks/test_df_check.py index b0de7b4..5c6009c 100644 --- a/tests/unit/checks/test_df_check.py +++ b/tests/unit/checks/test_df_check.py @@ -1,5 +1,7 @@ import pytest -import checktestlib +from checktestlib import DiscoveryResult, CheckResult, \ + assertDiscoveryResultsEqual, MockHostExtraConf + pytestmark = pytest.mark.checks @@ -240,16 +242,16 @@ info_df_btrfs = \ (info_df_btrfs, [(u'/dev/sda1 btrfs /dev/sda1', {})], { "include_volume_name" : True }), # btrfs w/ volume name option ]) -def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_result, inventory_df_rules): -# NOTE: This commented-out code is the result of trying to mock the the ruleset variable itself instead of the -# host_extra_conf_merged function. It did not work. Maybe we can get it to work at a later stage. -# import cmk_base.config -# monkeypatch.setitem(cmk_base.config._check_contexts["df"], "inventory_df_rules", -# [({"include_volume_name": include_volume_name}, [], cmk_base.config.ALL_HOSTS, {})]) +def test_df_discovery_with_parse(check_manager, info, expected_result, inventory_df_rules): check = check_manager.get_check("df") - monkeypatch.setitem(check.context, "host_extra_conf_merged", lambda _, __: inventory_df_rules) - assert checktestlib.DiscoveryResult(check.run_discovery(check.run_parse(info))) == expected_result + + with MockHostExtraConf(inventory_df_rules): + raw_discovery_result = check.run_discovery(check.run_parse(info)) + + discovery_result = DiscoveryResult(raw_discovery_result) + expected_result = DiscoveryResult(expected_result) + assertDiscoveryResultsEqual(discovery_result, expected_result) @pytest.mark.parametrize("item,params,info,expected_result", [ @@ -266,4 +268,5 @@ def test_df_check_with_parse(check_manager, item, params, info, expected_result) if params == "default": params = check.default_parameters() - result = checktestlib.CheckResult(check.run_check(item, params, check.run_parse(info))) + result = CheckResult(check.run_check(item, params, check.run_parse(info))) +

6 years, 2 months

Fixed and enabled pointless-string-statement warnings.

by Sven Panne

Module: check_mk Branch: master Commit: de2909c02ab7231e346c4ffbde10f2667110f117 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de2909c02ab723… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 3 12:47:39 2018 +0200 Fixed and enabled pointless-string-statement warnings. Change-Id: Ibbd3bf5749a76561d80cd4db7e34f40085a5d6be --- checks/agent_jolokia | 8 +------- cmk_base/check_api.py | 5 ++++- tests/pylint/pylintrc | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/checks/agent_jolokia b/checks/agent_jolokia index dee2694..732d12c 100644 --- a/checks/agent_jolokia +++ b/checks/agent_jolokia @@ -26,13 +26,7 @@ def agent_jolokia_arguments(params, hostname, ipaddress): - arglist = [] - """ - if "timeout" in params: - args += ' --timeout %d' % params["timeout"] - """ - - arglist.append('--server %s' % quote_shell_string(ipaddress)) + arglist = ['--server %s' % quote_shell_string(ipaddress)] for param in ['port', 'suburi', 'instance', 'protocol']: if param in params: diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index ea67f01..1353834 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -83,7 +83,10 @@ Global variables: function. See get_rate() documentation for details ZERO Used as value for the "onwrap" argument of the get_rate() function. See get_rate() documentation for details -""" +""" # # pylint: disable=pointless-string-statement + +# NOTE: The above suppression is necessary because our testing framework blindly +# concatenates lots of files, including this one. import cmk.debug as _debug import cmk.paths as _paths diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index a6f3a70..f5e6fd4 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -53,7 +53,6 @@ disable= no-else-return, no-self-use, old-style-class, - pointless-string-statement, protected-access, redefine-in-handler, redefined-argument-from-local,

6 years, 2 months

Fixed and enabled pointless-statement warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 5e25808634528ccdd416f784a9bc64f5b4d9cfe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e25808634528c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 3 12:23:59 2018 +0200 Fixed and enabled pointless-statement warnings. Change-Id: I1e6bbb2d7c5a12da790e5f10ff9d83ff4caea6b9 --- checks/cisco_ace_rserver | 4 ++-- checks/netstat | 2 +- checks/ps.include | 2 +- tests/pylint/pylintrc | 1 - web/htdocs/background_job.py | 1 - web/htdocs/config.py | 4 ++-- web/htdocs/metrics.py | 2 +- web/htdocs/wato.py | 49 +++++++++++++++++++++++++------------------ web/plugins/views/commands.py | 2 +- 9 files changed, 37 insertions(+), 30 deletions(-) diff --git a/checks/cisco_ace_rserver b/checks/cisco_ace_rserver index 516ceca..8f91c57 100644 --- a/checks/cisco_ace_rserver +++ b/checks/cisco_ace_rserver @@ -48,7 +48,7 @@ def inventory_cisco_ace_rserver(info): elif descr != '': item = descr else: - ip + item = ip yield item, None @@ -85,7 +85,7 @@ def check_cisco_ace_rserver(item, _no_params, info): admin_state = admin_stati[admin_status] state, state_txt = oper_stati[oper_status] if admin_status == "2" and state == 2: - state == 1 # max state is WARN if real server out of service + state = 1 # max state is WARN if real server out of service infotext = "Operational State: %s, Administrative State: %s, Current Connections: %s" % \ (state_txt, admin_state, conns) perfdata = [ ("connections", int(conns)) ] diff --git a/checks/netstat b/checks/netstat index a7d6975..8732f59 100644 --- a/checks/netstat +++ b/checks/netstat @@ -62,7 +62,7 @@ def parse_netstat(info): proto = "UDP" # Ubuntu recently deviced to use "LISTEN" instead of "LISTENING" if connstate == "LISTEN": - connstate == "LISTENING" + connstate = "LISTENING" if len(line) == 5: # handles UDP listeners proto, recv_q, send_q, local, remote = line diff --git a/checks/ps.include b/checks/ps.include index 78475b7..92e2af8 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -330,7 +330,7 @@ def ps_cleanup_params(params): def ps_has_extended_perfdata(process_info): try: - process_info[4] + _dummy = process_info[4] return True except IndexError: return False diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index ea23405..a6f3a70 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -53,7 +53,6 @@ disable= no-else-return, no-self-use, old-style-class, - pointless-statement, pointless-string-statement, protected-access, redefine-in-handler, diff --git a/web/htdocs/background_job.py b/web/htdocs/background_job.py index 9eaa3bb..4ee08a8 100644 --- a/web/htdocs/background_job.py +++ b/web/htdocs/background_job.py @@ -287,7 +287,6 @@ class BackgroundJob(object): housekeeping_max_age_sec = 86400 * 30 housekeeping_max_count = 50 - _ def __init__(self, job_id, logger=None, **kwargs): super(BackgroundJob, self).__init__() self._job_id = job_id diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 5e7422e..8752a28 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -183,7 +183,7 @@ def reporting_available(): try: # Check the existance of one arbitrary config variable from the # reporting module - reporting_filename + _dummy = reporting_filename return True except: return False @@ -191,7 +191,7 @@ def reporting_available(): def combined_graphs_available(): try: - have_combined_graphs + _dummy = have_combined_graphs return True except: return False diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index a79bf68..bc6aa27 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -1604,7 +1604,7 @@ def render_graph_pnp(graph_template, translated_metrics): def cmk_graphs_possible(site_id = None): try: - render_graph_html # Will throw exception if missing + _dummy = render_graph_html # Will throw exception if missing return not config.force_pnp_graphing \ and browser_supports_canvas() \ and site_is_running_cmc(site_id) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4f3aa5f..63c186e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1445,7 +1445,7 @@ def mode_edit_host(phase, new, is_cluster): html.open_ul() for error in errors: html.li(error) - html.close_ul + html.close_ul() html.close_p() if html.form_submitted(): @@ -3466,50 +3466,59 @@ class ModeDiscovery(WatoMode): descr, state, output, perfdata = check checkbox_name = self._checkbox_name(check_type, item) - buttons = [] + num_buttons = 0 if table_source == self.SERVICE_MONITORED: if config.user.may("wato.service_discovery_to_undecided"): - buttons.append(icon_button(table_source, checkbox_name, self.SERVICE_UNDECIDED, "undecided")) + icon_button(table_source, checkbox_name, self.SERVICE_UNDECIDED, "undecided") + num_buttons += 1 if may_edit_ruleset("ignored_services") \ and config.user.may("wato.service_discovery_to_ignored"): - buttons.append(icon_button(table_source, checkbox_name, self.SERVICE_IGNORED, "disabled")) + icon_button(table_source, checkbox_name, self.SERVICE_IGNORED, "disabled") + num_buttons += 1 elif table_source == self.SERVICE_IGNORED: if may_edit_ruleset("ignored_services"): if config.user.may("wato.service_discovery_to_monitored"): - buttons.append(icon_button(table_source, checkbox_name, self.SERVICE_MONITORED, "monitored")) + icon_button(table_source, checkbox_name, self.SERVICE_MONITORED, "monitored") + num_buttons += 1 if config.user.may("wato.service_discovery_to_ignored"): - buttons.append(icon_button(table_source, checkbox_name, self.SERVICE_UNDECIDED, "undecided")) - buttons.append(disabled_services_button()) + icon_button(table_source, checkbox_name, self.SERVICE_UNDECIDED, "undecided") + num_buttons += 1 + disabled_services_button() + num_buttons += 1 elif table_source == self.SERVICE_VANISHED: if config.user.may("wato.service_discovery_to_removed"): - buttons.append(icon_button_removed(table_source, checkbox_name)) + icon_button_removed(table_source, checkbox_name) + num_buttons += 1 if may_edit_ruleset("ignored_services") \ and config.user.may("wato.service_discovery_to_ignored"): - buttons.append(icon_button(table_source, checkbox_name, self.SERVICE_IGNORED, "disabled")) + icon_button(table_source, checkbox_name, self.SERVICE_IGNORED, "disabled") + num_buttons += 1 elif table_source == self.SERVICE_UNDECIDED: if config.user.may("wato.service_discovery_to_monitored"): - buttons.append(icon_button(table_source, checkbox_name, self.SERVICE_MONITORED, "monitored")) + icon_button(table_source, checkbox_name, self.SERVICE_MONITORED, "monitored") + num_buttons += 1 if may_edit_ruleset("ignored_services") \ and config.user.may("wato.service_discovery_to_ignored"): - buttons.append(icon_button(table_source, checkbox_name, self.SERVICE_IGNORED, "disabled")) + icon_button(table_source, checkbox_name, self.SERVICE_IGNORED, "disabled") + num_buttons += 1 - while len(buttons) < 2: - buttons.append(html.empty_icon()) + while num_buttons < 2: + html.empty_icon() + num_buttons += 1 if table_source not in [self.SERVICE_UNDECIDED, self.SERVICE_IGNORED] \ and config.user.may('wato.rulesets'): - buttons.append(rulesets_button()) - buttons.append(check_parameters_button()) + rulesets_button() + check_parameters_button() + num_buttons += 2 - while len(buttons) < 4: - buttons.append(html.empty_icon()) - - for button in buttons: - button + while num_buttons < 4: + html.empty_icon() + num_buttons += 1 def _get_ruleset_name(self, table_source, check_type, checkgroup): diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 75ecfcd..efc3e46 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -781,7 +781,7 @@ def paint_downtime_buttons(what): def has_recurring_downtimes(): try: - wato.recurring_downtimes_types # Check if this exists + _dummy = wato.recurring_downtimes_types # Check if this exists return True except AttributeError: return False

6 years, 2 months

6319 FIX Fixed wrong changelog entry when moving folders

by Lars Michelsen

Module: check_mk Branch: master Commit: 3088b4e3777f25b4234943408304bea0c75e146b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3088b4e3777f25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 3 12:00:17 2018 +0200 6319 FIX Fixed wrong changelog entry when moving folders The source folder path did not show up correctly in the WATO changes entry after moving a folder Change-Id: Ibf8cbc4ec660c91057909c436b6319c2673aa2df --- .werks/6319 | 12 ++++++++++++ web/htdocs/watolib.py | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/6319 b/.werks/6319 new file mode 100644 index 0000000..5a5707f --- /dev/null +++ b/.werks/6319 @@ -0,0 +1,12 @@ +Title: Fixed wrong changelog entry when moving folders +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530611952 + +The source folder path did not show up correctly in the WATO changes entry +after moving a folder diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index e3f1493..6c7bbcf 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2214,6 +2214,8 @@ class CREFolder(BaseFolder): if os.path.exists(target_folder.filesystem_path() + "/" + subfolder.name()): raise MKUserError(None, _("Cannot move folder: A folder with this name already exists in the target folder.")) + original_alias_path = subfolder.alias_path() + # 2. Actual modification affected_sites = subfolder.all_site_ids() old_filesystem_path = subfolder.filesystem_path() @@ -2225,7 +2227,7 @@ class CREFolder(BaseFolder): Folder.invalidate_caches() affected_sites = list(set(affected_sites + subfolder.all_site_ids())) add_change("move-folder", - _("Moved folder %s to %s") % (subfolder.alias_path(), target_folder.alias_path()), + _("Moved folder %s to %s") % (original_alias_path, target_folder.alias_path()), obj=subfolder, sites=affected_sites) need_sidebar_reload()

6 years, 2 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: d97a556642e71c4e19828c4701ef76e23c951987 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d97a556642e71c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 3 11:58:58 2018 +0200 Reserved 20 Werk IDS Change-Id: Ib39284f11db654d7495a2ffc9fc61e2255b929b0 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1862ace..97efd5d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6319 +6339

6 years, 2 months

Fixed and enabled expression-not-assigned warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 64cb8915c81cdcb15e131a8e6836bba864face01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64cb8915c81cdc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 3 11:42:25 2018 +0200 Fixed and enabled expression-not-assigned warnings. Change-Id: I35dd2130a2b1fa669ba7c79673fd11f08cbb3d9e --- bin/mkbench | 6 +++--- checks/cbl_airlaser | 4 ++-- checks/f5_bigip_snat | 12 ++++++------ checks/f5_bigip_vserver | 26 +++++++++++++------------- checks/if.include | 5 +---- tests/pylint/pylintrc | 1 - web/htdocs/notifications.py | 2 +- web/htdocs/valuespec.py | 8 ++++++-- web/htdocs/wato.py | 4 ++-- web/plugins/wato/check_parameters.py | 8 ++++---- 10 files changed, 38 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=64cb8915c8…

6 years, 2 months

Raise a more specific Exception for missing check info.

by Moritz Kiemer

Module: check_mk Branch: master Commit: a3a782d36e24e6c552da27db4360395fe5ed836d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3a782d36e24e6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Jul 2 14:14:20 2018 +0200 Raise a more specific Exception for missing check info. Change-Id: I03438fa97167a8fa896dd6e5e9849d139933d9cd --- tests/testlib/__init__.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d3a6457..1294525 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1789,10 +1789,16 @@ class CheckManager(object): return ActiveCheck(name) +class MissingCheckInfoError(KeyError): + pass + + class Check(object): def __init__(self, name): import cmk_base.config as config self.name = name + if name not in config.check_info: + raise MissingCheckInfoError(name) self.info = config.check_info[name] self.context = config._check_contexts[name] @@ -1804,17 +1810,25 @@ class Check(object): def run_parse(self, info): parse_func = self.info.get("parse_function") if not parse_func: - raise Exception("This check has no parse function defined") - + raise MissingCheckInfoError("Check '%s' " % self.name + + "has no parse function defined") return parse_func(info) def run_discovery(self, info): + disco_func = self.info.get("inventory_function") + if not disco_func: + raise MissingCheckInfoError("Check '%s' " % self.name + + "has no discovery function defined") # TODO: use standard sanitizing code - return self.info["inventory_function"](info) + return disco_func(info) def run_check(self, item, params, info): + check_func = self.info.get("check_function") + if not check_func: + raise MissingCheckInfoError("Check '%s' " % self.name + + "has no check function defined") # TODO: use standard sanitizing code - return self.info["check_function"](item, params, info) + return check_func(item, params, info) #def run_parse_with_walk(self, walk_name): # if "parse_function" not in self.info:

6 years, 2 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: a07af6241490f2dd057b5da8de9371b4cf61bea7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a07af6241490f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 3 10:11:18 2018 +0200 Minor cleanup Change-Id: I3dddb155f5d01f54316988c697db0d3a33c08970 --- agents/plugins/mk_sap_hana | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/agents/plugins/mk_sap_hana b/agents/plugins/mk_sap_hana index 5fbeb44..da945b3 100755 --- a/agents/plugins/mk_sap_hana +++ b/agents/plugins/mk_sap_hana @@ -37,8 +37,7 @@ # Config might include # DB_USER_hpy=foo # DB_PASSWORD_hpy=bar -if [ -f "$MK_CONFDIR/sap_hana.cfg" ]; -then +if [ -f "$MK_CONFDIR/sap_hana.cfg" ]; then . "$MK_CONFDIR/sap_hana.cfg" fi @@ -104,7 +103,7 @@ function sap_hana_mem () { echo "[[[resident]]]" sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "SELECT HOST, ROUND(SUM(PHYSICAL_MEMORY_SIZE/1024/1024/1024),2) FROM M_SERVICE_MEMORY GROUP BY HOST;" echo "[[[database]]]" - sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select HOST, round(INSTANCE_TOTAL_MEMORY_ALLOCATED_SIZE/(1024*1024*1024), 2), round(ALLOCATION_LIMIT/(1024*1024*1024), 2), ROUND((USED_PHYSICAL_MEMORY + FREE_PHYSICAL_MEMORY)/1024/1024/1024,2) from M_HOST_RESOURCE_UTILIZATION;" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select HOST, round(INSTANCE_TOTAL_MEMORY_ALLOCATED_SIZE/(1024*1024*1024), 2), round(ALLOCATION_LIMIT/(1024*1024*1024), 2), ROUND((USED_PHYSICAL_MEMORY + FREE_PHYSICAL_MEMORY)/1024/1024/1024,2) from M_HOST_RESOURCE_UTILIZATION;" } @@ -135,8 +134,7 @@ function sap_hana_filesystem () { echo "<<<sap_hana_products>>>" $LSSAP -for line in $($LSSAP | awk -F"|" '{if ($0 ~/\//) print tolower($1)"adm|"$2}' | sed "s/\s*//g") -do +for line in $($LSSAP | awk -F"|" '{if ($0 ~/\//) print tolower($1)"adm|"$2}' | sed "s/\s*//g"); do sidadm=$(echo "${line}" | cut -d"|" -f1) sidadm_short=${sidadm/%adm/} inst_nr=$(echo "${line}" | cut -d"|" -f2)

6 years, 2 months

Disable spelling-related checks for real now.

by Sven Panne

Module: check_mk Branch: master Commit: a1b20f21ab58add7d969a9a70d0da58b2306d701 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1b20f21ab58ad… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 3 08:31:10 2018 +0200 Disable spelling-related checks for real now. Change-Id: I7389da9868d65a29cb42d6ab24dbf5e78d265f04 --- tests/pylint/pylintrc | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index 78976b0..a1851cc 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -95,9 +95,10 @@ disable= wildcard-import, wrong-import-order, wrong-import-position, -# Trial balloon: Disable spell checking to see if it speeds up pylint significantly. -# wrong-spelling-in-comment, -# wrong-spelling-in-docstring, + # Enabling the two spelling-related checks increases pylints runtime from + # 11 min to 40 min, so we better keep those disabled for normal runs. + # wrong-spelling-in-comment, + # wrong-spelling-in-docstring, [TYPECHECK] # rrdtool @@ -129,13 +130,3 @@ additional-builtins=html,_,_u,current_language,HTML [MISCELLANEOUS] # List of note tags to take in consideration, separated by a comma. notes=FIXME,TODO - -#[SPELLING] -#spelling-dict=en_US -# List of comma separated words that should not be checked. -#spelling-ignore-words= -# A path to a file that contains private dictionary; one word per line. -#spelling-private-dict-file= -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -#spelling-store-unknown-words=no

6 years, 2 months

6301 FIX if_fortigate: Related graphs look like all other interface graphs

by Simon Betz

Module: check_mk Branch: master Commit: 81ae3df7a5f669c2abf6ff7d270a1a8ad98da541 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81ae3df7a5f669… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 3 08:34:29 2018 +0200 6301 FIX if_fortigate: Related graphs look like all other interface graphs Change-Id: I2ce7c7771844682581ff9ed3ef6106eb3e53607b --- .werks/6301 | 11 +++++++++++ web/plugins/metrics/check_mk.py | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/6301 b/.werks/6301 new file mode 100644 index 0000000..e0bcb8c --- /dev/null +++ b/.werks/6301 @@ -0,0 +1,11 @@ +Title: if_fortigate: Related graphs look like all other interface graphs +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530599223 + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 1f2462a..95f4606 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4817,6 +4817,7 @@ check_metrics["check_mk-vms_if"] = if_translation check_metrics["check_mk-winperf_if"] = if_translation check_metrics["check_mk-emc_vplex_if"] = if_translation check_metrics["check_mk-huawei_osn_if"] = if_translation +check_metrics["check_mk-if_fortigate"] = if_translation check_metrics["check_mk-brocade_fcport"] = { "in" : { "name": "fc_rx_bytes", },

6 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018