Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: Updated bug entries #0931

by Mathias Kettner

Module: check_mk Branch: master Commit: 47a27e6959146af4889089632aa4987db423cdc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47a27e6959146a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 00:54:26 2013 +0200 Updated bug entries #0931 --- .bugs/931 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/931 b/.bugs/931 index 169eb1d..dca5666 100644 --- a/.bugs/931 +++ b/.bugs/931 @@ -1,9 +1,9 @@ Title: Cluster requires same agent type as cluster node Component: core -State: open +Class: bug +State: done Date: 2013-06-19 09:46:28 Targetversion: future -Class: bug If the agent type attribute of a cluster and its notes differs the check_mk agent will fail @@ -11,3 +11,6 @@ the check_mk agent will fail This is caused by the various is_tcp_host is_snmp_host precompiled functions which return fixed values. The nodes receive the value of the cluster - thus leading to the checks downfall. + +2013-10-14 00:54:23: changed state open -> done +Should work now.

10 years, 11 months

Check_MK Git: check_mk: FIX: avoid exception when only one node of a cluster has services

by Mathias Kettner

Module: check_mk Branch: master Commit: c405b74dcdabe292f8909b76b7fdd4257254fe05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c405b74dcdabe2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 00:52:31 2013 +0200 FIX: avoid exception when only one node of a cluster has services --- ChangeLog | 1 + modules/check_mk_base.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 595cf04..77b52ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.3i5: Core: * FIX: inventory check now honors settings for exit code + * FIX: avoid exception when only one node of a cluster has services Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index d0da123..55a7046 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -278,14 +278,15 @@ def get_host_info(hostname, ipaddress, checkname): is_snmp_error = False for node in nodes: # If an error with the agent occurs, we still can (and must) - # try the other node. + # try the other nodes. try: ipaddress = lookup_ipaddress(node) new_info = get_realhost_info(node, ipaddress, checkname, cluster_max_cachefile_age) - if add_nodeinfo: - new_info = [ [node] + line for line in new_info ] - info += new_info - at_least_one_without_exception = True + if new_info != None: + if add_nodeinfo: + new_info = [ [node] + line for line in new_info ] + info += new_info + at_least_one_without_exception = True except MKSkipCheck: at_least_one_without_exception = True except MKAgentError, e:

10 years, 11 months

Check_MK Git: check_mk: FIX: inventory check now honors settings for exit code

by Mathias Kettner

Module: check_mk Branch: master Commit: d3df5b7acaa82ee701920783ec7d132a3006ec9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3df5b7acaa82e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 00:34:45 2013 +0200 FIX: inventory check now honors settings for exit code --- .bugs/895 | 7 +++++-- ChangeLog | 3 +++ modules/check_mk.py | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.bugs/895 b/.bugs/895 index 413cd30..5e78514 100644 --- a/.bugs/895 +++ b/.bugs/895 @@ -1,10 +1,13 @@ Title: Inventory check should honor exit code settings Component: core -State: open +Class: bug +State: done Date: 2013-06-21 11:58:34 Targetversion: future -Class: bug If you use the feature that the Check_MK exit code is also OK when the host is down, that should also apply for the inventory check. + +2013-10-14 00:34:40: changed state open -> done +Fixed. diff --git a/ChangeLog b/ChangeLog index caa919c..595cf04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i5: + Core: + * FIX: inventory check now honors settings for exit code + Multisite: * Speed-O-Meter: now measure only service checks. Host checks are omitted, since they do not really matter and make the diff --git a/modules/check_mk.py b/modules/check_mk.py index f3c4c98..397face 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2742,8 +2742,13 @@ def check_inventory(hostname): except Exception, e: if opt_debug: raise - sys.stdout.write("UNKNOWN - %s\n" % (e,)) - sys.exit(3) + # Honor rule settings for "Status of the Check_MK service". In case of + # a problem we assume a connection error here. + spec = exit_code_spec(hostname) + what = isinstance(e, MKAgentError) and "connection" or "exception" + status = spec.get(what, 3) + sys.stdout.write("%s - %s\n" % (nagios_state_names[status], e)) + sys.exit(status) def service_ignored(hostname, checktype, service_description):

10 years, 11 months

Check_MK Git: check_mk: Fixed recent ChangeLog entry

by Mathias Kettner

Module: check_mk Branch: master Commit: 6d6dbf790d8ab6765090c036feb3e8fb7f56ff49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d6dbf790d8ab6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 00:54:42 2013 +0200 Fixed recent ChangeLog entry --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 77b52ed..fcf96ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 1.2.3i5: Core: * FIX: inventory check now honors settings for exit code - * FIX: avoid exception when only one node of a cluster has services + * FIX: avoid exception nodes of cluster have different agent type Multisite: * Speed-O-Meter: now measure only service checks. Host checks

10 years, 11 months

Check_MK Git: check_mk: bulk inventory: display percentage in progress bar

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d2e80ac28d9c448d5b3c52ad7a4020a4bc97f5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d2e80ac28d9c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 13 00:53:45 2013 +0200 bulk inventory: display percentage in progress bar --- ChangeLog | 2 ++ web/htdocs/js/wato.js | 8 +++++++- web/htdocs/wato.py | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e0d080..521484e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ WATO: * You can now have site-specific global settings when using distributed WATO (available in the "Distributed Monitoring") + * bulk inventory: display percentage in progress bar + * FIX: correct display of number of hosts in bulk inventory 1.2.3i4: Core: diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 16a8e23..182ee4c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -435,6 +435,7 @@ function progress_clean_log() { function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_stats, fail_stats, term_url, finished_txt) { // Initialize if (progress_items === null) { + total_num_items = items.length; progress_items = items; failed_items = Array(); progress_total_num = items.length; @@ -455,10 +456,15 @@ function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_s // Regular processing when not paused and not already running if (!progress_paused && !progress_running) { if (progress_items.length > 0) { + num_items_left = progress_items.length; + perc = Math.round(100 - (100.0 * num_items_left / total_num_items)); + // title = progress_items.length + " Items, " + progress_success_stats.length + " Stats, " + progress_fail_stats.length + " Failed."; + title = perc + "%"; // Progressing progress_running = true; // Remove leading pipe signs (when having no folder set) - update_progress_title(progress_items[0].replace(/^\|*/g, '').substr(0, 60)); + // update_progress_title(percentage + "%"); + update_progress_title(title); get_url(url_prefix + '&_transid=-1&_item=' + escape(progress_items[0]), progress_handle_response, // regular handler (http code 200) [ mode, progress_items[0] ], // data to hand over to handlers diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b21531b..e372316 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2606,6 +2606,7 @@ def mode_bulk_inventory(phase): try: site_id, folderpath, hostnamesstring = html.var("_item").split("|") hostnames = hostnamesstring.split(";") + num_hosts = len(hostnames) folder = g_folders[folderpath] load_hosts(folder) arguments = [how,] + hostnames @@ -2613,7 +2614,7 @@ def mode_bulk_inventory(phase): arguments = [ "--cache" ] + arguments counts, failed_hosts = check_mk_automation(site_id, "inventory", arguments) #counts = ( 1, 2, 3, 4 ) - result = repr([ 'continue', 1, 0 ] + list(counts)) + "\n" + result = repr([ 'continue', num_hosts, 0 ] + list(counts)) + "\n" for hostname in hostnames: host = folder[".hosts"][hostname] if hostname in failed_hosts: @@ -2631,7 +2632,7 @@ def mode_bulk_inventory(phase): save_hosts(folder) # Could be optimized, but difficult here except Exception, e: - result = repr([ 'failed', 1, 1, 0, 0, 0, 0, ]) + "\n" + result = repr([ 'failed', num_hosts, num_hosts, 0, 0, 0, 0, ]) + "\n" if site_id: msg = _("Error during inventory of %s on site %s<div class=exc>%s</div") % \ (", ".join(hostnames), site_id, e)

10 years, 11 months

Check_MK Git: check_mk: D-WATO: site specific global settings!

by Mathias Kettner

Module: check_mk Branch: master Commit: d3adc7b30a3914e54ce6ac6b0001ea90cdd23647 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3adc7b30a3914… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 12 21:44:54 2013 +0200 D-WATO: site specific global settings! This e.g. allows to disable LDAP on remote sites while it is active in the master site --- ChangeLog | 5 + doc/drafts/LIESMICH.site_spezifische_konfig | 23 +++ web/htdocs/wato.css | 11 +- web/htdocs/wato.py | 254 +++++++++++++++++++++------ 4 files changed, 241 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d3adc7b30a…

10 years, 11 months

Check_MK Git: check_mk: Added internal docu

by Mathias Kettner

Module: check_mk Branch: master Commit: 6e59457c1fe5d33ee1d2fe654d3cb7650ad7c4f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e59457c1fe5d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 12 21:46:07 2013 +0200 Added internal docu --- doc/drafts/LIESMICH.dwato_sitespezifische_snapshots | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/drafts/LIESMICH.dwato_sitespezifische_snapshots b/doc/drafts/LIESMICH.dwato_sitespezifische_snapshots new file mode 100644 index 0000000..e47d7a3 --- /dev/null +++ b/doc/drafts/LIESMICH.dwato_sitespezifische_snapshots @@ -0,0 +1,17 @@ +Wir brauchen beim D-WATO pro Site einen eigenen Sync-Snaphot, denn + +1. Wir wollen in Zukunft nicht mehr alle Hosts and alle Sites verteilen +2. Wir wollen Site-spezifische globale Einstellungen verteilen + +Deswegen werden die Sync-Snapshots jetzt generell Site-spezifisch +erzeugt. + +- create_sync_snapshot() bekommt eine Site-ID +- diese ist Teil des Snapshot-Namens +- der Snapshot wird immer kurz vor dem Sync erstellt + +Im Snapshot ist ein Subtarball sitespecific.tar, der +eine sitespecific.mk enthält. Darin ist ein repr() der +Site-Spezifischen globalen Variablen. Dieser wird beim +Empfangen des Snapshots eingearbeitet in den bestehenden +Einstellungen.

10 years, 11 months

Check_MK Git: check_mk: Fix bug with missing restart_liveproxy

by Mathias Kettner

Module: check_mk Branch: master Commit: 5ece7a84543abba8b0bafdaeb5e3a265ce56b5b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ece7a84543abb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 12 22:59:07 2013 +0200 Fix bug with missing restart_liveproxy --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 34b3ab5..b21531b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7426,7 +7426,7 @@ def save_sites(sites, activate=True): rewrite_config_files_below(g_root_folder) # fix site attributes need_sidebar_reload() - if config.liveproxyd_enabled and restart_liveproxy: + if config.liveproxyd_enabled: save_liveproxyd_config(sites) # Call the sites saved hook

10 years, 11 months

Check_MK Git: check_mk: FIX: fix broken single-site setups due to new caching

by Mathias Kettner

Module: check_mk Branch: master Commit: 63b80f7aafc19cf424f44766b725580a6fb834e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63b80f7aafc19c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 12 16:52:16 2013 +0200 FIX: fix broken single-site setups due to new caching --- ChangeLog | 3 +++ web/htdocs/livestatus.py | 33 ++++++++++++--------------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a16f9a..6657cd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ is just needed for the binary mk-job, which is useful but not neccessary. + Multisite: + * FIX: fix broken single-site setups due to new caching + 1.2.3i3: Core: * FIX: fixed typo in core startup message "logging initial states" diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index feb089c..8c5ba3b 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -163,10 +163,11 @@ class Helpers: class BaseConnection: - def __init__(self, socketurl, persist = False): + def __init__(self, socketurl, persist = False, allow_cache = False): """Create a new connection to a MK Livestatus socket""" self.add_headers = "" self.persist = persist + self.allow_cache = allow_cache self.socketurl = socketurl self.socket = None self.timeout = None @@ -263,10 +264,10 @@ class BaseConnection: self.send_query(query, add_headers) return self.recv_response(query, add_headers) - def send_query(self, query, add_headers = "", do_reconnect=True, allow_cache=False): + def send_query(self, query, add_headers = "", do_reconnect=True): + if not self.allow_cache: + query = remove_cache_regex.sub("", query) orig_query = query - if not allow_cache: - orig_query = remove_cache_regex.sub("", orig_query) if self.socket == None: self.connect() if not query.endswith("\n"): @@ -295,7 +296,7 @@ class BaseConnection: # Automatically try to reconnect in case of an error, but # only once. self.connect() - self.send_query(orig_query, add_headers, False, allow_cache=True) + self.send_query(orig_query, add_headers, False) return raise MKLivestatusSocketError("RC1:" + str(e)) @@ -331,7 +332,7 @@ class BaseConnection: timeout_at = now + self.timeout time.sleep(0.1) self.connect() - self.send_query(query, add_headers, allow_cache = True) # cache already removed + self.send_query(query, add_headers) return self.recv_response(query, add_headers, timeout_at) # do not send query again -> danger of infinite loop else: raise MKLivestatusSocketError(str(e)) @@ -355,8 +356,8 @@ class BaseConnection: class SingleSiteConnection(BaseConnection, Helpers): - def __init__(self, socketurl, persist = False): - BaseConnection.__init__(self, socketurl, persist) + def __init__(self, socketurl, persist = False, allow_cache = False): + BaseConnection.__init__(self, socketurl, persist, allow_cache) self.prepend_site = False self.auth_users = {} self.deadsites = {} # never filled, just for compatibility @@ -420,7 +421,7 @@ class MultiSiteConnection(Helpers): try: url = site["socket"] persist = not temporary and site.get("persist", False) - connection = SingleSiteConnection(url, persist) + connection = SingleSiteConnection(url, persist, allow_cache=site.get("cache", False)) if "timeout" in site: connection.set_timeout(int(site["timeout"])) connection.connect() @@ -626,15 +627,9 @@ class MultiSiteConnection(Helpers): limit_header = "" # First send all queries - nocache_query = remove_cache_regex.sub("", query) for sitename, site, connection in active_sites: try: - if site.get("cache"): - q = query - else: - q = nocache_query - connection.send_query(q, add_headers + limit_header, - allow_cache = site.get("cache", False)) + connection.send_query(query, add_headers + limit_header) except Exception, e: self.deadsites[sitename] = { "exception" : e, @@ -650,11 +645,7 @@ class MultiSiteConnection(Helpers): continue try: - if site.get("cache"): - q = query - else: - q = nocache_query - r = connection.recv_response(q, add_headers + limit_header) + r = connection.recv_response(query, add_headers + limit_header) stillalive.append( (sitename, site, connection) ) if self.prepend_site: r = [ [sitename] + l for l in r ]

10 years, 11 months

Check_MK Git: check_mk: Fixed cache file handling in bulk inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: b9151c5997c6c15904640c1c69cfc59e0281b8f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9151c5997c6c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 12 00:08:56 2013 +0200 Fixed cache file handling in bulk inventory --- modules/automation.py | 33 +++++++++++++++++++++------------ modules/check_mk_base.py | 2 +- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index ac3c3cd..6f65eee 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -89,11 +89,14 @@ def do_automation(cmd, args): # "fixall" - find new, remove exceeding # "refresh" - drop all services and reinventorize def automation_inventory(args): - global opt_use_cachefile - opt_use_cachefile = False + global opt_use_cachefile, inventory_max_cachefile_age if args[0] == "--cache": opt_use_cachefile = True + inventory_max_cachefile_age = 1000000000 args = args[1:] + else: + opt_use_cachefile = False + inventory_max_cachefile_age = -1 if len(args) < 2: raise MKAutomationError("Need two arguments: new|remove|fixall|refresh HOSTNAME") @@ -107,14 +110,17 @@ def automation_inventory(args): count_new = 0 failed_hosts = {} + k = globals().keys() + if how == "refresh": + for hostname in hostnames: + count_removed += remove_autochecks_of(hostname) # checktype could be added here + reread_autochecks() + for hostname in hostnames: try: - if how == "refresh": - count_removed = remove_autochecks_of(hostname) # checktype could be added here - reread_autochecks() - # Compute current state of new and existing checks - table = automation_try_inventory([hostname]) + table = automation_try_inventory([hostname], leave_no_tcp=True) + # Create new list of checks new_items = [] for entry in table: @@ -145,12 +151,14 @@ def automation_inventory(args): count_new += len(new_items) except Exception, e: + if opt_debug: + raise failed_hosts[hostname] = str(e) return (count_added, count_removed, count_kept, count_new), failed_hosts -def automation_try_inventory(args): +def automation_try_inventory(args, leave_no_tcp=False): global opt_use_cachefile, inventory_max_cachefile_age, check_max_cachefile_age if args[0] == '--cache': opt_use_cachefile = True @@ -166,7 +174,7 @@ def automation_try_inventory(args): if is_cluster(hostname): already_added = set([]) for node in nodes_of(hostname): - new_services = automation_try_inventory_node(node) + new_services = automation_try_inventory_node(node, leave_no_tcp=leave_no_tcp) for entry in new_services: if host_of_clustered_service(node, entry[6]) == hostname: # 1: check, 6: Service description @@ -182,7 +190,7 @@ def automation_try_inventory(args): already_added.add( (ct, descr) ) # make it unique else: - new_services = automation_try_inventory_node(hostname) + new_services = automation_try_inventory_node(hostname, leave_no_tcp=leave_no_tcp) for entry in new_services: host = host_of_clustered_service(hostname, entry[6]) if host == hostname: @@ -194,7 +202,7 @@ def automation_try_inventory(args): -def automation_try_inventory_node(hostname): +def automation_try_inventory_node(hostname, leave_no_tcp=False): global opt_use_cachefile, opt_no_tcp, opt_dont_submit try: @@ -301,7 +309,8 @@ def automation_try_inventory_node(hostname): g_service_description = descr infotype = ct.split('.')[0] opt_use_cachefile = True - opt_no_tcp = True + if not leave_no_tcp: + opt_no_tcp = True opt_dont_submit = True try: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 6e54c8d..d0da123 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -553,7 +553,7 @@ def read_cache_file(relpath, max_cache_age): raise MKGeneralException("Simulation mode and no cachefile present.") if opt_no_tcp: - raise MKGeneralException("Host is unreachable") + raise MKGeneralException("Host is unreachable, no usable cache file present") #Cache file '%s' missing or too old. TCP disallowed by you." % cachefile)

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits