Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

management_protocol_of() return None value when not configured or disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: cb60eed9bf69a2dccbac37df1fb38c23b02d298d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb60eed9bf69a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 08:24:00 2018 +0100 management_protocol_of() return None value when not configured or disabled Change-Id: I95ba9d52e8a05d5f8476ce563cf555f8a112592c --- cmk_base/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 17d3296..7450960 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -662,7 +662,7 @@ def is_ipv4_host(hostname): # def has_management_board(hostname): - return management_protocol.get(hostname) is not None + return management_protocol_of(hostname) is not None def management_address_of(hostname): @@ -674,7 +674,7 @@ def management_address_of(hostname): def management_protocol_of(hostname): - return management_protocol[hostname] + return management_protocol.get(hostname) def management_credentials_of(hostname):

6 years, 4 months

Improved management board output of "cmk -D HOST"

by Lars Michelsen

Module: check_mk Branch: master Commit: a635d759a32a3e12c443506e179659b0fe8e7e05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a635d759a32a3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 15:59:27 2018 +0100 Improved management board output of "cmk -D HOST" Change-Id: I46418cb63684e8919a400fbe435562ab977b2547 --- cmk_base/data_sources/snmp.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 2b539e8..0887e33 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -68,6 +68,10 @@ class SNMPDataSource(DataSource): return "snmp" + def title(self): + return "SNMP" + + def _cpu_tracking_id(self): return "snmp" @@ -96,8 +100,8 @@ class SNMPDataSource(DataSource): if portinfo == None: portinfo = 'default' - return "SNMP (%s, Bulk walk: %s, Port: %s, Inline: %s)" % \ - (cred, bulk, portinfo, inline) + return "%s (%s, Bulk walk: %s, Port: %s, Inline: %s)" % \ + (self.title(), cred, bulk, portinfo, inline) def _from_cache_file(self, raw_data): @@ -252,6 +256,10 @@ class SNMPManagementBoardDataSource(SNMPDataSource): return "mgmt_snmp" + def title(self): + return "Management board - SNMP" + + def _execute(self, hostname, ipaddress): # Do not use the (custom) ipaddress for the host. Use the management board # address instead

6 years, 4 months

Minor cleanup of messy UCD and HR scan functions

by Simon Betz

Module: check_mk Branch: master Commit: c06e44559b630a3099c9522925fa4f3f4a6857ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c06e44559b630a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 8 09:50:52 2018 +0100 Minor cleanup of messy UCD and HR scan functions Change-Id: I284fe80ba12108de444b58383cd7cbe95a1cf17b --- checks/hr_cpu | 6 +-- checks/hr_fs | 7 ++- checks/hr_mem | 4 +- checks/ucd_cpu_load | 4 +- checks/ucd_cpu_util | 4 +- checks/ucd_disk | 4 +- checks/{ucd.include => ucd_hr.include} | 99 ++++++++++++++++++++++------------ checks/ucd_mem | 4 +- checks/ucd_processes | 4 +- 9 files changed, 83 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c06e44559b…

6 years, 4 months

Only remove check variable settings from default_config when it was set before

by Lars Michelsen

Module: check_mk Branch: master Commit: efaf1735a5b232231b7366dd6db4596522c6b3d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efaf1735a5b232… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 12:45:14 2018 +0100 Only remove check variable settings from default_config when it was set before Change-Id: Id4046592c86718fc492977be9d0c0e4f94d0d732 --- cmk_base/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index c1e94a8..52d6395 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -80,12 +80,18 @@ def add_check_variables(check_variables): # # In the same step we remove the check related configuration settings from the # config module because they are not needed there anymore. +# +# And also remove it from the default config (in case it was present) def set_check_variables_for_checks(): import cmk_base.checks global_dict = globals() for varname in cmk_base.checks.check_variable_names(): cmk_base.checks.set_check_variable(varname, global_dict.pop(varname)) - delattr(default_config, varname) + + try: + delattr(default_config, varname) + except AttributeError: + pass #.

6 years, 4 months

Renamed function for consistent naming

by Lars Michelsen

Module: check_mk Branch: master Commit: 24d84b4063dafafd4afc5fe42119af0b5389ad4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24d84b4063dafa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 08:22:50 2018 +0100 Renamed function for consistent naming Change-Id: I39effaed8c0af44a74a5cee1ed38ebecf668f506 --- cmk_base/config.py | 2 +- cmk_base/data_sources/snmp.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index b39363e..17d3296 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -665,7 +665,7 @@ def has_management_board(hostname): return management_protocol.get(hostname) is not None -def management_address(hostname): +def management_address_of(hostname): attributes_of_host = host_attributes.get(hostname, {}) if attributes_of_host.get("management_address"): return attributes_of_host["management_address"] diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 9316e0f..7bbd2c0 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -271,7 +271,7 @@ class SNMPManagementBoardDataSource(SNMPDataSource): def _execute(self, hostname, ipaddress): # Do not use the (custom) ipaddress for the host. Use the management board # address instead - mgmt_ipaddress = config.management_address(hostname) + mgmt_ipaddress = config.management_address_of(hostname) if not self._is_ipaddress(mgmt_ipaddress): mgmt_ipaddress = ip_lookup.lookup_ip_address(mgmt_ipaddress)

6 years, 4 months

Deobfuscate profiling flag handling.

by Sven Panne

Module: check_mk Branch: master Commit: 8039813a03a338db0bc8fc9722451cdce00c5538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8039813a03a338… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 10:24:13 2018 +0100 Deobfuscate profiling flag handling. Change-Id: I842ea3bbc223a1375e27a36f73ae5294b21b11d1 --- bin/mkeventd | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 5cf91d2..2ec6fc4 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -78,7 +78,8 @@ logger = cmk.log.get_logger("mkeventd") opt_verbose = 0 opt_debug = False opt_foreground = False -opt_profile = {} +opt_profile_status = False +opt_profile_event = False opt_syslog = False opt_syslog_fd = None opt_syslog_tcp = False @@ -282,8 +283,9 @@ class ECLock(object): class ECServerThread(threading.Thread): - def __init__(self, name): + def __init__(self, name, profiling_enabled): super(ECServerThread, self).__init__(name=name) + self.profiling_enabled = profiling_enabled self._terminate_event = threading.Event() self.logger = logger.getChild(name) @@ -292,7 +294,7 @@ class ECServerThread(threading.Thread): while not self._shal_terminate(): try: - with cmk.profile.Profile(enabled=opt_profile.get(self.name), + with cmk.profile.Profile(enabled=profiling_enabled, profile_file=os.path.join(g_state_dir, "%s.profile" % self.name)): self.serve() except Exception: @@ -1286,7 +1288,8 @@ class EventServer(ECServerThread): "Jul": 7, "Aug": 8, "Sep": 9, "Oct": 10, "Nov": 11, "Dec": 12} def __init__(self): - super(EventServer, self).__init__(name="EventServer") + super(EventServer, self).__init__(name="EventServer", + profiling_enabled=opt_profile_event) self._syslog = None self._syslog_tcp = None self._snmptrap = None @@ -3540,7 +3543,8 @@ class StatusTableStatus(StatusTable): class StatusServer(ECServerThread): def __init__(self): - super(StatusServer, self).__init__(name="StatusServer") + super(StatusServer, self).__init__(name="StatusServer", + profiling_enabled=opt_profile_status) self._socket = None self._tcp_socket = None self._reopen_sockets = False @@ -5146,12 +5150,10 @@ if __name__ == "__main__": opt_snmptrap = True elif o == '--snmptrap-fd': opt_snmptrap_fd = int(a) - elif o.startswith('--profile-'): - what = o.split("-")[-1] - if what == "status": - opt_profile["StatusServer"] = True - elif what == "event": - opt_profile["EventServer"] = True + elif o == '--profile-status': + opt_profile_status = True + elif o == '--profile-event': + opt_profile_event = True cmk.log.open_log(sys.stderr) cmk.log.set_verbosity(opt_verbose)

6 years, 4 months

Really start with clean default settings when loading the config

by Lars Michelsen

Module: check_mk Branch: master Commit: 1576b8538b1f44233b94ee2e17cfff89e97cbd2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1576b8538b1f44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 09:22:37 2018 +0100 Really start with clean default settings when loading the config Change-Id: I6148acc20f4695ded306f4e0dccf5d6e960fa83a --- cmk_base/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmk_base/config.py b/cmk_base/config.py index 7450960..c1e94a8 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -26,6 +26,7 @@ import os import sys +import copy import marshal import cmk.paths @@ -51,7 +52,12 @@ def get_default_config(): """Provides a dictionary containing the Check_MK default configuration""" cfg = {} for key in get_variable_names(): - cfg[key] = getattr(default_config, key) + value = getattr(default_config, key) + + if isinstance(value, dict) or isinstance(value, list): + value = copy.deepcopy(value) + + cfg[key] = value return cfg

6 years, 4 months

Centralized path handling a bit.

by Sven Panne

Module: check_mk Branch: master Commit: e84809bb4a43809152fe77864ec012861e6540be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e84809bb4a4380… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 20 10:13:04 2018 +0100 Centralized path handling a bit. Change-Id: I9dc8cc86f114ab2fa5617e85e8eab5825f105efd --- bin/mkeventd | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 2c2ace5..5cf91d2 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -87,13 +87,16 @@ opt_snmptrap = False opt_snmptrap_fd = None # Set default values for options (TODO: Move to smaller scopes) -g_socket_path = cmk.paths.omd_root + "/tmp/run/mkeventd/status" -g_eventsocket_path = cmk.paths.omd_root + "/tmp/run/mkeventd/eventsocket" -g_pipe_path = cmk.paths.omd_root + "/tmp/run/mkeventd/events" -g_pid_file = cmk.paths.omd_root + "/tmp/run/mkeventd/pid" -g_logfile_path = cmk.paths.omd_root + "/var/log/mkeventd.log" -g_state_dir = cmk.paths.omd_root + "/var/mkeventd" -g_compiled_mibs_dir = cmk.paths.omd_root + "/local/share/check_mk/compiled_mibs" +g_socket_path = os.path.join(cmk.paths.omd_root, "tmp/run/mkeventd/status") +g_eventsocket_path = os.path.join(cmk.paths.omd_root, "tmp/run/mkeventd/eventsocket") +g_pipe_path = os.path.join(cmk.paths.omd_root, "tmp/run/mkeventd/events") +g_pid_file = os.path.join(cmk.paths.omd_root, "tmp/run/mkeventd/pid") +g_logfile_path = os.path.join(cmk.paths.omd_root, "var/log/mkeventd.log") +g_state_dir = os.path.join(cmk.paths.omd_root, "var/mkeventd") +g_compiled_mibs_dir = os.path.join(cmk.paths.omd_root, "local/share/check_mk/compiled_mibs") +g_mongo_db_conf = os.path.join(cmk.paths.omd_root, "etc/mongodb.conf") +g_main_config_path = os.path.join(cmk.paths.default_config_dir, "mkeventd.mk") +g_config_dir = os.path.join(cmk.paths.default_config_dir, "mkeventd.d") # Basic settings, can be changed with configuration file (at @@ -290,7 +293,7 @@ class ECServerThread(threading.Thread): while not self._shal_terminate(): try: with cmk.profile.Profile(enabled=opt_profile.get(self.name), - profile_file=cmk.paths.omd_root + "/var/mkeventd/%s.profile" % self.name): + profile_file=os.path.join(g_state_dir, "%s.profile" % self.name)): self.serve() except Exception: self.logger.exception("Exception in %s server" % self.name) @@ -731,7 +734,7 @@ g_mongo_db = None def mongodb_local_connection_opts(): ip, port = None, None - for l in file('%s/etc/mongodb.conf' % cmk.paths.omd_root): + for l in file(g_mongo_db_conf): if l.startswith('bind_ip'): ip = l.split('=')[1].strip() elif l.startswith('port'): @@ -4971,18 +4974,17 @@ def load_configuration(): global g_config, g_last_config_reload g_config = cmk.event_console.default_config() - main_file = os.path.join(cmk.paths.default_config_dir, "mkeventd.mk") - if not os.path.exists(main_file): - bail_out("Main configuration file %s missing." % main_file) + if not os.path.exists(g_main_config_path): + bail_out("Main configuration file %s missing." % g_main_config_path) config_files = ( os.path.join(dirpath, filename) - for dirpath, _dirnames, filenames in os.walk(os.path.join(cmk.paths.default_config_dir, "mkeventd.d")) + for dirpath, _dirnames, filenames in os.walk(g_config_dir) for filename in filenames if filename.endswith(".mk") ) - for path in [main_file] + sorted(config_files): + for path in [g_main_config_path] + sorted(config_files): with open(path) as f: exec(f, g_config)

6 years, 4 months

Refactored host mapping attribute writing for hosts.mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 3615030f034ee35bedf394c8bdcfefc32566ec85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3615030f034ee3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 07:00:12 2018 +0100 Refactored host mapping attribute writing for hosts.mk Change-Id: Ice2f54ab6bd32e28582c2f12ab23db14230d3819 --- web/htdocs/watolib.py | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index bdb21be..bb18cdf 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1425,14 +1425,18 @@ class CREFolder(BaseFolder): all_hosts = [] # list of [Python string for all_hosts] clusters = [] # tuple list of (Python string, nodes) - ipv4_addresses = {} - ipv6_addresses = {} - explicit_snmp_communities = {} hostnames = self.hosts().keys() hostnames.sort() custom_macros = {} # collect value for attributes that are to be present in Nagios cleaned_hosts = {} + attribute_mappings = [ + # host attr, cmk_base variable name, value, title + ("ipaddress", "ipaddresses", {}, "Explicit IPv4 addresses"), + ("ipv6address", "ipv6addresses", {}, "Explicit IPv6 addresses"), + ("snmp_community", "explicit_snmp_communities", {}, "Explicit SNMP communities"), + ] + for hostname in hostnames: host = self.hosts()[hostname] effective = host.effective_attributes() @@ -1449,12 +1453,10 @@ class CREFolder(BaseFolder): else: all_hosts.append(hostentry) - # TODO: Management board? - for attribute_name, dictionary in [ - ( "ipaddress", ipv4_addresses ), - ( "ipv6address", ipv6_addresses ), - ( "snmp_community", explicit_snmp_communities ) - ]: + # Save the effective attributes of a host to the related attribute maps. + # These maps are saved directly in the hosts.mk to transport the effective + # attributes to Check_MK base. + for attribute_name, _unused_cmk_var_name, dictionary, _unused_title in attribute_mappings: value = effective.get(attribute_name) if value: dictionary[hostname] = value @@ -1504,24 +1506,12 @@ class CREFolder(BaseFolder): out.write('\n %s : %s,\n' % (entry, repr(nodes))) out.write("})\n") - if len(ipv4_addresses) > 0: - out.write("\n# Explicit IPv4 addresses\n") - out.write("ipaddresses.update(") - out.write(format_config_value(ipv4_addresses)) - out.write(")\n") - - if len(ipv6_addresses) > 0: - out.write("\n# Explicit IPv6 addresses\n") - out.write("ipv6addresses.update(") - out.write(format_config_value(ipv6_addresses)) - out.write(")\n") - - if len(explicit_snmp_communities) > 0: - out.write("\n# Explicit SNMP communities\n") - out.write("explicit_snmp_communities.update(") - out.write(format_config_value(explicit_snmp_communities)) - out.write(")") - out.write("\n") + for attribute_name, cmk_base_varname, dictionary, title in attribute_mappings: + if dictionary: + out.write("\n# %s\n" % title) + out.write("%s.update(" % cmk_base_varname) + out.write(format_config_value(dictionary)) + out.write(")\n") for custom_varname, entries in custom_macros.items(): macrolist = []

6 years, 4 months

Add first tests for management board attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: 1fb43015953d736273abdcfa5602e06bc0d21a5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fb43015953d73… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 20 08:24:18 2018 +0100 Add first tests for management board attributes Change-Id: I92c8c5e3512058fb3cf77e33c63e7b8f7a44fe04 --- tests/cmk_base/test_mgmt_board.py | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/cmk_base/test_mgmt_board.py b/tests/cmk_base/test_mgmt_board.py new file mode 100644 index 0000000..06fa2a3 --- /dev/null +++ b/tests/cmk_base/test_mgmt_board.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python + +import pytest +from testlib import web + +import cmk_base.config as config + +(a)pytest.fixture(scope="module") +def test_cfg(web, site): + print "Applying default config" + web.add_host("mgmt-host1", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + "management_snmp_community": "HOST", + }) + web.add_host("mgmt-host2", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": "snmp", + "management_address": "127.0.0.2", + }) + web.add_host("mgmt-host3", attributes={ + "ipaddress": "127.0.0.1", + "management_protocol": None, + "management_address": "127.0.0.1", + "management_snmp_community": "HOST", + }) + + web.activate_changes() + + import cmk.debug + cmk.debug.enable() + + import cmk_base.checks as checks + checks.load() + config.load() + + yield None + + # + # Cleanup code + # + print "Cleaning up test config" + + cmk.debug.disable() + + web.delete_host("mgmt-host1") + web.delete_host("mgmt-host2") + web.delete_host("mgmt-host3") + web.activate_changes() + + +def test_management_board_configc(test_cfg): + assert config.has_management_board("mgmt-host1") + assert config.management_address_of("mgmt-host1") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host1") == "snmp" + assert config.management_credentials_of("mgmt-host1") == "HOST" + + assert config.has_management_board("mgmt-host2") + assert config.management_address_of("mgmt-host2") == "127.0.0.2" + assert config.management_protocol_of("mgmt-host2") == "snmp" + assert config.management_credentials_of("mgmt-host2") == "public" + + assert config.has_management_board("mgmt-host3") == False + assert config.management_address_of("mgmt-host3") == "127.0.0.1" + assert config.management_protocol_of("mgmt-host3") == None + assert config.management_credentials_of("mgmt-host3") == "HOST"

6 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018