Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

by Andreas

Module: check_mk Branch: master Commit: eff4bbfff80d4b1f8cd852d1e3994794176626f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eff4bbfff80d4b… Author: Andreas <ab(a)mathias-kettner.de> Date: Mon Jun 4 13:15:57 2018 +0200 update for WK5814 Change-Id: I479e0924ddca94c1901490013267d490b6561b67 --- cmk_base/checking.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index d3a45c4..d177bcb 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -51,6 +51,11 @@ import cmk_base.check_table as check_table from cmk_base.exceptions import MKTimeout, MKParseFunctionError, MKIPAddressLookupError, \ MKAgentError, MKSNMPError +try: + import cmk_base.cee.keepalive as keepalive +except Exception: + keepalive = None + # global variables used to cache temporary values that do not need # to be reset after a configuration change.

6 years, 6 months

update

by Andreas

Module: check_mk Branch: master Commit: 27dffb002d080c4420b0f93490c5bc7602a3b64c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27dffb002d080c… Author: Andreas <ab(a)mathias-kettner.de> Date: Mon Jun 4 10:08:41 2018 +0200 update Change-Id: I1b7715f1a66fa14c25f78befa97c11af25ce5bf1 --- .werks/5814 | 13 +++++++++++++ cmk_base/check_table.py | 2 +- cmk_base/checking.py | 41 ++++++++++++++++++++++++++------------- cmk_base/data_sources/__init__.py | 13 +++++++++++-- cmk_base/discovery.py | 4 ---- cmk_base/utils.py | 13 +++++++++++++ 6 files changed, 65 insertions(+), 21 deletions(-) diff --git a/.werks/5814 b/.werks/5814 new file mode 100644 index 0000000..38d6b2d --- /dev/null +++ b/.werks/5814 @@ -0,0 +1,13 @@ +Title: Fixed missing clustered snmp services on cluster hosts +Level: 2 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1528106268 + +Clustered snmp services did not receive from their nodes. +The data required by the cluster host was either missing or an error message was displayed, stating: +"The check type filter function has not been set". diff --git a/cmk_base/check_table.py b/cmk_base/check_table.py index fedcfc3..e66a493 100644 --- a/cmk_base/check_table.py +++ b/cmk_base/check_table.py @@ -42,8 +42,8 @@ import cmk_base.item_state as item_state # Format: (checkname, item) -> (params, description) # # filter_mode: None -> default, returns only checks for this host -# filter_mode: "include_clustered" -> returns checks of own host, including clustered checks # filter_mode: "only_clustered" -> returns only checks belonging to clusters +# filter_mode: "include_clustered" -> returns checks of own host, including clustered checks def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='config', skip_autochecks=False, filter_mode=None, skip_ignored=True): import cmk_base.discovery as discovery diff --git a/cmk_base/checking.py b/cmk_base/checking.py index c1c9fb1..d3a45c4 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -51,10 +51,6 @@ import cmk_base.check_table as check_table from cmk_base.exceptions import MKTimeout, MKParseFunctionError, MKIPAddressLookupError, \ MKAgentError, MKSNMPError -try: - import cmk_base.cee.keepalive as keepalive -except ImportError: - keepalive = None # global variables used to cache temporary values that do not need # to be reset after a configuration change. @@ -82,7 +78,7 @@ def handle_check_mk_check_result(check_plugin_name, description): raise except MKTimeout: - if _in_keepalive_mode(): + if cmk_base.utils.in_keepalive_mode(): raise else: infotexts.append("Timed out") @@ -112,7 +108,7 @@ def handle_check_mk_check_result(check_plugin_name, description): output_txt = "%s\n%s" % (output_txt, "\n".join(long_infotexts)) output_txt += "\n" - if _in_keepalive_mode(): + if cmk_base.utils.in_keepalive_mode(): keepalive.add_keepalive_active_check_result(hostname, output_txt) console.verbose(output_txt.encode("utf-8")) else: @@ -214,19 +210,39 @@ def _do_all_checks_on_host(sources, hostname, ipaddress, only_check_plugin_names checks.set_hostname(hostname) - table = check_table.get_precompiled_check_table(hostname, remove_duplicates=True, - world="active" if _in_keepalive_mode() else "config") + filter_mode = None + + belongs_to_cluster = len(config.clusters_of(hostname)) > 0 + if belongs_to_cluster: + filter_mode = "include_clustered" + + table = check_table.get_precompiled_check_table(hostname, remove_duplicates=True, filter_mode=filter_mode, + world="active" if cmk_base.utils.in_keepalive_mode() else "config") # When check types are specified via command line, enforce them. Otherwise use the # list of checks defined by the check table. if only_check_plugin_names is None: - only_check_plugin_names = list(set([ e[0] for e in table ])) + only_check_plugin_names = set([e[0] for e in table]) + else: + only_check_plugin_names = set(only_check_plugin_names) sources.enforce_check_plugin_names(only_check_plugin_names) # Gather the data from the sources multi_host_sections = sources.get_host_sections() + # Filter out check types which are not used on the node + if belongs_to_cluster: + pos_match = set() + neg_match = set() + for check_plugin_name, item, params, description in table: + if hostname != config.host_of_clustered_service(hostname, description): + pos_match.add(check_plugin_name) + else: + neg_match.add(check_plugin_name) + only_check_plugin_names -= (pos_match - neg_match) + + for check_plugin_name, item, params, description in table: if only_check_plugin_names != None and check_plugin_name not in only_check_plugin_names: continue @@ -385,7 +401,7 @@ def _do_status_data_inventory(sources, multi_host_sections, hostname, ipaddress) def is_manual_check(hostname, check_plugin_name, item): manual_checks = check_table.get_check_table(hostname, remove_duplicates=True, - world="active" if _in_keepalive_mode() else "config", + world="active" if cmk_base.utils.in_keepalive_mode() else "config", skip_autochecks=True) return (check_plugin_name, item) in manual_checks @@ -578,7 +594,7 @@ def _output_check_result(servicedesc, state, infotext, perftexts): def _do_submit_to_core(host, service, state, output, cached_at = None, cache_interval = None): - if _in_keepalive_mode(): + if cmk_base.utils.in_keepalive_mode(): # Regular case for the CMC - check helpers are running in keepalive mode keepalive.add_keepalive_check_result(host, service, state, output, cached_at, cache_interval) @@ -691,6 +707,3 @@ def disable_submit(): global _submit_to_core _submit_to_core = False - -def _in_keepalive_mode(): - return keepalive and keepalive.enabled() diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 8cc44da..87ce1f2 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -55,6 +55,8 @@ import cmk_base.checks as checks import cmk_base.item_state as item_state import cmk_base.ip_lookup as ip_lookup import cmk_base.piggyback +import cmk_base.check_table as check_table + from .snmp import SNMPDataSource, SNMPManagementBoardDataSource from .ipmi import IPMIManagementBoardDataSource @@ -247,9 +249,14 @@ class DataSources(object): if nodes is not None: for node_hostname in nodes: node_ipaddress = ip_lookup.lookup_ip_address(node_hostname) + + table = check_table.get_precompiled_check_table(node_hostname, remove_duplicates=True, filter_mode="only_clustered", + world="active" if cmk_base.utils.in_keepalive_mode() else "config") + + node_data_sources = DataSources(node_hostname, node_ipaddress) + node_data_sources.enforce_check_plugin_names(set([e[0] for e in table])) hosts.append((node_hostname, node_ipaddress, - DataSources(node_hostname, node_ipaddress), - config.cluster_max_cachefile_age)) + node_data_sources, config.cluster_max_cachefile_age)) else: hosts.append((self._hostname, self._ipaddress, self, config.check_max_cachefile_age)) @@ -278,3 +285,5 @@ class DataSources(object): cmk_base.piggyback.store_piggyback_raw_data(this_hostname, host_sections.piggybacked_raw_data) return multi_host_sections + + diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 8c5fd8f..4aa2d60 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -645,10 +645,6 @@ def schedule_discovery_check(hostname): raise -def _in_keepalive_mode(): - return keepalive and keepalive.enabled() - - #. # .--Discovery-----------------------------------------------------------. # | ____ _ | diff --git a/cmk_base/utils.py b/cmk_base/utils.py index 22acd96..5f2096c 100644 --- a/cmk_base/utils.py +++ b/cmk_base/utils.py @@ -43,6 +43,11 @@ from cmk.utils import \ import sys import itertools +try: + import cmk_base.cee.keepalive as keepalive +except Exception: + keepalive = None + # Aggegates several monitoring states to the worst state def worst_service_state(*states): @@ -182,6 +187,14 @@ def has_feature(name): except ImportError: return False + + +def in_keepalive_mode(): + if keepalive: + return keepalive.enabled() + else: + return False + #. # .--Ctrl-C--------------------------------------------------------------. # | ____ _ _ ____ |

6 years, 6 months

Fix OpenHardwareMonitorCLI.exe binary executable

by Jukka Aro

Module: check_mk Branch: master Commit: fd601e40bdd1567bb7d21cf435961e93da697205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd601e40bdd156… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Jun 4 09:03:23 2018 +0200 Fix OpenHardwareMonitorCLI.exe binary executable For some unknown reason, the binary executable committed in Git (sic!) was broken by commit f7e83db8a82dc2f2d94c893daa23f94aa03a2383 / Werk 6189 (only in master, not in 1.5.0). Change-Id: I9e7f8292d873e5f7026378f34cc8db5154268206 --- .../Bin/Release/OpenHardwareMonitorCLI.exe | Bin 11264 -> 11264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe index f116955..2a4676f 100755 Binary files a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe and b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe differ

6 years, 6 months

Fixed global/local variable confusion, found by pylint.

by Sven Panne

Module: check_mk Branch: master Commit: 191f9d1f16c2a3f78114007fe97e2eded6442100 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=191f9d1f16c2a3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 1 15:52:23 2018 +0200 Fixed global/local variable confusion, found by pylint. Change-Id: I065da1722eb5136b83069c64ab8f1bda6899e95c --- web/htdocs/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 98fb112..5e7422e 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -817,10 +817,10 @@ def is_single_local_site(): def site_attribute_default_value(): - default_site = default_site() + def_site = default_site() authorized_site_ids = map(lambda x: x[0], user.authorized_sites(unfiltered_sites=configured_sites())) - if default_site and default_site in authorized_site_ids: - return default_site + if def_site and def_site in authorized_site_ids: + return def_site def site_attribute_choices():

6 years, 6 months

Added a few more suppressions.

by Sven Panne

Module: check_mk Branch: master Commit: dbdfe48a24403b81de5ad0761103413de729250f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbdfe48a24403b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 1 15:36:35 2018 +0200 Added a few more suppressions. Change-Id: I8411be15bb06f83d314fcb803ac6d1114d7e3ae7 --- web/htdocs/crash_reporting.py | 2 +- web/htdocs/forms.py | 2 +- web/plugins/icons/wato.py | 4 ++-- web/plugins/userdb/ldap.py | 2 +- web/plugins/views/layouts.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 499169d..f49d302 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -243,7 +243,7 @@ def get_crash_report_target(what): # TODO: Would be cleaner to override if we used OOP def get_version(what): if what == "cma": - import cma + import cma # pylint: disable=import-error return cma.version() else: return cmk.__version__ diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index bf184de..7909859 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -230,7 +230,7 @@ def header(title, isopen = True, table_id = "", narrow = False, css=None): global g_section_open global g_section_isopen try: - if g_header_open: + if g_header_open: # pylint: disable=used-before-assignment end() except: pass diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 4a7702b..4c11343 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -81,11 +81,11 @@ multisite_icons_and_actions['wato'] = { # '----------------------------------------------------------------------' def paint_download_agent_output(*args): - return paint_download_host_info(*args, ty="agent") + return paint_download_host_info(*args, ty="agent") # pylint: disable=no-value-for-parameter def paint_download_snmp_walk(*args): - return paint_download_host_info(*args, ty="walk") + return paint_download_host_info(*args, ty="walk") # pylint: disable=no-value-for-parameter def paint_download_host_info(what, row, tags, host_custom_vars, ty): diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index c9b6ce9..cb03e87 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -321,7 +321,7 @@ class LDAPUserConnector(UserConnector): def _discover_nearest_dc(self, domain): - import ad + import ad # pylint: disable=import-error locator = ad.Locator() locator.m_logger = self._logger try: diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 12704c8..f9f641c 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -366,7 +366,7 @@ multisite_layouts["boxed"] = { def render_grouped_boxed_graphs(*args): - return render_grouped_boxes(*args, css_class="graph") + return render_grouped_boxes(*args, css_class="graph") # pylint: disable=no-value-for-parameter multisite_layouts["boxed_graph"] = {

6 years, 6 months

Suppress a few pylint warnings about optional packages.

by Sven Panne

Module: check_mk Branch: master Commit: 448f3ba7f1f8650e435f323d3eae405e79f0c6bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=448f3ba7f1f865… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 1 14:42:58 2018 +0200 Suppress a few pylint warnings about optional packages. Change-Id: I52ae41beef243c1b30a4b3c7ff5209e07ae0ea62 --- active_checks/check_sql | 5 +++-- agents/plugins/mk_inotify | 3 ++- agents/plugins/mk_logwatch | 4 ++-- bin/mkbackup | 16 ++++++++-------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/active_checks/check_sql b/active_checks/check_sql index 866b1e2..2ac882b 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -202,8 +202,9 @@ try: db_connection = db.connect(cstring) elif opt_dbms == "db2": - import ibm_db # IBM data server driver - import ibm_db_dbi + # IBM data server driver + import ibm_db # pylint: disable=import-error + import ibm_db_dbi # pylint: disable=import-error db = ibm_db if opt_port == None: opt_port=50000 diff --git a/agents/plugins/mk_inotify b/agents/plugins/mk_inotify index bdd4408..33fd1be 100755 --- a/agents/plugins/mk_inotify +++ b/agents/plugins/mk_inotify @@ -31,7 +31,8 @@ import signal import ConfigParser try: - import pyinotify + # TODO: We should probably ship this package. + import pyinotify # pylint: disable=import-error except: sys.stderr.write("Error: Python plugin pyinotify is not installed") sys.exit(1) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 6f9ca0b..0211325 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -67,7 +67,7 @@ class MEIFolderCleaner(object): if not hasattr(sys, "frozen"): return - import win32file + import win32file # pylint: disable=import-error import tempfile base_path = tempfile.gettempdir() for f in os.listdir(base_path): @@ -296,7 +296,7 @@ def is_inode_cabable(path): return True elif "windows" in os_type: volume_name = "%s:\\\\" % path.split(":", 1)[0] - import win32api + import win32api # pylint: disable=import-error volume_info = win32api.GetVolumeInformation(volume_name) volume_type = volume_info[-1] if "ntfs" in volume_type.lower(): diff --git a/bin/mkbackup b/bin/mkbackup index e04658b..8f57f88 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -341,7 +341,7 @@ def add_site_info_to_backup_info(info): def add_system_info_to_backup_info(info): - import cma + import cma # pylint: disable=import-error cma.load_config() info["cma_version"] = cma.version() @@ -1218,7 +1218,7 @@ def write_to_tarfile_threaded(pipeout_fd, base_path, exclude_patterns): # Whether or not the data filesystem is mounted (-> on active cluster nodes) def is_inactive_cluster_node(): - import cma + import cma # pylint: disable=import-error cma.load_config() return cma.inactive_cluster_node() @@ -1613,7 +1613,7 @@ def do_system_restore(opts, info): def verify_data_volume_is_mounted(): - import cma + import cma # pylint: disable=import-error count = 0 is_mounted = cma.is_mounted("/omd") @@ -1627,7 +1627,7 @@ def verify_data_volume_is_mounted(): def prepare_cluster_environment(info): - import cma + import cma # pylint: disable=import-error cma.load_config() if cma.is_cluster_configured() and not is_cluster_backup(info): @@ -1645,7 +1645,7 @@ def prepare_cluster_environment(info): def setup_cluster_environment(info): log("Setting up cluster environment") - import cma + import cma # pylint: disable=import-error cma.load_config() # To be able to start the DRBD volume we need to have the IP @@ -1667,7 +1667,7 @@ def setup_standalone_environment(info): def enable_drbd_ip_addresses(): - import cma, cma_net + import cma, cma_net # pylint: disable=import-error cma.load_config() cma_net.load_config() @@ -1687,7 +1687,7 @@ def enable_drbd_ip_addresses(): def verify_cma_version_compatible(info): - import cma + import cma # pylint: disable=import-error if info["cma_version"] != cma.version(): raise MKGeneralException("The backup can not be restored because the version of the " "backup (%s) and the currently installed firmware (%s) are not the same. You " @@ -1719,7 +1719,7 @@ def cleanup_system_rw_files(files_before, files_restored): def prepare_system_restore(): - import cma + import cma # pylint: disable=import-error log("Cleaning up Check_MK processess and temporary filesystems") cma.free_omd_ressources(graceful=False)

6 years, 6 months

Add a few local suppression to make pylint 1.9.1 happy.

by Sven Panne

Module: check_mk Branch: master Commit: 3acde20bb3a7fd27d521a63224a18d3b9a512e9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3acde20bb3a7fd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 1 14:17:32 2018 +0200 Add a few local suppression to make pylint 1.9.1 happy. Change-Id: Ie08d7ce018a6bcfe5a0e52b3318a6f19146397e6 --- agents/plugins/mk_logwatch | 3 ++- bin/livedump | 3 ++- checks/job | 3 ++- checks/megaraid_bbu | 3 ++- cmk_base/modes/check_mk.py | 3 ++- omd/packages/omd/omd | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 1111a44..6f9ca0b 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -213,7 +213,8 @@ def read_config(): # New pattern for line matching => clear continuation and rewrite patterns cont_list = [] rewrite_list = [] - patterns.append((level, compiled, cont_list, rewrite_list)) + # TODO: Fix the code and remove the pragma below! + patterns.append((level, compiled, cont_list, rewrite_list)) # pylint: disable=used-before-assignment else: # filename line patterns = [] diff --git a/bin/livedump b/bin/livedump index 6fd767b..8a4395a 100755 --- a/bin/livedump +++ b/bin/livedump @@ -84,7 +84,8 @@ def encode_row(row): def connect(): global g_connection, opt_socket - if not opt_socket and not omd_root(): + # TODO: Fix the code and remove the pragma below! + if not opt_socket and not omd_root(): # pylint: disable=used-before-assignment bail_out("Please specify the URL of the livestatus socket.") elif omd_root(): opt_socket = "unix:%s/tmp/run/live" % omd_root() diff --git a/checks/job b/checks/job index dd6008e..d64e064 100644 --- a/checks/job +++ b/checks/job @@ -94,7 +94,8 @@ def parse_job(info): elif key in [ 'max_res_kbytes', 'avg_mem_kbytes' ]: key = key.replace('kbytes', 'bytes') val = int(val) * 1000 - job[prefix+key] = val + # TODO: Fix the code and remove the pragma below! + job[prefix+key] = val # pylint: disable=unsupported-assignment-operation return parsed diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu index 33e6b5b..9ea10e4 100644 --- a/checks/megaraid_bbu +++ b/checks/megaraid_bbu @@ -66,7 +66,8 @@ def megaraid_bbu_parse(info): elif current_hba != None: # We lose the numerical temperature here # (same key is used twice in output of megacli) - current_hba[name] = data + # TODO: Fix the code and remove the pragma below! + current_hba[name] = data # pylint: disable=unsupported-assignment-operation return controllers diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 062fd55..a3b0f26 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1346,7 +1346,8 @@ def mode_notify(options, *args): import cmk_base.config as config import cmk_base.notify as notify config.load(with_conf_d=True, validate_hosts=False) - return notify.do_notify(options, *args) + # TODO: Fix the code and remove the pragma below! + return notify.do_notify(options, *args) # pylint: disable=no-value-for-parameter modes.register(Mode( long_option="notify", diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index e16bc09..b2482af 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -4080,7 +4080,8 @@ def handle_global_option(opt, orig): def opt_arg(): global main_args - if len(main_args) < 1: + # TODO: Fix the code and remove the pragma below! + if len(main_args) < 1: # pylint: disable=used-before-assignment bail_out("Option %s needs an argument." % opt) arg = main_args[0] main_args = main_args[1:]

6 years, 6 months

Test balloon, 2nd attempt: Use latest version of pylint.

by Sven Panne

Module: check_mk Branch: master Commit: 228c43eccc3297c0a59034c0f91d11690e91b37d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=228c43eccc3297… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 30 10:23:02 2018 +0200 Test balloon, 2nd attempt: Use latest version of pylint. Change-Id: I7ae6574d32a90a3a1a1200918afc462e9ffec222 --- Pipfile | 2 +- Pipfile.lock | 34 ++++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Pipfile b/Pipfile index a9efb33..db16602 100644 --- a/Pipfile +++ b/Pipfile @@ -18,7 +18,7 @@ dill = "*" bandit = "*" lockfile = "*" lxml = "*" -pylint = "==1.6.4" # Newer version was broken - check again one day +pylint = "*" pyenchant = "*" [packages] diff --git a/Pipfile.lock b/Pipfile.lock index fa97da2..272a4b5 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "79d10de9cd316fcb769f36d73ad634bf38cd24ce45d6bdd2714912468bbfdd9f" + "sha256": "69f55b4a39564eb4adf6f821915689434aa70df52564e0c7edd131137352b92b" }, "pipfile-spec": 6, "requires": { @@ -595,10 +595,10 @@ "develop": { "astroid": { "hashes": [ - "sha256:944400d94e45865af150fb98700b27b788ddee5ad17c77d0725f67ac271f7a10", - "sha256:a483e7891ce3a06dadfc6cb9095b0938aca58940d43576d72e4502b480c085d7" + "sha256:032f6e09161e96f417ea7fad46d3fac7a9019c775f202182c22df0e4f714cb1c", + "sha256:dea42ae6e0b789b543f728ddae7ddb6740ba33a49fb52c4a4d9cb7bb4aa6ec09" ], - "version": "==1.4.9" + "version": "==1.6.4" }, "atomicwrites": { "hashes": [ @@ -694,12 +694,22 @@ "index": "pypi", "version": "==0.2.7.1" }, + "enum34": { + "hashes": [ + "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", + "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", + "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", + "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1" + ], + "index": "pypi", + "version": "==1.1.6" + }, "funcsigs": { "hashes": [ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.0'", + "markers": "python_version < '3.3'", "version": "==1.0.2" }, "futures": { @@ -873,11 +883,11 @@ }, "pylint": { "hashes": [ - "sha256:eeeeb81c8095586b417ea0602c01f53d1c87694fcf3c866f8681457f94875a8e", - "sha256:ef901a34b62ed7a734370ba5b162d890231ba8822abe88c6dda1268e2575f5f1" + "sha256:aa519865f8890a5905fa34924fed0f3bfc7d84fc9f9142c16dac52ffecd25a39", + "sha256:c353d8225195b37cc3aef18248b8f3fe94c5a6a95affaf885ae21a24ca31d8eb" ], "index": "pypi", - "version": "==1.6.4" + "version": "==1.9.1" }, "pytest": { "hashes": [ @@ -931,6 +941,14 @@ ], "version": "==3.12" }, + "singledispatch": { + "hashes": [ + "sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c", + "sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8" + ], + "markers": "python_version < '3.4'", + "version": "==3.4.0.3" + }, "six": { "hashes": [ "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",

6 years, 6 months

Remove <<<check_mk>>> section from agent output.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 31076d36bdfbad11607be3bc3e46510668abb6f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31076d36bdfbad… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed May 23 10:26:13 2018 +0200 Remove <<<check_mk>>> section from agent output. The corresponding information is not lost, as it appears in <<<allnet_ip_sensoric:sep(59)>>>. Change-Id: I248ea67b9253aad777e933d55cdbd111ddb4618d --- agents/special/agent_allnet_ip_sensoric | 6 ------ 1 file changed, 6 deletions(-) diff --git a/agents/special/agent_allnet_ip_sensoric b/agents/special/agent_allnet_ip_sensoric index c6085bd..4b06057 100755 --- a/agents/special/agent_allnet_ip_sensoric +++ b/agents/special/agent_allnet_ip_sensoric @@ -148,12 +148,6 @@ try: if opt_debug: raise - sys.stdout.write('<<<check_mk>>>\n') - if "system.devicetype" in status.keys(): - sys.stdout.write('AgentOS: %s\n' % status["system.devicetype"]) - else: - sys.stdout.write('AgentOS: unknown\n') - sys.stdout.write('<<<allnet_ip_sensoric:sep(59)>>>\n') for key, value in sorted(status.items()): sys.stdout.write('%s;%s\n' % (key, value))

6 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2018