Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 598610d11b1ca27c1f5f0258650dc9763629da17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=598610d11b1ca2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 16 13:15:14 2017 +0100 Minor output cleanups Change-Id: I992376394f1f390e8fcec3048f0cd5b172568ce6 --- cmk_base/data_sources/__init__.py | 5 ++++- cmk_base/data_sources/programs.py | 2 +- cmk_base/piggyback.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 2b4e106..d8eacb7 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -355,9 +355,12 @@ class DataSources(object): elif config.is_all_special_agents_host(self._hostname): return "Use all enabled special agents" - else: + elif config.is_tcp_host(self._hostname): return "Contact either Check_MK Agent or use a single special agent" + else: + return "No agent" + def _get_agent_data_source(self, ignore_special_agents=False): if not ignore_special_agents: diff --git a/cmk_base/data_sources/programs.py b/cmk_base/data_sources/programs.py index 5eab732..76cf717 100644 --- a/cmk_base/data_sources/programs.py +++ b/cmk_base/data_sources/programs.py @@ -64,7 +64,7 @@ class ProgramDataSource(CheckMKAgentDataSource): def _get_agent_info_program(self, commandline): exepath = commandline.split()[0] # for error message, hide options! - console.vverbose("Calling external program %s\n" % commandline) + self._logger.debug("[%s] Calling external program %r" % (self.id(), commandline)) p = None try: if config.monitoring_core == "cmc": diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index fb1a780..48eba45 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -99,7 +99,7 @@ def _get_piggyback_files(hostname): def store_piggyback_raw_data(sourcehost, piggybacked): for backedhost, lines in piggybacked.items(): - console.verbose("Storing piggyback data for %s.\n" % backedhost) + console.verbose("Storing piggyback data for: %s\n" % backedhost) content = "\n".join(lines) + "\n" store.save_file(os.path.join(cmk.paths.tmp_dir, "piggyback", backedhost, sourcehost), content)

6 years, 7 months

Cleanup cache handling of data sources

by Lars Michelsen

Module: check_mk Branch: master Commit: b2bb5aa63e5ad3a7fdb816c1a94067cfc250bd10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2bb5aa63e5ad3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 16 09:02:57 2017 +0100 Cleanup cache handling of data sources * Removed modification of configuration options * Refactored cache read function * Improved verbose logging of cache usage decisions * Use better names for cache influencing attributes Change-Id: Ic0853bfc53a57e7bf114b9a3c94e77100fea810c --- cmk_base/automations/check_mk.py | 5 +- cmk_base/data_sources/__init__.py | 52 +------------- cmk_base/data_sources/abstract.py | 138 ++++++++++++++++++++++-------------- cmk_base/data_sources/host_info.py | 18 +++-- cmk_base/data_sources/piggyback.py | 9 ++- cmk_base/data_sources/snmp.py | 13 +++- cmk_base/discovery.py | 4 +- cmk_base/modes/check_mk.py | 13 ++-- tests/cmk_base/test_data_sources.py | 75 ++++++++++++++------ tests/testlib/__init__.py | 3 +- 10 files changed, 186 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b2bb5aa63e…

6 years, 7 months

Minor cleanup: mode_inventory() is alone responsible for determining the list of hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 13368cab0c663daa74c7c32244635fd21a99ddf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13368cab0c663d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 08:28:05 2017 +0100 Minor cleanup: mode_inventory() is alone responsible for determining the list of hosts Change-Id: I1a0e9ec32dad2f160240da03289c67ee504ace07 --- cmk_base/inventory.py | 5 ----- cmk_base/modes/check_mk.py | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index c429c78..7ecdf2b 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -79,11 +79,6 @@ def do_inv(hostnames): _ensure_directory(inventory_output_dir) _ensure_directory(inventory_archive_dir) - # No hosts specified: do all hosts and force caching - if hostnames == None: - hostnames = config.all_active_hosts() - data_sources.abstract.DataSource.set_use_cachefile() - errors = [] for hostname in hostnames: try: diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index d347a45..cff36c2 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1163,7 +1163,9 @@ def mode_inventory(options, args): if args: hostnames = modes.parse_hostname_list(args, with_clusters=True) else: - hostnames = None + # No hosts specified: do all hosts and force caching + hostnames = config.all_active_hosts() + data_sources.abstract.DataSource.set_use_cachefile() if "force" in options: data_sources.abstract.CheckMKAgentDataSource.use_outdated_persisted_sections()

6 years, 7 months

Minor cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 482e26cd376eabef588f3ffd072ff35994c933d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=482e26cd376eab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 13:08:58 2017 +0100 Minor cleanup Change-Id: Ib9bd9bbc7553670983ec3aca720fcc028092c68c --- cmk_base/discovery.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 8e938a2..74ed8b3 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -534,7 +534,8 @@ def discover_marked_hosts(): redisc_params = params["inventory_rediscovery"] console.verbose(" Doing discovery with mode '%s'...\n" % mode_table[redisc_params["mode"]]) result, error = discover_on_host(mode_table[redisc_params["mode"]], hostname, - params["inventory_check_do_scan"], True, + do_snmp_scan=params["inventory_check_do_scan"], + use_caches=True, service_filter=item_filters) if error is not None: if error:

6 years, 7 months

Cleaned up single oid cache mechanism implementation a bit and improved verbose output

by Lars Michelsen

Module: check_mk Branch: master Commit: f9ba5b21bac80bb254d8960073b5fa83fed695bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9ba5b21bac80b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 16 11:12:32 2017 +0100 Cleaned up single oid cache mechanism implementation a bit and improved verbose output Change-Id: I2fb83e44ec10b07b59b294b44e2cfd62e6e212f5 --- cmk_base/snmp.py | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index 3eaa9a3..8ec8f57 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -57,7 +57,7 @@ _enforce_stored_walks = False # TODO: Replace this by generic caching _g_single_oid_hostname = None -_g_single_oid_cache = {} +_g_single_oid_cache = None _g_walk_cache = {} _g_snmp_cache_info_tables = {} # Information about SNMP caching @@ -74,12 +74,20 @@ _g_snmp_cache_info_tables = {} # Information about SNMP caching #TODO CACHING -def initialize_single_oid_cache(hostname): - global _g_single_oid_cache - _g_single_oid_cache = _get_single_oid_cache(hostname) +def initialize_single_oid_cache(hostname, from_disk=False): + global _g_single_oid_cache, _g_single_oid_hostname + if _g_single_oid_hostname != hostname or _g_single_oid_cache is None: + _g_single_oid_hostname = hostname + if from_disk: + _g_single_oid_cache = _load_single_oid_cache(hostname) + else: + _g_single_oid_cache = {} def write_single_oid_cache(hostname): + if not _g_single_oid_cache: + return + cache_dir = cmk.paths.snmp_scan_cache_dir if not os.path.exists(cache_dir): os.makedirs(cache_dir) @@ -88,16 +96,20 @@ def write_single_oid_cache(hostname): def set_single_oid_cache(hostname, oid, value): - _clear_other_hosts_oid_cache(hostname) _g_single_oid_cache[oid] = value -def _get_single_oid_cache(hostname): +def _is_in_single_oid_cache(hostname, oid): + return oid in _g_single_oid_cache + + +def _get_oid_from_single_oid_cache(hostname, oid): + return _g_single_oid_cache.get(oid) + + +def _load_single_oid_cache(hostname): cache_path = "%s/%s" % (cmk.paths.snmp_scan_cache_dir, hostname) - cached_single_oids = store.load_data_from_file(cache_path) - if cached_single_oids is None: - return {} - return cached_single_oids + return store.load_data_from_file(cache_path, {}) def cleanup_host_caches(): @@ -109,9 +121,9 @@ def cleanup_host_caches(): def _clear_other_hosts_oid_cache(hostname): - global _g_single_oid_hostname + global _g_single_oid_hostname, _g_single_oid_cache if _g_single_oid_hostname != hostname: - _g_single_oid_cache.clear() + _g_single_oid_cache = None _g_single_oid_hostname = hostname @@ -274,11 +286,12 @@ def get_single_oid(hostname, ipaddress, oid, check_type=None, do_snmp_scan=True) else: oid = '.' + oid - _clear_other_hosts_oid_cache(hostname) - # TODO: Use generic cache mechanism - if not do_snmp_scan or oid in _g_single_oid_cache: - return _g_single_oid_cache.get(oid) + if _is_in_single_oid_cache(hostname, oid): + console.vverbose(" Using cached OID %s: " % oid) + value = _get_oid_from_single_oid_cache(hostname, oid) + console.vverbose("%s%s%s%s\n" % (tty.bold, tty.green, value, tty.normal)) + return value console.vverbose(" Getting OID %s: " % oid) if _enforce_stored_walks or config.is_usewalk_host(hostname):

6 years, 7 months

Restructured agent_data module into data_sources package to clarify the hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: c42f08700eff2227a73cc126e8d57f326ba44001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c42f08700eff22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 10 11:40:59 2017 +0100 Restructured agent_data module into data_sources package to clarify the hierarchy Change-Id: I2fbee95aee6bf8c41af5eafaba81a7a1616213f2 --- .bugs/3012 | 22 + cmk_base/agent_data.py | 1286 ------------------------------------ cmk_base/automations/check_mk.py | 32 +- cmk_base/checking.py | 16 +- cmk_base/data_sources/__init__.py | 458 +++++++++++++ cmk_base/data_sources/abstract.py | 430 ++++++++++++ cmk_base/data_sources/piggyback.py | 42 ++ cmk_base/data_sources/programs.py | 195 ++++++ cmk_base/data_sources/snmp.py | 199 ++++++ cmk_base/data_sources/tcp.py | 176 +++++ cmk_base/discovery.py | 39 +- cmk_base/dump_host.py | 11 +- cmk_base/inventory.py | 18 +- cmk_base/modes/check_mk.py | 37 +- cmk_base/utils.py | 4 +- tests/pylint/test_pylint_misc.py | 1 + 16 files changed, 1598 insertions(+), 1368 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c42f08700e…

6 years, 7 months

Renamed piggyback functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 365f44a605f4ae311751d573f23ce2ddec533d0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=365f44a605f4ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 15 07:15:49 2017 +0100 Renamed piggyback functions Change-Id: Id77f49be994bb677572a427ce5cf112c679181c4 --- cmk_base/check_table.py | 2 +- cmk_base/config.py | 2 +- cmk_base/data_sources/__init__.py | 28 ++++++++++++++++++---------- cmk_base/data_sources/piggyback.py | 5 ++--- cmk_base/modes/check_mk.py | 2 +- cmk_base/piggyback.py | 18 +++++++++--------- 6 files changed, 32 insertions(+), 25 deletions(-) diff --git a/cmk_base/check_table.py b/cmk_base/check_table.py index 9d5964d..1c1ec05 100644 --- a/cmk_base/check_table.py +++ b/cmk_base/check_table.py @@ -73,7 +73,7 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co if not config.is_snmp_host(hostname) and checks.is_snmp_check(checkname) and \ (not config.has_management_board(hostname) or config.management_protocol(hostname) != "snmp"): passed = False - if not config.is_tcp_host(hostname) and not piggyback.has_piggyback_info(hostname) \ + if not config.is_tcp_host(hostname) and not piggyback.has_piggyback_raw_data(hostname) \ and checks.is_tcp_check(checkname): passed = False is_checkname_valid_cache[the_id] = passed diff --git a/cmk_base/config.py b/cmk_base/config.py index c9fde66..73fce5d 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -602,7 +602,7 @@ def is_ping_host(hostname): import cmk_base.piggyback as piggyback return not is_snmp_host(hostname) \ and not is_tcp_host(hostname) \ - and not piggyback.has_piggyback_info(hostname) \ + and not piggyback.has_piggyback_raw_data(hostname) \ and not has_management_board(hostname) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index ba17f5b..51c0181 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -24,6 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Naming: +# +# raw data: The raw unparsed data produced by the data source (_execute()). +# For the agent this is the whole byte string received from the +# agent. For SNMP this is a python data structure containing +# all OID/values received from SNMP. +# info: The parsed raw data recevied from the data source (run()). +# The transformation from the raw data is done by the +# _convert_to_infos() method of the source. +# host_info A wrapper object for the "info" and other information like +# cache info and piggyback lines that is used to process the +# data within Check_MK. + import ast import os import signal @@ -75,16 +88,7 @@ g_data_source_errors = {} def get_host_infos(sources, hostname, ipaddress, max_cachefile_age=None): """Generic function to gather ALL host info data for any host (hosts, nodes, clusters) in Check_MK. - Returns a dictionary of already parsed info constructs. The structure looks like this: - - { - ("hostname", "ipaddress"): { - "section_name": [ - [ "line1field1", ... ], - [ "line2field1", ... ], - ] - } - } + Returns a HostInfo() object of already parsed info constructs. Communication errors are not raised through by this functions. All agent related errors are stored in the g_data_source_errors construct which can be accessed by the caller to get @@ -123,6 +127,10 @@ def get_host_infos(sources, hostname, ipaddress, max_cachefile_age=None): host_info = all_host_infos.setdefault((this_hostname, this_ipaddress), HostInfo()) host_info.update(host_info_of_source) + # Store piggyback information received from all sources of this host. This + # also implies a removal of piggyback files received during previous calls. + piggyback.store_piggyback_raw_data(this_hostname, host_info.piggybacked_lines) + return all_host_infos diff --git a/cmk_base/data_sources/piggyback.py b/cmk_base/data_sources/piggyback.py index 3c9a1c5..c80fbd5 100644 --- a/cmk_base/data_sources/piggyback.py +++ b/cmk_base/data_sources/piggyback.py @@ -33,9 +33,8 @@ class PiggyBackDataSource(CheckMKAgentDataSource): return "piggyback" def _execute(self, hostname, ipaddress): - # TODO: Rename to get_piggyback_data() - return piggyback.get_piggyback_info(hostname) \ - + piggyback.get_piggyback_info(ipaddress) + return piggyback.get_piggyback_raw_data(hostname) \ + + piggyback.get_piggyback_raw_data(ipaddress) def _cache_raw_data(self): diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index a692714..102dcb3 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -873,7 +873,7 @@ def mode_flush(hosts): console.output(tty.bold + tty.green + " cache(%d)" % d) # piggy files from this as source host - d = piggyback.remove_piggyback_info_from(host) + d = piggyback.remove_piggyback_raw_data_from(host) if d: console.output(tty.bold + tty.magenta + " piggyback(%d)" % d) diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index 0fd8d10..fb1a780 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -36,25 +36,25 @@ import cmk_base.console as console import cmk_base.config as config -def get_piggyback_info(hostname): +def get_piggyback_raw_data(hostname): output = "" if not hostname: return output - for sourcehost, file_path in get_piggyback_files(hostname): + for sourcehost, file_path in _get_piggyback_files(hostname): console.verbose("Using piggyback information from host %s.\n" % sourcehost) output += file(file_path).read() return output -def has_piggyback_info(hostname): - return get_piggyback_files(hostname) != [] +def has_piggyback_raw_data(hostname): + return _get_piggyback_files(hostname) != [] -def get_piggyback_files(hostname): +def _get_piggyback_files(hostname): files = [] dir = cmk.paths.tmp_dir + "/piggyback/" + hostname - # remove_piggyback_info_from() may remove stale piggyback files of one source + # remove_piggyback_raw_data_from() may remove stale piggyback files of one source # host and also the directory "hostname" when the last piggyback file for the # current host was removed. This may cause the os.listdir() to fail. We treat # this as regular case: No piggyback files for the current host. @@ -97,7 +97,7 @@ def get_piggyback_files(hostname): return files -def store_piggyback_info(sourcehost, piggybacked): +def store_piggyback_raw_data(sourcehost, piggybacked): for backedhost, lines in piggybacked.items(): console.verbose("Storing piggyback data for %s.\n" % backedhost) content = "\n".join(lines) + "\n" @@ -105,10 +105,10 @@ def store_piggyback_info(sourcehost, piggybacked): # Remove piggybacked information that is not # being sent this turn - remove_piggyback_info_from(sourcehost, keep=piggybacked.keys()) + remove_piggyback_raw_data_from(sourcehost, keep=piggybacked.keys()) -def remove_piggyback_info_from(sourcehost, keep=None): +def remove_piggyback_raw_data_from(sourcehost, keep=None): if keep is None: keep = []

6 years, 7 months

Made special agent selection deterministic

by Lars Michelsen

Module: check_mk Branch: master Commit: 466fcfcef04b6eae6f8df1e93344da7f736e2e77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=466fcfcef04b6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 14 12:02:21 2017 +0100 Made special agent selection deterministic When only a single special agent is used for a host, the selection of the special agent to be executed is now deterministic in case multiple special agent rules match for a host. Change-Id: I4fa5c3536e1bdac1789feacd77c9fa8cb2247060 --- cmk_base/data_sources/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 6b60086..ba17f5b 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -332,11 +332,16 @@ class DataSources(object): return TCPDataSource() - # TODO: It's not defined in which order the special agent rules overwrite eachother. def _get_special_agent_data_sources(self): special_agents = [] - for agentname, ruleset in config.special_agents.items(): + # Previous to 1.5.0 it was not defined in which order the special agent + # rules overwrite eachother. When multiple special agents were configured + # for a single host a "random" one was picked (depending on the iteration + # over config.special_agents. + # We now sort the matching special agents by their name to at least get + # a deterministic order of the special agents. + for agentname, ruleset in sorted(config.special_agents.items()): params = rulesets.host_extra_conf(self._hostname, ruleset) if params: source = SpecialAgentDataSource(agentname, params[0])

6 years, 7 months

All data source types may now produce cached sections

by Lars Michelsen

Module: check_mk Branch: master Commit: e478b7f76a9d5cad8e61faa7d997d1c4885f7b74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e478b7f76a9d5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 16 08:03:29 2017 +0100 All data source types may now produce cached sections * With this change SNMP check interval has been added again * Also fixed SNMP check type handling * Also cleaned up HostInfo() creation and parsing of agent data a bit * Persisted info is now read using store.load_data_from_file() Change-Id: Ibbb4a71de94604d7876bf1a8671a511aff186ddb --- cmk_base/checking.py | 15 +- cmk_base/data_sources/__init__.py | 39 ++++-- cmk_base/data_sources/abstract.py | 273 +++++++++++++++++++++---------------- cmk_base/data_sources/host_info.py | 29 +++- cmk_base/data_sources/programs.py | 7 +- cmk_base/data_sources/snmp.py | 47 ++++--- cmk_base/data_sources/tcp.py | 5 - cmk_base/snmp.py | 3 - 8 files changed, 254 insertions(+), 164 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e478b7f76a…

6 years, 7 months

Moved description of SNMP agent type to SNMP data source

by Lars Michelsen

Module: check_mk Branch: master Commit: 52a4bc6fae4048a1e96567b392265dffa4b7bb5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52a4bc6fae4048… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 15 16:39:26 2017 +0100 Moved description of SNMP agent type to SNMP data source Change-Id: If81550f89a4a8dec05443b0cf654979d3eea9d03 --- cmk_base/data_sources/snmp.py | 28 ++++++++++++++++++++++++++++ cmk_base/dump_host.py | 27 --------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 33c734f..257fd0d 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -77,6 +77,34 @@ class SNMPDataSource(DataSource): return "snmp" + def describe(self, hostname, ipaddress): + if config.is_usewalk_host(hostname): + return "SNMP (use stored walk)" + + if config.is_inline_snmp_host(hostname): + inline = "yes" + else: + inline = "no" + + credentials = config.snmp_credentials_of(hostname) + if type(credentials) in [ str, unicode ]: + cred = "Community: %r" % credentials + else: + cred = "Credentials: '%s'" % ", ".join(credentials) + + if config.is_snmpv3_host(hostname) or config.is_bulkwalk_host(hostname): + bulk = "yes" + else: + bulk = "no" + + portinfo = config.snmp_port_of(hostname) + if portinfo == None: + portinfo = 'default' + + return "SNMP (%s, Bulk walk: %s, Port: %s, Inline: %s)" % \ + (cred, bulk, portinfo, inline) + + def _from_cache_file(self, raw_data): return ast.literal_eval(raw_data) diff --git a/cmk_base/dump_host.py b/cmk_base/dump_host.py index 20f2ada..c91d10c 100644 --- a/cmk_base/dump_host.py +++ b/cmk_base/dump_host.py @@ -85,33 +85,6 @@ def dump_host(hostname): for source in sources.get_data_sources(): agenttypes.append(source.describe(hostname, ipaddress)) - if config.is_snmp_host(hostname): - if config.is_usewalk_host(hostname): - agenttypes.append("SNMP (use stored walk)") - else: - if config.is_inline_snmp_host(hostname): - inline = "yes" - else: - inline = "no" - - credentials = config.snmp_credentials_of(hostname) - if type(credentials) in [ str, unicode ]: - cred = "community: \'%s\'" % credentials - else: - cred = "credentials: '%s'" % ", ".join(credentials) - - if config.is_snmpv3_host(hostname) or config.is_bulkwalk_host(hostname): - bulk = "yes" - else: - bulk = "no" - - portinfo = config.snmp_port_of(hostname) - if portinfo == None: - portinfo = 'default' - - agenttypes.append("SNMP (%s, bulk walk: %s, port: %s, inline: %s)" % - (cred, bulk, portinfo, inline)) - if config.is_ping_host(hostname): agenttypes.append('PING only')

6 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017