Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Fixed default value of socket_queue_len

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5ad45ede74ff5c18fb697e060593c759889b5fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5ad45ede74ff5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 31 09:05:31 2012 +0100 Fixed default value of socket_queue_len --- mkeventd/bin/mkeventd | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 7dfb5a3..ddaf1d3 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1978,9 +1978,10 @@ def load_configuration(): "retention_interval" : 60, "housekeeping_interval" : 60, "statistics_interval" : 5, - "history_lifetime" : 365 * 24 * 3600, + "history_lifetime" : 365 * 24 * 3600, "history_rotation" : "daily", "remote_status" : None, + "socket_queue_len" : 10, } main_file = g_config_dir + "/mkeventd.mk" if not os.path.exists(main_file):

12 years

Check_MK Git: check_mk: WATO: sites not used in distr. WATO being skipped when

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f11a16faebc078dd29e0ee4e6b6854353fa79812 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f11a16faebc078… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 29 14:03:57 2012 +0100 WATO: sites not used in distr. WATO being skipped when determining the prefered peer --- ChangeLog | 2 ++ web/htdocs/wato.py | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7831a6..2d7a325 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,8 @@ list of explicit host/services in rules) * FIX: fix inheritation of contactgroups from folder to hosts * FIX: fix sorting of users, fix lost user alias in some situations + * FIX: Sites not using distritubed WATO now being skipped when determining + the prefered peer BI: * FIX: Correct representation of (!), (!!) and (?) markers in check output diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ee4f436..b1b9dba 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7343,7 +7343,15 @@ def preferred_peer(): if site.get("replication") == "slave": continue # Ignore slave sites - if best_peer == None or site.get("repl_priority",0) > best_peer.get("repl_priority",0) or (site_id < best_peer["id"] and site.get("repl_priority",0) == best_peer.get("repl_priority",0)): + if not site.get("replication") and not site_is_local(site_id): + continue # Ignore sites without distributed WATO + + # a) No peer found yet + # b) Replication priority of current site is greater than best peer + # c) On same priority -> use higher alphabetical order + if best_peer == None \ + or site.get("repl_priority",0) > best_peer.get("repl_priority",0) \ + or (site_id < best_peer["id"] and site.get("repl_priority",0) == best_peer.get("repl_priority",0)): best_peer = site if site_is_local(site_id): best_working_peer = site

12 years

Check_MK Git: check_mk: Updated bug entries #0872

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7cfa617b2ddfede21c087b91b7597655ac38bcd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cfa617b2ddfed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 29 09:22:22 2012 +0100 Updated bug entries #0872 --- .bugs/872 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/872 b/.bugs/872 new file mode 100644 index 0000000..2e5e4e3 --- /dev/null +++ b/.bugs/872 @@ -0,0 +1,10 @@ +Title: Sidebar does not terminate refresh jobs of removed snapins +Component: multisite +State: open +Date: 2012-10-29 09:20:48 +Targetversion: future +Class: bug + +When having e.g. the speedometer in the sidebar and removing it, the javascript worker code +remains fetching the speedometer webservice. The worker should detect that the snapin has +been removed and stop updating the data.

12 years

Check_MK Git: check_mk: Fixed validate checks helper

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 33ef07eb34e5f6c37a83b8ed693096f9a1c7ed19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33ef07eb34e5f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 29 10:09:17 2012 +0100 Fixed validate checks helper --- doc/helpers/validate_checks | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 1a101f2..23e488e 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -74,7 +74,7 @@ def get_perfometer_files(): return [ f for f in files if f.endswith(".py") and not f.startswith('.') ] def check_has_perfdata(check): - return check_info[check]["has_perfdata"] + return check_info[check].get("has_perfdata", False) def get_all_checks(): k = check_info.keys()

12 years

Check_MK Git: check_mk: BI: Fixed bug with clusters in single host aggregation construct

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 21b9ff3c4a42c761d063d59ecfddf9687cb12bff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21b9ff3c4a42c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 29 13:24:57 2012 +0100 BI: Fixed bug with clusters in single host aggregation construct --- web/htdocs/bi.py | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 69455f7..c8b5c16 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -361,14 +361,15 @@ def compile_forest(user, only_hosts = None, only_groups = None): if aggr_type == AGGR_HOST: # In normal cases a host aggregation has only one req_hosts item, we could use # index 0 here. But clusters (which are also allowed now) have all their nodes - # in the list of required nodes. The cluster node is always the last one in - # this list. - host = req_hosts[-1] # pair of (site, host) - if not only_hosts or host in only_hosts: - cache["host_aggregations"].setdefault(host, []).append((group, aggr)) + # in the list of required nodes. + # Before the latest change this used the last item of the req_hosts. I think it + # would be better to register this for all hosts mentioned in req_hosts. Give it a try... + for host in req_hosts: + if not only_hosts or host in only_hosts: + cache["host_aggregations"].setdefault(host, []).append((group, aggr)) - # construct a list of compiled single-host aggregations for cached registration - single_affected_hosts.append(host) + # construct a list of compiled single-host aggregations for cached registration + single_affected_hosts.append(host) # All aggregations containing a specific host for h in req_hosts: @@ -646,17 +647,22 @@ def find_all_leaves(node): else: return [] +# Removes all empty nodes from the given rule tree def remove_empty_nodes(node): - if node["type"] != NT_RULE: # leaf node + if node["type"] != NT_RULE: + # simply return leaf nodes without action return node else: subnodes = node["nodes"] + # loop all subnodes recursing down to the lowest level for i in range(0, len(subnodes)): remove_empty_nodes(subnodes[i]) + # remove all subnode rules which have no subnodes for i in range(0, len(subnodes))[::-1]: if node_is_empty(subnodes[i]): del subnodes[i] +# Checks wether or not a rule node has no subnodes def node_is_empty(node): if node["type"] != NT_RULE: # leaf node return False @@ -774,7 +780,7 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): needed_hosts.update(element.get("reqhosts", [])) aggregation = { "type" : NT_RULE, - "reqhosts" : list(needed_hosts), + "reqhosts" : needed_hosts, "title" : inst_description, "func" : funcname, "nodes" : elements} @@ -783,9 +789,13 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): if lvl == 0: for hostspec, ref, placeholder in g_remaining_refs: new_entries = find_remaining_services(hostspec, aggregation) + for entry in new_entries: + aggregation['reqhosts'].update(entry['reqhosts']) where_to_put = ref.index(placeholder) ref[where_to_put:where_to_put+1] = new_entries + aggregation['reqhosts'] = list(aggregation['reqhosts']) + return [ aggregation ] @@ -884,8 +894,9 @@ def compile_leaf_node(host_re, service_re = config.HOST_STATE): "title" : hostname}) elif service_re == config.REMAINING: - found.append({"type" : NT_REMAINING, - "host" : (site, hostname)}) + found.append({"type" : NT_REMAINING, + "reqhosts" : [(site, hostname)], + "host" : (site, hostname)}) else: # found.append({"type" : NT_LEAF,

12 years

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e04051dfdb222baf25c13c217264bf45da1e4d40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e04051dfdb222b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 29 13:25:12 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: logwatch: add some examples for critical errors

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0985c6a7bcd3097f0a5b636203b086c0a713ba6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0985c6a7bcd309… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Oct 28 21:20:15 2012 +0100 logwatch: add some examples for critical errors --- agents/logwatch.cfg | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/agents/logwatch.cfg b/agents/logwatch.cfg index 4e2db0c..14c1628 100644 --- a/agents/logwatch.cfg +++ b/agents/logwatch.cfg @@ -39,6 +39,8 @@ W mdadm\[ W ata.*hard resetting link W ata.*soft reset failed (.*FIS failed) + W device-mapper: thin:.*reached low water mark + C device-mapper: thin:.*no free space /var/log/auth.log W sshd.*Corrupted MAC on input @@ -46,6 +48,7 @@ /var/log/syslog /var/log/kern.log C panic C Oops + W generic protection rip W .*Unrecovered read error - auto reallocate failed # Globbing patterns are allowed:

12 years

Check_MK Git: check_mk: Dashboard globes can now be filtered by host_contact_group/ service_contact_group

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 944c86b6938d96b5ff54e07560a552bc977df1dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=944c86b6938d96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 26 11:02:56 2012 +0200 Dashboard globes can now be filtered by host_contact_group/service_contact_group --- ChangeLog | 1 + web/htdocs/dashboard.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d3f64b..7273308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * Added new painters "Service check command expanded" and "Host check command expanded" * FIX: Corrected garbled description for sorter "Service Performance data" + * Dashboard globes can now be filtered by host_contact_group/service_contact_group Livestatus: * Added new table statehist, used for SLA queries diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index bacb6a2..b3c3c14 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -521,6 +521,16 @@ def render_statistics(pie_id, what, table, filter): # filter += "Filter: host_state = 0" filter += "Filter: host_filename ~ ^/wato/%s/\n" % wato_folder.replace("\n", "") + # Is the query restricted to a host contact group? + host_contact_group = html.var("host_contact_group") + if host_contact_group: + filter += "Filter: host_contact_groups >= %s\n" % host_contact_group.replace("\n", "") + + # Is the query restricted to a service contact group? + service_contact_group = html.var("service_contact_group") + if service_contact_group: + filter += "Filter: service_contact_groups >= %s\n" % service_contact_group.replace("\n", "") + query = "GET %s\n" % what for entry in table: query += entry[3]

12 years

Check_MK Git: check_mk: check_mkevents outputs last worst line in service output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c264234db316f6d9d8cf8b46961efb6835b4ad99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c264234db316f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 26 09:25:24 2012 +0200 check_mkevents outputs last worst line in service output --- ChangeLog | 1 + mkeventd/lib/check_mkevents | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c635862..82270c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * FIX: rule simulator ("Try out") now handles cancelling rules correctly * New global option for enabling log entries for rule hits (debugging) * New icon linking to event views for the event services + * check_mkevents outputs last worst line in service output Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 6f2da5a..9d93fce 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -69,6 +69,7 @@ q += "Filter: event_phase in open ack\n" response = query(q, remote_host) headers = response[0] worst_state = 0 +worst_row = None count = 0 unhandled = 0 for line in response[1:]: @@ -77,8 +78,10 @@ for line in response[1:]: if s == 3: if worst_state < 2: worst_state = 3 - else: - worst_state = max(worst_state, s) + worst_row = row + elif s >= worst_state: + worst_state = s + worst_row = row count += 1 if row["event_phase"] == 'open': unhandled += 1 @@ -96,8 +99,8 @@ elif count == 0: sys.stdout.write("OK - no events for %s\n" % host_name) else: sys.stdout.write(nagios_state_names[worst_state] + \ - " - %d events (%d unacknowledged), worst state is %s\n" % \ - (count, unhandled, nagios_state_names[worst_state])) + " - %d events (%d unacknowledged), worst state is %s (Last line: %s)\n" % \ + (count, unhandled, nagios_state_names[worst_state], worst_row['event_text'].encode('utf-8'))) sys.exit(worst_state)

12 years

Check_MK Git: check_mk: logwatch.ec: Added perfdata to record number of forwarded messages

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e62fb52c46d1b614aecb75c2e56ffca0bae9020e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e62fb52c46d1b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 11:52:12 2012 +0200 logwatch.ec: Added perfdata to record number of forwarded messages --- checks/logwatch | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index e79f9dc..cd843ec 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -471,7 +471,8 @@ def check_logwatch_ec(_unused, params, info): pipe.write('\n'.join(messages)) pipe.close() - return (0, 'OK - Forwarded %d messages to event console' % len(messages)) + num_messages = len(messages) + return (0, 'OK - Forwarded %d messages to event console' % num_messages, [('messages', num_messages)]) except Exception, e: return (2, 'CRITICAL - Unable to forward messages to event console (%s)' % e)

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012