Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64363 discussions

Check_MK Git: check_mk: mkeventd: fix crash when no rules defined

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d90881c52ff33c82a4f089eca72d8fe17ed495a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d90881c52ff33c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 14 10:47:37 2012 +0100 mkeventd: fix crash when no rules defined --- mkeventd/bin/mkeventd | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index ddaf1d3..7911d81 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -871,7 +871,9 @@ class EventServer: if g_config["rule_optimizer"]: self.hash_rule(rule) - if "match_facility" not in rule and "match_priority" not in rule and "cancel_priority" not in rule: + if "match_facility" not in rule \ + and "match_priority" not in rule \ + and "cancel_priority" not in rule: count_unspecific += 1 @@ -880,10 +882,11 @@ class EventServer: log("Rule hash: %d rules - %d hashed, %d unspecific" % (len(self._rules), len(self._rules) - count_unspecific, count_unspecific)) for facility in range(24): - stats = [] - for prio, entries in self._rule_hash[facility].items(): - stats.append("%s(%d)" % (syslog_priorities[prio], len(entries))) - log(" %-12s: %s" % (syslog_facilities[facility], " ".join(stats))) + if facility in self._rule_hash: + stats = [] + for prio, entries in self._rule_hash[facility].items(): + stats.append("%s(%d)" % (syslog_priorities[prio], len(entries))) + log(" %-12s: %s" % (syslog_facilities[facility], " ".join(stats))) def hash_rule(self, rule):

11 years, 10 months

Check_MK Git: check_mk: Event Console: New button for generating test events directly via WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f50a8157c0c68ba7d005fbb85427e2cbed5e7090 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f50a8157c0c68b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 14 11:26:35 2012 +0100 Event Console: New button for generating test events directly via WATO --- ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 27 ++++++++++++++++++++++++--- mkeventd/web/plugins/wato/mkeventd.py | 14 ++++++++++++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64365cc..508f152 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * Max. number of queued connections on status sockets is configurable now * check_mkevents: new option -a for ignoring acknowledged events * New sub-permissions for changing comment and contact while updating an event + * New button for generating test events directly via WATO Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index a5c165b..934ade6 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -1,9 +1,19 @@ #!/usr/bin/python # encoding: utf-8 -import socket, config, defaults, re +import socket, config, defaults, re, time from lib import * +# TODO: make this configurable and thus work for non OMD-users as +# well. +try: + socket_path = defaults.omd_root + "/tmp/run/mkeventd/status" + pipe_path = defaults.omd_root + "/tmp/run/mkeventd/events" +except: + run_dir = defaults.livestatus_unix_socket.rsplit("/",1)[0] + socket_path = run_dir + "/mkeventd/status" + pipe_path = run_dir + "/mkeventd/events" + syslog_priorities = [ (0, "emerg" ), (1, "alert" ), @@ -98,7 +108,18 @@ def eventd_configuration(): def daemon_running(): - return os.path.exists(defaults.omd_root + "/tmp/run/mkeventd/status") + return os.path.exists(socket_path) + + +def send_event(event): + # "<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag% %msg%\n" + prio = (event["facility"] << 3) + event["priority"] + timestamp = time.strftime("%b %d %T", time.localtime()) + rfc = "<%d>%s %s %s: %s\n" % ( + prio, timestamp, event["host"], event["application"], event["text"]) + pipe = file(pipe_path, "w") + pipe.write(rfc + "\n") + return rfc def query(query): try: @@ -110,7 +131,7 @@ def query(query): sock.settimeout(timeout) # TODO: Pfad nicht auf OMD hart kodieren - sock.connect(defaults.omd_root + "/tmp/run/mkeventd/status") + sock.connect(socket_path) sock.send(query) response_text = "" diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 6395413..93fef1f 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -712,10 +712,19 @@ def mode_mkeventd_rules(phase): if phase == "action": # Validation of input for rule simulation (no further action here) - if html.var("simulate"): + if html.var("simulate") or html.var("_generate"): event = vs_mkeventd_event.from_html_vars("event") vs_mkeventd_event.validate_value(event, "event") + if html.has_var("_generate") and html.check_transaction(): + if not event.get("application"): + raise MKUserError("event_p_application", _("Please specify an application name")) + if not event.get("host"): + raise MKUserError("event_p_host", _("Please specify a host name")) + rfc = mkeventd.send_event(event) + return None, "Test event generated and sent to Event Console.<br><pre>%s</pre>" % rfc + + if html.has_var("_delete"): nr = int(html.var("_delete")) rule = rules[nr] @@ -764,7 +773,8 @@ def mode_mkeventd_rules(phase): vs_mkeventd_event.render_input("event", event) forms.end() html.hidden_fields() - html.button("simulate", _("Try out!")) + html.button("simulate", _("Try out")) + html.button("_generate", _("Generate Event!")) html.end_form() html.write("<br>")

11 years, 10 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: 78c80f6a4e466d31d0c8ccca3d6f0487abd26620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78c80f6a4e466d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 14 16:15:26 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: mkeventd: first step of slave replication

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1e5c058764219703576caf294dc656d195a015d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1e5c058764219… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 14 16:15:21 2012 +0100 mkeventd: first step of slave replication --- mkeventd/bin/mkeventd | 275 ++++++++++++++++++++++++++++++-- mkeventd/omd/mkeventd.init | 2 +- mkeventd/web/plugins/wato/mkeventd.py | 100 ++++++++++++- 3 files changed, 357 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e1e5c05876…

11 years, 10 months

Check_MK Git: check_mk: FIX: Updating internal variables after moving hosts correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 16115ff6dfed6313a0db3acf7617e3e4e4e88aa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16115ff6dfed63… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 15:24:48 2012 +0100 FIX: Updating internal variables after moving hosts correctly (fixes problems with hosts tree processed in hooks) Conflicts: ChangeLog --- ChangeLog | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d33e87..5a8052b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,7 +107,6 @@ * winperf_phydisk: monitor average queue length for read/write 1.2.0p4: - Mulitisite: * 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

11 years, 10 months

Check_MK Git: check_mk: Hopefully fixed the changelog now :-/

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1581640d445929f6fc31b460fafaa78b909d6751 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1581640d445929… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 15:40:53 2012 +0100 Hopefully fixed the changelog now :-/ --- ChangeLog | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index adc68a4..9d33e87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,22 +106,16 @@ * if-checks now support "bit" as measurement unit * winperf_phydisk: monitor average queue length for read/write -1.2.0p4 - WATO - * FIX: Updating internal variables after moving hosts correctly - (fixes problems with hosts tree processed in hooks) - -1.2.0p3: - Mulitisite - * Added "view" parameter to dashlet_pnpgraph webservice +1.2.0p4: + Mulitisite: * 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 + * FIX: WATO Folder filter not available when WATO disabled + * FIX: WATO Folder Filter no longer available in single host views + * FIX: Quicksearch converts search text to regex when accessing livestatus - WATO - * Added "profile" option to be configurable via browser - * FIX: It is now possible to create clusters in empty folders - * FIX: Fixed problem with complaining empty ListOf() valuespecs + WATO: * FIX: Users & Contacts uses case-insensitive sorting of 'Full name' column * FIX: Removed focus of "Full name" attribute on editing a contact * FIX: fix layout bug in ValueSpec ListOfStrings (e.g. used in @@ -130,16 +124,17 @@ * 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 + * FIX: Updating internal variables after moving hosts correctly + (fixes problems with hosts tree processed in hooks) BI: * FIX: Correct representation of (!), (!!) and (?) markers in check output - Livestatus - * FIX: comments_with_info in service table was always empty + Livestatus: * FIX: check_icmp: fixed calculation of remaining length of output buffer * FIX: check_icmp: removed possible buffer overflow on do_output_char() - Livecheck + Livecheck: * FIX: fixed problem with long plugin output * FIX: added /0 termination to strings * FIX: changed check_type to be always active (0) @@ -166,6 +161,17 @@ * FIX: ps: avoid exception, when CPU% is missing (Zombies on Solaris) * FIX: win_dhcp_pools: fixed calculation of perc_free +1.2.0p3: + Multisite: + * Added "view" parameter to dashlet_pnpgraph webservice + + WATO: + * FIX: It is now possible to create clusters in empty folders + * FIX: Fixed problem with complaining empty ListOf() valuespecs + + Livestatus: + * FIX: comments_with_info in service table was always empty + 1.2.1i1: Core: * Allow to add options to rules. Currently the options "disabled" and

11 years, 10 months

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: 0cd972497929bc4a21f7b6609598118d2958bf68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cd972497929bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 15:26:01 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Fixed changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 33980c3398f629ffe97e8ff40ed57d4654fdebd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33980c3398f629… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 14 15:24:48 2012 +0100 Fixed changelog --- ChangeLog | 5 +++++ web/htdocs/wato.py | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7246d22..adc68a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,11 @@ * if-checks now support "bit" as measurement unit * winperf_phydisk: monitor average queue length for read/write +1.2.0p4 + WATO + * FIX: Updating internal variables after moving hosts correctly + (fixes problems with hosts tree processed in hooks) + 1.2.0p3: Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 946ab41..d23391b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1526,10 +1526,16 @@ def move_hosts_to(hostnames, path): continue mark_affected_sites_dirty(g_folder, hostname) + + # Add to new folder target_hosts[hostname] = g_folder[".hosts"][hostname] + target_hosts[hostname]['.folder'] = target_folder target_folder["num_hosts"] += 1 + + # Remove from old folder g_folder["num_hosts"] -= 1 del g_folder[".hosts"][hostname] + mark_affected_sites_dirty(target_folder, hostname) if len(hostnames) == 1:

11 years, 10 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: 192e524f9c7c8e57af6d8dc091014b70ed8a5364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=192e524f9c7c8e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 14 10:17:28 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Diskstat docu correction

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d312923c6b6246a1f5b70f7bf987cd92d1685252 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d312923c6b6246… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 13 13:34:37 2012 +0100 Diskstat docu correction --- checkman/diskstat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/diskstat b/checkman/diskstat index 629411a..c0b25d7 100644 --- a/checkman/diskstat +++ b/checkman/diskstat @@ -129,7 +129,7 @@ diskstat_inventory_mode(string): By default this is now set to {"rule"} for to rules internally. Either {"single"} for one service per disk or {"summary"} for the throughput of all disks summed up in one service. Also possible is {"legacy"} for the old style mode (see above). Default - is {"single"}. + is {"summary"}. diskstat_inventory(list): This is a list of block device types to track.

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits