Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Merge branch '1.2.2'

by Mathias Kettner

Module: check_mk Branch: master Commit: 2efdb0ac01a889157c08ca6a8868ac3c38f2387e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2efdb0ac01a889… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 07:23:20 2013 +0100 Merge branch '1.2.2' ---

11 years, 7 months

Check_MK Git: check_mk: Command form: make enter submit the correct action

by Mathias Kettner

Module: check_mk Branch: master Commit: 01c34fa7ec2a2aead66d96459f956b38fa5a3ab4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01c34fa7ec2a2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 07:20:40 2013 +0100 Command form: make enter submit the correct action --- web/htdocs/htmllib.py | 45 +++++++++++++++------------------------- web/htdocs/js/checkmk.js | 10 +++++++- web/htdocs/views.py | 1 - web/plugins/views/commands.py | 12 +++++----- 4 files changed, 31 insertions(+), 37 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a039672..b5a7a25 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -503,8 +503,8 @@ class html: self.write(r'''onmouseover='this.style.backgroundImage="url(\"images/contextlink%s_hi.png\")";' ''' % what) self.write(r'''onmouseout='this.style.backgroundImage="url(\"images/contextlink%s.png\")";' ''' % what) - def number_input(self, varname, deflt = "", size=8, style=""): - self.text_input(varname, str(deflt), "number", size=size, style=style) + def number_input(self, varname, deflt = "", size=8, style="", submit=None): + self.text_input(varname, str(deflt), "number", size=size, style=style, submit=submit) # Needed if input elements are put into forms without the helper @@ -533,11 +533,12 @@ class html: elif add_style: addprops += " style=\"%s\"" % add_style - if submit: - addprops += " id='hirn' " - self.final_javascript('document.getElementById("hirn").onkeydown = ' - 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' % submit) - + if submit != None: + if not id: + id = "ti_%s" % varname + self.final_javascript('document.getElementById("%s").onkeydown = ' + 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' + % (id, submit)) value = self.req.vars.get(varname, default_value) error = self.user_errors.get(varname) @@ -707,7 +708,7 @@ class html: # Form filled in but variable missing -> Checkbox not checked return False - def datetime_input(self, varname, default_value): + def datetime_input(self, varname, default_value, submit=None): try: t = self.get_datetime_input(varname) except: @@ -719,31 +720,19 @@ class html: self.set_focus(varname + "_date") br = time.localtime(t) - self.date_input(varname + "_date", br.tm_year, br.tm_mon, br.tm_mday) + self.date_input(varname + "_date", br.tm_year, br.tm_mon, br.tm_mday, submit=submit) self.write(" ") - self.time_input(varname + "_time", br.tm_hour, br.tm_min) + self.time_input(varname + "_time", br.tm_hour, br.tm_min, submit=submit) self.form_vars.append(varname + "_date") self.form_vars.append(varname + "_time") - def time_input(self, varname, hours, mins): - error = self.user_errors.get(varname) - if error: - self.write("<x class=inputerror>") - self.write("<input type=text size=5 class=time name=%s value=\"%02d:%02d\">" % - (varname, hours, mins)) - if error: - self.write("</x>") - self.form_vars.append(varname) + def time_input(self, varname, hours, mins, submit=None): + self.text_input(varname, "%02d:%02d" % (hours, mins), cssclass="time", size=5, + submit=submit) - def date_input(self, varname, year, month, day): - error = self.user_errors.get(varname) - if error: - self.write("<x class=inputerror>") - self.write("<input type=text size=10 class=date name=%s value=\"%04d-%02d-%02d\">" % - (varname, year, month, day)) - if error: - self.write("</x>") - self.form_vars.append(varname) + def date_input(self, varname, year, month, day, submit=None): + self.text_input(varname, "%04d-%02d-%02d" % (year, month, day), + cssclass="date", size=11, submit=submit) def get_datetime_input(self, varname): t = self.var(varname + "_time") diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 983adf2..6ce666b 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -103,7 +103,7 @@ if (!document.getElementsByClassName) { } } return _nodeList; -} + } } function getTarget(event) { @@ -514,9 +514,15 @@ function pnp_hover_contents(url) { function textinput_enter_submit(e, submit) { var keyCode = e.which || e.keyCode; if (keyCode == 13) { - /* alert(submit); */ + if (submit) { + var button = document.getElementById(submit); + if (button) + button.click(); + } + if (e.preventDefault) e.preventDefault(); e.returnValue = false; e.cancelBubble = true; + return false; } } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 08706ea..2f7e169 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2065,7 +2065,6 @@ def show_command_form(is_open, datasource): html.hidden_field("_do_actions", "yes") html.hidden_field("actions", "yes") html.hidden_fields() # set all current variables, exception action vars - # html.write('<table class="form">') # Show command forms, grouped by (optional) command group by_group = {} diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index d526a9b..3155329 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -212,7 +212,7 @@ multisite_commands.append({ "title" : _("Custom notification"), "render" : lambda: \ html.write(_('Comment') + ": ") == \ - html.text_input("_cusnot_comment", "TEST", size=20) == \ + html.text_input("_cusnot_comment", "TEST", size=20, submit="_customnotification") == \ html.write("   ") == \ html.checkbox("_cusnot_forced", False, label=_("forced")) == \ html.checkbox("_cusnot_broadcast", False, label=_("broadcast")) == \ @@ -287,7 +287,7 @@ multisite_commands.append({ "title" : _("Add comment"), "render" : lambda: \ html.write(_('Comment')+": ") == \ - html.text_input("_comment", size=33) == \ + html.text_input("_comment", size=33, submit="_add_comment") == \ html.write("   ") == \ html.button("_add_comment", _("Add comment")), "action" : command_comment, @@ -415,7 +415,7 @@ def get_child_hosts(site, hosts, recurse): def paint_downtime_buttons(what): html.write(_('Downtime Comment')+": ") - html.text_input("_down_comment", size=40) + html.text_input("_down_comment", size=40, submit="") html.write("<hr>") html.button("_down_2h", _("2 hours")) html.button("_down_today", _("Today")) @@ -426,13 +426,13 @@ def paint_downtime_buttons(what): html.button("_down_remove", _("Remove all")) html.write("<hr>") html.button("_down_custom", _("Custom time range")) - html.datetime_input("_down_from", time.time()) + html.datetime_input("_down_from", time.time(), submit="_down_custom") html.write("  "+_('to')+"  ") - html.datetime_input("_down_to", time.time() + 7200) + html.datetime_input("_down_to", time.time() + 7200, submit="_down_custom") html.write("<hr>") html.button("_down_from_now", _("From now for")) html.write(" ") - html.number_input("_down_minutes", 60, size=4, style="text-align: right") + html.number_input("_down_minutes", 60, size=4, submit="_down_from_now") html.write("  " + _("minutes")) html.write("<hr>") html.checkbox("_down_flexible", False, label=_('flexible with max. duration')+" ")

11 years, 7 months

Check_MK Git: check_mk: Intermediate state for improvement of commands form

by Mathias Kettner

Module: check_mk Branch: master Commit: 18afa4ddfb641c356118a456889c7dbe001e5210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18afa4ddfb641c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 06:21:33 2013 +0100 Intermediate state for improvement of commands form --- web/htdocs/htmllib.py | 8 +++++++- web/htdocs/js/checkmk.js | 13 +++++++++++++ web/plugins/views/commands.py | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index da03f6d..a039672 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -512,7 +512,7 @@ class html: def add_form_var(self, varname): self.form_vars.append(varname) - def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, **args): + def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, submit = None, **args): if default_value == None: default_value = "" addprops = "" @@ -533,6 +533,12 @@ class html: elif add_style: addprops += " style=\"%s\"" % add_style + if submit: + addprops += " id='hirn' " + self.final_javascript('document.getElementById("hirn").onkeydown = ' + 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' % submit) + + value = self.req.vars.get(varname, default_value) error = self.user_errors.get(varname) html = "" diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 81e0f92..983adf2 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -509,6 +509,19 @@ function pnp_hover_contents(url) { } // ---------------------------------------------------------------------------- +// Handle Enter key in textfields +// ---------------------------------------------------------------------------- +function textinput_enter_submit(e, submit) { + var keyCode = e.which || e.keyCode; + if (keyCode == 13) { + /* alert(submit); */ + e.returnValue = false; + e.cancelBubble = true; + } +} + + +// ---------------------------------------------------------------------------- // Synchronous action handling // ---------------------------------------------------------------------------- // Protocol is: diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index ee2930e..d526a9b 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -259,7 +259,7 @@ multisite_commands.append({ html.checkbox("_ack_persistent", False, label=_('persistent comment')) == \ html.write("<hr>") == \ html.write(_("Comment") + ": ") == \ - html.text_input("_ack_comment", size=48), + html.text_input("_ack_comment", size=48, submit="_acknowledge"), "action" : command_acknowledgement, "group" : _("Acknowledge"), })

11 years, 7 months

Check_MK Git: check_mk: Command form: make enter submit the correct action

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fbbeff9c97f9cadb2580c53e18b6277e7b2e5b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fbbeff9c97f9c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 07:20:40 2013 +0100 Command form: make enter submit the correct action --- web/htdocs/htmllib.py | 45 +++++++++++++++------------------------- web/htdocs/js/checkmk.js | 10 +++++++- web/htdocs/views.py | 1 - web/plugins/views/commands.py | 12 +++++----- 4 files changed, 31 insertions(+), 37 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a039672..b5a7a25 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -503,8 +503,8 @@ class html: self.write(r'''onmouseover='this.style.backgroundImage="url(\"images/contextlink%s_hi.png\")";' ''' % what) self.write(r'''onmouseout='this.style.backgroundImage="url(\"images/contextlink%s.png\")";' ''' % what) - def number_input(self, varname, deflt = "", size=8, style=""): - self.text_input(varname, str(deflt), "number", size=size, style=style) + def number_input(self, varname, deflt = "", size=8, style="", submit=None): + self.text_input(varname, str(deflt), "number", size=size, style=style, submit=submit) # Needed if input elements are put into forms without the helper @@ -533,11 +533,12 @@ class html: elif add_style: addprops += " style=\"%s\"" % add_style - if submit: - addprops += " id='hirn' " - self.final_javascript('document.getElementById("hirn").onkeydown = ' - 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' % submit) - + if submit != None: + if not id: + id = "ti_%s" % varname + self.final_javascript('document.getElementById("%s").onkeydown = ' + 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' + % (id, submit)) value = self.req.vars.get(varname, default_value) error = self.user_errors.get(varname) @@ -707,7 +708,7 @@ class html: # Form filled in but variable missing -> Checkbox not checked return False - def datetime_input(self, varname, default_value): + def datetime_input(self, varname, default_value, submit=None): try: t = self.get_datetime_input(varname) except: @@ -719,31 +720,19 @@ class html: self.set_focus(varname + "_date") br = time.localtime(t) - self.date_input(varname + "_date", br.tm_year, br.tm_mon, br.tm_mday) + self.date_input(varname + "_date", br.tm_year, br.tm_mon, br.tm_mday, submit=submit) self.write(" ") - self.time_input(varname + "_time", br.tm_hour, br.tm_min) + self.time_input(varname + "_time", br.tm_hour, br.tm_min, submit=submit) self.form_vars.append(varname + "_date") self.form_vars.append(varname + "_time") - def time_input(self, varname, hours, mins): - error = self.user_errors.get(varname) - if error: - self.write("<x class=inputerror>") - self.write("<input type=text size=5 class=time name=%s value=\"%02d:%02d\">" % - (varname, hours, mins)) - if error: - self.write("</x>") - self.form_vars.append(varname) + def time_input(self, varname, hours, mins, submit=None): + self.text_input(varname, "%02d:%02d" % (hours, mins), cssclass="time", size=5, + submit=submit) - def date_input(self, varname, year, month, day): - error = self.user_errors.get(varname) - if error: - self.write("<x class=inputerror>") - self.write("<input type=text size=10 class=date name=%s value=\"%04d-%02d-%02d\">" % - (varname, year, month, day)) - if error: - self.write("</x>") - self.form_vars.append(varname) + def date_input(self, varname, year, month, day, submit=None): + self.text_input(varname, "%04d-%02d-%02d" % (year, month, day), + cssclass="date", size=11, submit=submit) def get_datetime_input(self, varname): t = self.var(varname + "_time") diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 58ed332..c13ba6a 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -103,7 +103,7 @@ if (!document.getElementsByClassName) { } } return _nodeList; -} + } } function getTarget(event) { @@ -514,9 +514,15 @@ function pnp_hover_contents(url) { function textinput_enter_submit(e, submit) { var keyCode = e.which || e.keyCode; if (keyCode == 13) { - /* alert(submit); */ + if (submit) { + var button = document.getElementById(submit); + if (button) + button.click(); + } + if (e.preventDefault) e.preventDefault(); e.returnValue = false; e.cancelBubble = true; + return false; } } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index a32a96b..58ec06a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2073,7 +2073,6 @@ def show_command_form(is_open, datasource): html.hidden_field("_do_actions", "yes") html.hidden_field("actions", "yes") html.hidden_fields() # set all current variables, exception action vars - # html.write('<table class="form">') # Show command forms, grouped by (optional) command group by_group = {} diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index d526a9b..3155329 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -212,7 +212,7 @@ multisite_commands.append({ "title" : _("Custom notification"), "render" : lambda: \ html.write(_('Comment') + ": ") == \ - html.text_input("_cusnot_comment", "TEST", size=20) == \ + html.text_input("_cusnot_comment", "TEST", size=20, submit="_customnotification") == \ html.write("   ") == \ html.checkbox("_cusnot_forced", False, label=_("forced")) == \ html.checkbox("_cusnot_broadcast", False, label=_("broadcast")) == \ @@ -287,7 +287,7 @@ multisite_commands.append({ "title" : _("Add comment"), "render" : lambda: \ html.write(_('Comment')+": ") == \ - html.text_input("_comment", size=33) == \ + html.text_input("_comment", size=33, submit="_add_comment") == \ html.write("   ") == \ html.button("_add_comment", _("Add comment")), "action" : command_comment, @@ -415,7 +415,7 @@ def get_child_hosts(site, hosts, recurse): def paint_downtime_buttons(what): html.write(_('Downtime Comment')+": ") - html.text_input("_down_comment", size=40) + html.text_input("_down_comment", size=40, submit="") html.write("<hr>") html.button("_down_2h", _("2 hours")) html.button("_down_today", _("Today")) @@ -426,13 +426,13 @@ def paint_downtime_buttons(what): html.button("_down_remove", _("Remove all")) html.write("<hr>") html.button("_down_custom", _("Custom time range")) - html.datetime_input("_down_from", time.time()) + html.datetime_input("_down_from", time.time(), submit="_down_custom") html.write("  "+_('to')+"  ") - html.datetime_input("_down_to", time.time() + 7200) + html.datetime_input("_down_to", time.time() + 7200, submit="_down_custom") html.write("<hr>") html.button("_down_from_now", _("From now for")) html.write(" ") - html.number_input("_down_minutes", 60, size=4, style="text-align: right") + html.number_input("_down_minutes", 60, size=4, submit="_down_from_now") html.write("  " + _("minutes")) html.write("<hr>") html.checkbox("_down_flexible", False, label=_('flexible with max. duration')+" ")

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 04b28259d7b61584c54a4de67692fe1174699a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04b28259d7b615… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 06:21:36 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Intermediate state for improvement of commands form

by Mathias Kettner

Module: check_mk Branch: master Commit: 1ff5f23615b2d0fe61a1c8298fba5e4ae2c728af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ff5f23615b2d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 14 06:21:33 2013 +0100 Intermediate state for improvement of commands form --- web/htdocs/htmllib.py | 8 +++++++- web/htdocs/js/checkmk.js | 13 +++++++++++++ web/plugins/views/commands.py | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index da03f6d..a039672 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -512,7 +512,7 @@ class html: def add_form_var(self, varname): self.form_vars.append(varname) - def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, **args): + def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, submit = None, **args): if default_value == None: default_value = "" addprops = "" @@ -533,6 +533,12 @@ class html: elif add_style: addprops += " style=\"%s\"" % add_style + if submit: + addprops += " id='hirn' " + self.final_javascript('document.getElementById("hirn").onkeydown = ' + 'function(e) { if (!e) e = window.event; textinput_enter_submit(e, "%s"); };' % submit) + + value = self.req.vars.get(varname, default_value) error = self.user_errors.get(varname) html = "" diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 236d898..58ed332 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -509,6 +509,19 @@ function pnp_hover_contents(url) { } // ---------------------------------------------------------------------------- +// Handle Enter key in textfields +// ---------------------------------------------------------------------------- +function textinput_enter_submit(e, submit) { + var keyCode = e.which || e.keyCode; + if (keyCode == 13) { + /* alert(submit); */ + e.returnValue = false; + e.cancelBubble = true; + } +} + + +// ---------------------------------------------------------------------------- // Synchronous action handling // ---------------------------------------------------------------------------- // Protocol is: diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index ee2930e..d526a9b 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -259,7 +259,7 @@ multisite_commands.append({ html.checkbox("_ack_persistent", False, label=_('persistent comment')) == \ html.write("<hr>") == \ html.write(_("Comment") + ": ") == \ - html.text_input("_ack_comment", size=48), + html.text_input("_ack_comment", size=48, submit="_acknowledge"), "action" : command_acknowledgement, "group" : _("Acknowledge"), })

11 years, 7 months

Check_MK Git: check_mk: mkeventd: Fixed replacing of contact information for events

by Lars Michelsen

Module: check_mk Branch: master Commit: 888fb413a68f60ad5a9b5e58b443272f26e42f4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=888fb413a68f60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 18:01:57 2013 +0100 mkeventd: Fixed replacing of contact information for events --- mkeventd/bin/mkeventd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 1caae3c..6d4f314 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1396,7 +1396,7 @@ class EventServer: event["comment"] = replace_groups(rule["set_comment"], event.get("comment", ""), groups) if "set_application" in rule: event["application"] = replace_groups(rule["set_application"], event["application"], groups) - if "set_contact" in rule and "contact" not in event: + if "set_contact" in rule: event["contact"] = replace_groups(rule["set_contact"], event.get("contact", ""), groups) def parse_monitoring_info(self, line):

11 years, 7 months

Check_MK Git: check_mk: Merge branch '1.2.2'

by Lars Michelsen

Module: check_mk Branch: master Commit: c6478c785c63422d16e4751fab2f38cdcda8900a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6478c785c6342… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 18:02:15 2013 +0100 Merge branch '1.2.2' ---

11 years, 7 months

Check_MK Git: check_mk: mkeventd: Better exception tracking during action execution

by Lars Michelsen

Module: check_mk Branch: master Commit: c89885313fed81c339eaaa31211a38f02c1e6e76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c89885313fed81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 16:51:46 2013 +0100 mkeventd: Better exception tracking during action execution --- mkeventd/bin/mkeventd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index a6b7fea..b23ee8b 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2304,10 +2304,10 @@ def do_rule_action(action, event, user=""): 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: + except Exception: if opt_debug: raise - log("Error during execution of action %s: %s" % (action["id"], e)) + log("Error during execution of action %s: %s" % (action["id"], format_exception())) def substitute_event_tags(text, event): groups = [("match_group_%d" % (nr+1), g) for (nr, g) in enumerate(event.get("match_groups", ()))]

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f4651f508038a6a171374ec2e354f1ee36d81cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f4651f508038a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 18:02:18 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
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