Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: FIX: fixed detection of existing groups when creating new groups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de6087820df09f3a6812c0be26205b05f727bed7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de6087820df09f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 14:30:40 2012 +0100 FIX: fixed detection of existing groups when creating new groups Conflicts: ChangeLog --- ChangeLog | 7 +++++++ web/htdocs/wato.py | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b432e9..88d1d14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,13 @@ * winperf_phydisk: monitor average queue length for read/write 1.2.0p4: + WATO: + * FIX: fixed detection of existing groups when creating new groups + + +1.2.0p3: + Mulitisite + * Added "view" parameter to dashlet_pnpgraph webservice * FIX: BI: Assuming "OK" for hosts is now possible * FIX: Fixed error in makeuri() calls when no parameters in URL * FIX: Try out mode in view editor does not show context buttons anymore diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a0135f7..b8604bc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5807,6 +5807,8 @@ def mode_edit_group(phase, what): raise MKUserError("name", _("Sorry, spaces are not allowed in group names.")) if not re.match("^[-a-z0-9A-Z_]*$", name): raise MKUserError("name", _("Invalid group name. Only the characters a-z, A-Z, 0-9, _ and - are allowed.")) + if name in groups: + raise MKUserError("name", _("Sorry, there is already a group with that name")) groups[name] = alias log_pending(SYNCRESTART, None, "edit-%sgroups" % what, _("Create new %s group %s" % (what, name))) else:

11 years, 7 months

Check_MK Git: check_mk: WATO: Cloning of contact/host/service groups ( without members)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a756bb3faecfa93696749e30a903c4a7e983b66b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a756bb3faecfa9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 14:28:32 2012 +0100 WATO: Cloning of contact/host/service groups (without members) --- ChangeLog | 3 +++ web/htdocs/wato.py | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3de6b68..7b432e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * New performance counter for client request processing time * FIX: fixed bug in rule optimizer with ranges of syslog priorities + WATO: + * Cloning of contact/host/service groups (without members) + 1.2.1i2: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d23391b..a0135f7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5755,8 +5755,10 @@ def mode_groups(phase, what): html.write('<tr class="data %s0">' % odd) edit_url = make_link([("mode", "edit_%s_group" % what), ("edit", name)]) delete_url = html.makeactionuri([("_delete", name)]) + clone_url = make_link([("mode", "edit_%s_group" % what), ("clone", name)]) html.write("<td class=buttons>") html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Create a copy of this group"), "clone") html.icon_button(delete_url, _("Delete"), "delete") html.write("</td><td>%s</td><td>%s</td>" % (name, alias)) if what == "contact": @@ -5821,7 +5823,8 @@ def mode_edit_group(phase, what): html.help(_("The name of the group is used as an internal key. It cannot be " "changed later. It is also visible in the status GUI.")) if new: - html.text_input("name") + clone_group = html.var("clone") + html.text_input("name", clone_group or "") html.set_focus("name") else: html.write(name) @@ -5829,7 +5832,12 @@ def mode_edit_group(phase, what): forms.section(_("Alias")) html.help(_("An Alias or description of this group.")) - html.text_input("alias", name and groups.get(name, "") or "") + alias = groups.get(name, "") + if not alias and clone_group: + alias = groups.get(clone_group, "") + if not alias: + alias = name + html.text_input("alias", alias) forms.end() html.button("save", _("Save")) html.hidden_fields()

11 years, 7 months

Check_MK Git: check_mk: FIX: mkeventd: fixed bug in rule optimizer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3828c730be0af1f45eaa2e5cd88406ec632eb39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3828c730be0af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 14:06:00 2012 +0100 FIX: mkeventd: fixed bug in rule optimizer --- ChangeLog | 1 + mkeventd/bin/mkeventd | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54df6e0..3de6b68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.1i3: Event Console: * New performance counter for client request processing time + * FIX: fixed bug in rule optimizer with ranges of syslog priorities 1.2.1i2: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index f17a38e..11fd3a5 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -974,7 +974,8 @@ class EventServer: for key in [ "match_priority", "cancel_priority" ]: if key in rule: prio_from, prio_to = rule[key] - for p in range(prio_from, prio_to+1): + # Beware: from > to! + for p in range(prio_to, prio_from + 1): needed_prios[p] = True elif key == "match_priority": # all priorities match needed_prios = [True] * 8 # needed to check this rule for all event priorities

11 years, 7 months

Check_MK Git: check_mk: mkeventd: better error handling in case of broken pipe

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5fb3af76fa2d6156aa9d8638165bf53371998204 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fb3af76fa2d61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 11:12:59 2012 +0100 mkeventd: better error handling in case of broken pipe --- mkeventd/bin/mkeventd | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 0ad51e8..f17a38e 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -481,6 +481,7 @@ def get_logfile_timespan(path): except: return 0.0, 0.0 +#. # .--Perfcounters--------------------------------------------------------. # | ____ __ _ | # | | _ \ ___ _ __ / _| ___ ___ _ _ _ __ | |_ ___ _ __ ___ | @@ -1429,7 +1430,11 @@ class StatusServer: except Exception, e: log("Error handling client %s: %s" % (addr_info, e)) if client_socket: - client_socket.send("ERROR: %s\n" % e) + try: + client_socket.send("ERROR: %s\n" % e) + except: + pass # avoid next exception because of broken pipe! + client_socket.close() client_socket = None if opt_debug:

11 years, 7 months

Check_MK Git: check_mk: mkeventd: performance optimization for check_mkevents

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4496ac8931e30ed1729e0b34c0b86fd3fe2e497 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4496ac8931e30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 11:04:06 2012 +0100 mkeventd: performance optimization for check_mkevents --- mkeventd/bin/mkeventd | 20 +++++++++++++++----- mkeventd/web/plugins/sidebar/mkeventd.py | 9 ++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 6fdff42..0ad51e8 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -523,7 +523,7 @@ class Perfcounters: if counter not in self._times: self._times[counter] = ptime else: - weight = self._weights(counter) + weight = self._weights[counter] self._times[counter] *= weight self._times[counter] += (1.00 - weight) * ptime @@ -1609,17 +1609,23 @@ class StatusServer: raise MKClientError("Invalid table %s, we only have 'events', 'history' and 'status'" % table) filters = [] + only_host = None for line in headerlines: try: header, argument = line.rstrip().split(":", 1) argument = argument.strip() if header == "Filter": - filters.append(self.parse_filter(argument, columns)) + name, opfunc, argument = self.parse_filter(argument, columns) + # Needed for later optimization + if name == "event_host" and filter_operators['=']: + only_host = argument + filters.append((name, opfunc, argument)) + except Exception, e: raise MKClientError("Invalid header line '%s': %s" % (line.rstrip(), e)) if table == "events": - headers, list_rows = g_event_status.get_events() + headers, list_rows = g_event_status.get_events(only_host) elif table == "history": headers, list_rows = get_event_history(filters) else: @@ -2007,9 +2013,12 @@ class EventStatus(): return raise MKClientError("No event with id %s" % event_id) - def get_events(self): + def get_events(self, only_host = None): result = [] for event in self._events: + # A small optimization for check_mkevents + if only_host and event["host"] != only_host: + continue event_line = [] for col_name, col_default in event_columns: without_prefix = col_name[6:] # drop event_ @@ -2225,7 +2234,8 @@ def load_master_config(): log("Replication: restored %d rules and %d actions from %s" % (len(config["rules"]), len(config["actions"]), path)) except: - log("Replication: no previously saved master state available") + if is_replication_slave(): + log("Replication: no previously saved master state available") def get_state_from_master(): diff --git a/mkeventd/web/plugins/sidebar/mkeventd.py b/mkeventd/web/plugins/sidebar/mkeventd.py index 97b92f2..279e722 100644 --- a/mkeventd/web/plugins/sidebar/mkeventd.py +++ b/mkeventd/web/plugins/sidebar/mkeventd.py @@ -52,22 +52,25 @@ def render_mkeventd_performance(): # Hit rate try: - write_line(_("Rule hit ratio"), "%.2f%%" % ( + write_line(_("Rule hit ratio"), "%.2f %%" % ( data["status_average_rule_hit_rate"] / data["status_average_rule_trie_rate"] * 100)) except: # division by zero + write_line(_("Rule hit ratio"), _("-.-- %")) pass # Time columns time_columns = [ (_("Processing time per message"), "processing"), - (_("Processing time per client request"), "request"), - (_("Replication synchronization (avg)"), "sync"), + (_("Tiime per client request"), "request"), + (_("Replication synchronization"), "sync"), ] for title, name in time_columns: value = data.get("status_average_%s_time" % name) if value: write_line(title, "%.2f ms" % (value * 1000)) + else: + write_line(title, _("-.-- ms")) html.write("</table>\n") if mkeventd_enabled:

11 years, 7 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d814e882016085f56a8038288b79d23821980a08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d814e882016085… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 10:29:43 2012 +0100 Updated changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49b9041..54df6e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.1i3: + Event Console: + * New performance counter for client request processing time 1.2.1i2:

11 years, 7 months

Check_MK Git: check_mk: Small fix in doc/helpers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c0f22391e809823ca3ec86b7a104ac11439eef3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0f22391e8098… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 09:56:20 2012 +0100 Small fix in doc/helpers --- doc/helpers/figheader | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/helpers/figheader b/doc/helpers/figheader index 41abf0f..d94fc14 100755 --- a/doc/helpers/figheader +++ b/doc/helpers/figheader @@ -27,8 +27,10 @@ if sys.argv[1].startswith("-"): width = 76 sepmid = sep + '-' * (width - len(sep) - 1) + '+' -print first + '-' * (width - len(first) - 1) + '.' -for line in os.popen("figlet -c -w %d '%s'" % (width - 7, " ".join(sys.argv[1:])), "r"): +title = " ".join(sys.argv[1:]) +first_line = first + "-" + title +print first_line + '-' * (width - len(first_line) - 1) + '.' +for line in os.popen("figlet -c -w %d '%s'" % (width - 7, title), "r"): line = line[:-1] print (cont + "|%-" + str(width - len(cont) - 2) + "s|") % line print sepmid

11 years, 7 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad2b54bb665798042f4c982a59bbb3bc6084061f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad2b54bb665798… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 10:29:17 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: mkeventd: cleaned up perf-statistics code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8dc3e940bfb44ff03877d6609dc1aedadc0eecc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dc3e940bfb44f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 10:29:02 2012 +0100 mkeventd: cleaned up perf-statistics code Also new counter for client request processing time --- mkeventd/bin/mkeventd | 167 ++++++++++++++++++------------ mkeventd/web/plugins/sidebar/mkeventd.py | 29 ++++-- 2 files changed, 124 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8dc3e940bf…

11 years, 7 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f9e11182b65b0519aecd477c91cb99854fbc0a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9e11182b65b0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sat Nov 17 19:37:55 2012 +0100 Add new bug entry --- .bugs/811 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/811 b/.bugs/811 new file mode 100644 index 0000000..64c419c --- /dev/null +++ b/.bugs/811 @@ -0,0 +1,11 @@ +Title: Multisite does not display local check man pages +Component: multisite +State: open +Date: 2012-11-16 10:39:32 +Targetversion: 1.2.0 +Class: bug + +If you install an MKP and it brings a check man page this man page is not +displayed from Multisite, instead it gives an error about not finding the +check man page in the default path. It would be good if multisite could +also check the local/ structure for existing man pages

11 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012