Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: FIX: etc/init.d/ mkeventd flush did not work when mkeventd was stopped

by Mathias Kettner

Module: check_mk Branch: master Commit: 9bd9fa9378a9f4af628647f83cab6b598c1dae75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bd9fa9378a9f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 17:58:55 2013 +0100 FIX: etc/init.d/mkeventd flush did not work when mkeventd was stopped --- ChangeLog | 1 + mkeventd/omd/mkeventd.init | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21973e0..1ff0700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ you need to edit and save each affected rule once in order to make the fix work. * FIX: Fixed exception when logging actions exectuted by mkeventd + * FIX: etc/init.d/mkeventd flush did not work when mkeventd was stopped Multisite: * FIX: Fixed several minor IE7 related layout bugs diff --git a/mkeventd/omd/mkeventd.init b/mkeventd/omd/mkeventd.init index f67259a..6ccc3ce 100755 --- a/mkeventd/omd/mkeventd.init +++ b/mkeventd/omd/mkeventd.init @@ -100,7 +100,7 @@ case "$1" in fi else echo -n "Deleting status and history files..." - rm -f $OMD_ROOT/var/{status,master_config,slave_status,history/*} + rm -f $OMD_ROOT/var/mkeventd/{status,master_config,slave_status,history/*} echo OK exit 0 fi

11 years, 7 months

Check_MK Git: check_mk: removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: a64acc9fd3066f195d93fea0f163aee5a09948da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a64acc9fd3066f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 08:46:37 2013 +0100 removed debug output --- mkeventd/web/plugins/wato/mkeventd.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index fa79719..c5cd266 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -687,7 +687,6 @@ vs_mkeventd_event = Dictionary( def load_mkeventd_rules(): filename = mkeventd_config_dir + "rules.mk" - html.write(filename) if not os.path.exists(filename): return [] try:

11 years, 7 months

Check_MK Git: check_mk: Fixed conflicts between mknotifyd / mkeventd vars

by Lars Michelsen

Module: check_mk Branch: master Commit: d3ff611143e3be34894906371d5497536936ee3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3ff611143e3be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 08:45:11 2013 +0100 Fixed conflicts between mknotifyd / mkeventd vars --- mkeventd/web/plugins/wato/mkeventd.py | 21 +++++++++++---------- web/plugins/wato/mknotifyd.py | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 96308fe..fa79719 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -32,15 +32,15 @@ except: mkeventd_enabled = False # main_config_file = defaults.check_mk_configdir + "/mkeventd.mk" -config_dir = defaults.default_config_dir + "/mkeventd.d/wato/" +mkeventd_config_dir = defaults.default_config_dir + "/mkeventd.d/wato/" if defaults.omd_root: - status_file = defaults.omd_root + "/var/mkeventd/status" + mkeventd_status_file = defaults.omd_root + "/var/mkeventd/status" # Include rule configuration into backup/restore/replication. Current # status is not backed up. if mkeventd_enabled: - replication_paths.append(( "dir", "mkeventd", config_dir )) - backup_paths.append(( "dir", "mkeventd", config_dir )) + replication_paths.append(( "dir", "mkeventd", mkeventd_config_dir )) + backup_paths.append(( "dir", "mkeventd", mkeventd_config_dir )) #. # .--ValueSpecs----------------------------------------------------------. @@ -686,7 +686,8 @@ vs_mkeventd_event = Dictionary( # '----------------------------------------------------------------------' def load_mkeventd_rules(): - filename = config_dir + "rules.mk" + filename = mkeventd_config_dir + "rules.mk" + html.write(filename) if not os.path.exists(filename): return [] try: @@ -695,8 +696,8 @@ def load_mkeventd_rules(): # If we are running on OMD then we know the path to # the state retention file of mkeventd and can read # the rule statistics directly from that file. - if defaults.omd_root and os.path.exists(status_file): - mkeventd_status = eval(file(status_file).read()) + if defaults.omd_root and os.path.exists(mkeventd_status_file): + mkeventd_status = eval(file(mkeventd_status_file).read()) rule_stats = mkeventd_status["rule_stats"] for rule in vars["rules"]: rule["hits"] = rule_stats.get(rule["id"], 0) @@ -718,8 +719,8 @@ def load_mkeventd_rules(): def save_mkeventd_rules(rules): make_nagios_directory(defaults.default_config_dir + "/mkeventd.d") - make_nagios_directory(config_dir) - out = create_user_file(config_dir + "rules.mk", "w") + make_nagios_directory(mkeventd_config_dir) + out = create_user_file(mkeventd_config_dir + "rules.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") try: if config.mkeventd_pprint_rules: @@ -1280,7 +1281,7 @@ if mkeventd_enabled: if mkeventd_enabled: - register_configvar_domain("mkeventd", config_dir, lambda msg: log_mkeventd('config-change', msg)) + register_configvar_domain("mkeventd", mkeventd_config_dir, lambda msg: log_mkeventd('config-change', msg)) group = _("Event Console") register_configvar(group, diff --git a/web/plugins/wato/mknotifyd.py b/web/plugins/wato/mknotifyd.py index 9ee6dd5..61afbd6 100644 --- a/web/plugins/wato/mknotifyd.py +++ b/web/plugins/wato/mknotifyd.py @@ -32,7 +32,7 @@ except: # Non OMD-users: must enable this explicitely, sorry mknotifyd_enabled = False -config_dir = defaults.default_config_dir + "/mknotifyd.d/wato/" +mknotifyd_config_dir = defaults.default_config_dir + "/mknotifyd.d/wato/" if mknotifyd_enabled: group = _("Notification") @@ -81,7 +81,7 @@ if mknotifyd_enabled: ) # Daemon var - register_configvar_domain("mknotifyd", config_dir) + register_configvar_domain("mknotifyd", mknotifyd_config_dir) register_configvar(group, "notification_deferred_retention_time", Integer(

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0902

by Mathias Kettner

Module: check_mk Branch: master Commit: 40c5f9578e78f30208b5503887ab487a2f227f1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40c5f9578e78f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 18:17:12 2013 +0100 Updated bug entries #0902 --- .bugs/902 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/902 b/.bugs/902 index f57bf87..5570160 100644 --- a/.bugs/902 +++ b/.bugs/902 @@ -1,9 +1,11 @@ Title: execute action but directly delete message afterwards Component: ec -State: open +Class: feature +State: done Date: 2013-01-31 11:13:50 Targetversion: 1.2.2 -Class: feature We need to be able to execute actions but directly delete the event afterwards. + +2013-02-12 18:17:11: changed state open -> done

11 years, 7 months

Check_MK Git: check_mk: FIX: etc/init.d/ mkeventd flush did not work when mkeventd was stopped

by Mathias Kettner

Module: check_mk Branch: master Commit: 339167748c52180a1864f015e05839280a674cda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=339167748c5218… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 17:58:55 2013 +0100 FIX: etc/init.d/mkeventd flush did not work when mkeventd was stopped --- ChangeLog | 1 + mkeventd/omd/mkeventd.init | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 053b4be..d069874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ you need to edit and save each affected rule once in order to make the fix work. * FIX: Fixed exception when logging actions exectuted by mkeventd + * FIX: etc/init.d/mkeventd flush did not work when mkeventd was stopped Multisite: * FIX: Fixed several minor IE7 related layout bugs diff --git a/mkeventd/omd/mkeventd.init b/mkeventd/omd/mkeventd.init index f67259a..6ccc3ce 100755 --- a/mkeventd/omd/mkeventd.init +++ b/mkeventd/omd/mkeventd.init @@ -100,7 +100,7 @@ case "$1" in fi else echo -n "Deleting status and history files..." - rm -f $OMD_ROOT/var/{status,master_config,slave_status,history/*} + rm -f $OMD_ROOT/var/mkeventd/{status,master_config,slave_status,history/*} echo OK exit 0 fi

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0884

by Mathias Kettner

Module: check_mk Branch: master Commit: 0f552d61c75d196440dabb38dda87ac809690a82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f552d61c75d19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 17:54:03 2013 +0100 Updated bug entries #0884 --- .bugs/884 | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.bugs/884 b/.bugs/884 index 5c6591a..eb64060 100644 --- a/.bugs/884 +++ b/.bugs/884 @@ -1,13 +1,10 @@ -Title: Rule editor: selection boxes must not be visible on 'ignore' -Component: wato +Title: EC view recent event history: wrong sorting +Component: ec +State: open +Date: 2013-02-12 17:53:17 +Targetversion: 1.2.3 Class: bug -State: done -Date: 2013-01-14 09:06:06 -Targetversion: 1.2.2 -In the rule editor in the host tag section when the first selection -box is "ignore", then the second should be hidden, but is visible -when entering the dialog. - -2013-01-17 09:40:58: changed state open -> done -has just been fixed. +This might be a bug in Multisite: The sorting is after time and +for equal time after the line in the logfile. The latter sorting +is ignored - however.

11 years, 7 months

Check_MK Git: check_mk: EC: New rule feature: automatically delete after action

by Mathias Kettner

Module: check_mk Branch: master Commit: a23fffdb9d2c37bf04f195cf74e72d831b096e62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a23fffdb9d2c37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 18:13:06 2013 +0100 EC: New rule feature: automatically delete after action --- ChangeLog | 2 ++ mkeventd/bin/mkeventd | 26 ++++++++++++++++++++++++++ mkeventd/web/plugins/views/mkeventd.py | 3 +++ mkeventd/web/plugins/wato/mkeventd.py | 10 ++++++++-- 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d069874..df3d559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.3i1: + Event Console: + * New rule feature: automatically delete after action 1.2.2b2: BI: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 6e3acfe..567eaba 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -961,6 +961,10 @@ class EventServer: log_event_history(event, "DELAYOVER") if rule: do_rule_actions(rule, event) + if rule.get("autodelete"): + events_to_delete.append(nr) + log_event_history(event, "AUTODELETE") + else: log("Cannot do rule action: rule %s not present anymore." % event["rule_id"]) @@ -1095,6 +1099,10 @@ class EventServer: g_event_status.new_event(event) log_event_history(event, "COUNTFAILED") do_rule_actions(rule, event) + if rule.get("autodelete"): + log_event_history(event, "AUTODELETE") + g_event_status.remove_event(event) + # Precompile regular expressions and similar stuff @@ -1270,8 +1278,15 @@ class EventServer: existing_event["phase"] = "delayed" else: do_rule_actions(rule, existing_event) + log_event_history(existing_event, "COUNTREACHED") + if "delay" not in rule and rule.get("autodelete"): + log_event_history(existing_event, "AUTODELETE") + with lock_eventstatus: + g_event_status.remove_event(existing_event) + + elif "expect" in rule: g_event_status.count_expected_event(event) @@ -1287,6 +1302,10 @@ class EventServer: g_event_status.new_event(event) if event["phase"] == "open": do_rule_actions(rule, event) + if rule.get("autodelete"): + log_event_history(event, "AUTODELETE") + with lock_eventstatus: + g_event_status.remove_event(event) return # Checks if an event matches a rule. Returns either False (no match) @@ -2115,6 +2134,13 @@ class EventStatus(): self._events.append(event) log_event_history(event, "NEW") + def remove_event(self, event): + try: + self._events.remove(event); + except Exception, e: + log("Cannot remove event %d: not present" % event["id"]) + + # Cancel all events the belong to a certain rule id and are # of the same "breed" as a new event. def cancel_events(self, new_event, match_groups, rule_id): diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 0343b62..7dfcad5 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -1015,6 +1015,7 @@ if mkeventd_enabled: ], 'sorters': [ ('history_time', False), + ('history_line', True), ], }) @@ -1088,6 +1089,7 @@ if mkeventd_enabled: ], 'sorters': [ ('history_time', False), + ('history_line', True), ], }) @@ -1141,5 +1143,6 @@ if mkeventd_enabled: ], 'sorters': [ ('history_time', False), + ('history_line', True), ], }) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 923a34e..96308fe 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -234,7 +234,7 @@ vs_mkeventd_rule = Dictionary( Checkbox( title = _("Drop Message"), help = _("With this option all messages matching this rule will be silently dropped."), - label = _("Silently drop messages, do no actions"), + label = _("Silently drop message, do no actions"), ) ), ( "state", @@ -257,6 +257,12 @@ vs_mkeventd_rule = Dictionary( choices = mkeventd.action_choices, ) ), + ( "autodelete", + Checkbox( + title = _("Automatic Deletion"), + label = _("Delete event immediately after the actions"), + ) + ), ( "count", Dictionary( title = _("Count messages in defined interval"), @@ -613,7 +619,7 @@ vs_mkeventd_rule = Dictionary( ( _("General Properties"), [ "id", "description", "disabled" ] ), ( _("Matching Criteria"), [ "match", "match_host", "match_application", "match_priority", "match_facility", "match_sl", "match_ok", "cancel_priority" ]), - ( _("Outcome & Action"), [ "state", "sl", "actions", "drop" ]), + ( _("Outcome & Action"), [ "state", "sl", "actions", "drop", "autodelete" ]), ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), ( _("Rewriting"), [ "set_text", "set_host", "set_application", "set_comment", "set_contact" ]), ],

11 years, 7 months

Check_MK Git: check_mk: EC: fixed typo in rule editor

by Mathias Kettner

Module: check_mk Branch: master Commit: 4a0f26d343c4d6ed1fb4d5b43aabba190f4e6c83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a0f26d343c4d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 17:16:40 2013 +0100 EC: fixed typo in rule editor --- mkeventd/web/plugins/wato/mkeventd.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index a622e7d..923a34e 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -456,8 +456,8 @@ vs_mkeventd_rule = Dictionary( Age(), ListChoice( choices = [ - ( "open", _("Expire events that are in state open") ), - ( "ack", _("Expire events thar are in state acknowledged") ), + ( "open", _("Expire events that are in the state open") ), + ( "ack", _("Expire events that are in the state acknowledged") ), ], default_value = [ "open" ], )

11 years, 7 months

Check_MK Git: check_mk: FIX: fix exception in BI-Boxes views of host groups

by Mathias Kettner

Module: check_mk Branch: master Commit: 923dc764b96773b610b1197f8cbf7c23999c0571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=923dc764b96773… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 22:10:37 2013 +0100 FIX: fix exception in BI-Boxes views of host groups --- ChangeLog | 4 ++++ web/plugins/views/bi.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77cc286..f7d89d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.2.2b2: + BI: + * FIX: fix exception in BI-Boxes views of host groups + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 00773f7..49ae780 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -262,7 +262,8 @@ multisite_painters["aggr_treestate_boxed"] = { "title" : _("Aggregation: simplistic boxed layout"), "short" : _("Tree"), "columns" : [ "aggr_treestate", "aggr_hosts" ], - "paint" : lambda row: paint_aggr_tree_foldable(row, boxes = True, omit_root = True), + "paint" : lambda row: bi.render_tree_foldable(row, boxes=True, omit_root=True, + expansion_level=bi.load_ex_level(), only_problems=False, lazy=True), } # _____ _ _ _

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed exception when logging actions exectuted by mkeventd

by Lars Michelsen

Module: check_mk Branch: master Commit: 288e6adb5e01781c004c81ffdfc2f30f0c0a361a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=288e6adb5e0178… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 12:08:21 2013 +0100 FIX: Fixed exception when logging actions exectuted by mkeventd --- ChangeLog | 3 +++ mkeventd/bin/mkeventd | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7d89d1..332ae45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ BI: * FIX: fix exception in BI-Boxes views of host groups + Event Console: + * FIX: Fixed exception when logging actions exectuted by mkeventd + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index fa58bff..3c6fcd6 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2296,7 +2296,7 @@ def do_rule_action(action, event, user=""): log_event_history(event, "EMAIL", user, "%s|%s" % (to, subject)) elif action_type == 'script': execute_script(substitute_event_tags(settings["script"], event)) - log_event_history(event, "SCRIPT", user, action) + log_event_history(event, "SCRIPT", user, action['id']) else: log("Cannot execute action %s: invalid action type %s" % (action["id"], action_type)) except Exception, e:

11 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013