Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: FIX: Fixed layout of rulelist table in IE*

by Lars Michelsen

Module: check_mk Branch: master Commit: 00cc108c680e246084260ec6b7fa24f61059d2fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00cc108c680e24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 12:03:23 2013 +0100 FIX: Fixed layout of rulelist table in IE* --- ChangeLog | 3 +++ web/htdocs/wato.py | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ff0700..646c564 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ Multisite: * FIX: Fixed several minor IE7 related layout bugs + WATO: + * FIX: Fixed layout of rulelist table in IE* + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 91d46d3..6e628ae 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9802,8 +9802,6 @@ def mode_edit_ruleset(phase): html.write("<div class=info>" + _("There are no rules defined in this set.") + "</div>") else: - html.write('<table class="data ruleset">') - alread_matched = False match_keys = set([]) # in case if match = "dict" last_folder = None

11 years, 7 months

Check_MK Git: check_mk: Merge branch '1.2.2'

by Lars Michelsen

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

11 years, 7 months

Check_MK Git: check_mk: Again some ie7 wato fixes

by Lars Michelsen

Module: check_mk Branch: master Commit: 3b39bbb2ce3bd53a204e55a03e03754cbd6c1166 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b39bbb2ce3bd5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 13:06:54 2013 +0100 Again some ie7 wato fixes * FIX: Fixed layout of rulelist table in IE* * FIX: Fixed adding explicit host names to rules in IE7 --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 4 ++++ web/htdocs/status.css | 1 - 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 646c564..57a2c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ WATO: * FIX: Fixed layout of rulelist table in IE* + * FIX: Fixed adding explicit host names to rules in IE7 1.2.2b1: Core: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 0d9b91f..81e0f92 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1529,8 +1529,12 @@ function list_of_strings_extend(oInput, j) { oDiv = oDiv.parentNode; var oContainer = oDiv.parentNode; + alert(oDiv.innerHTML); + var oNewDiv = document.createElement("DIV"); oNewDiv.innerHTML = oDiv.innerHTML.replace('"' + oldName + '"', '"' + newName + '"'); + // IE7 does not have quotes in innerHTML, trying to workaround this here. + oNewDiv.innerHTML = oDiv.innerHTML.replace('=' + oldName + ' ', '=' + newName + ' '); oContainer.appendChild(oNewDiv); /* Move focus function from old last to new last input field */ diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 25282da..2be2375 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -281,7 +281,6 @@ td.goodflag { table.data td.buttons { white-space: nowrap; - width: 1px; } table.data td.count {

11 years, 7 months

Check_MK Git: check_mk: opcmsg-script: now really executing opcmsg

by Lars Michelsen

Module: check_mk Branch: master Commit: ee95350a7f32f98507aefa93bef4f7e6f6296464 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee95350a7f32f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 10:45:04 2013 +0100 opcmsg-script: now really executing opcmsg --- doc/treasures/opcmsg | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/doc/treasures/opcmsg b/doc/treasures/opcmsg index cc2bd39..0c8cd21 100755 --- a/doc/treasures/opcmsg +++ b/doc/treasures/opcmsg @@ -61,8 +61,7 @@ def main(): # Execute the command print "executing command" , command - file("/tmp/opc","w").write(command) - # return os.system(command) + os.system(command) except Exception, e: sys.stdout.write("ERROR %r" % e) sys.exit(1)

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: 5721873e1ae0d7eccc267a110399b98bca750d60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5721873e1ae0d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 11:38:31 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: Not enforcing notification method during forwarding - the master site chooses the notification method

by Lars Michelsen

Module: check_mk Branch: master Commit: fb83c80697043f492bc031e25ff8f1fcc6f3b5bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb83c80697043f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 13 11:38:23 2013 +0100 mknotifyd: Not enforcing notification method during forwarding - the master site chooses the notification method --- modules/notify.py | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index cb52b67..19512fb 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -224,11 +224,7 @@ def handle_spoolfile(spoolfile): data = eval(file(spoolfile).read()) if not "context" in data.keys(): return 2 - # if data["plugin"] == None: - # plugin = 'email' - # else: - # plugin = data['plugin'] - return process_context(data["context"], False, data.get("plugin", "email")) + return process_context(data["context"], False) except Exception, e: notify_log("ERROR %s\n%s" % (e, format_exception())) return 2

11 years, 7 months

Check_MK Git: check_mk: Remove debug output from Mini WATO Snapin

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d13d1cbef4d4ff2ae782b37a11d60f12c1602bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d13d1cbef4d4f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 13 11:17:40 2013 +0100 Remove debug output from Mini WATO Snapin --- web/plugins/sidebar/wato.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 8c90ffc..22550fd 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -54,8 +54,6 @@ def render_wato(mini): html.icon_button(url, title, icon, target="main") else: iconlink(title, url, icon) - else: - html.debug("HIRN") num_pending = wato.api.num_pending_changes() if num_pending:

11 years, 7 months

Check_MK Git: check_mk: Cleanup form for executing commands on hosts/ services

by Mathias Kettner

Module: check_mk Branch: master Commit: 34af0447eabcaeb3de3a71a3c43950502af9026b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34af0447eabcae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 13 11:15:20 2013 +0100 Cleanup form for executing commands on hosts/services --- ChangeLog | 1 + web/htdocs/views.py | 17 ++++++++++------- web/plugins/views/commands.py | 3 +++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ff0700..8319deb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Multisite: * FIX: Fixed several minor IE7 related layout bugs + * Cleanup form for executing commands on hosts/services 1.2.2b1: Core: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 9318519..08706ea 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2066,19 +2066,22 @@ def show_command_form(is_open, datasource): html.hidden_field("actions", "yes") html.hidden_fields() # set all current variables, exception action vars # html.write('<table class="form">') - forms.header(_("Commands"), narrow=True) - # Commands are defined in plugins/views/commands.py. Iterate - # over all command definitions and render HTML input fields. + # Show command forms, grouped by (optional) command group + by_group = {} for command in multisite_commands: if what in command["tables"] and config.may(command["permission"]): + group = command.get("group", _("Various Commands")) + by_group.setdefault(group, []).append(command) + + groups = by_group.keys() + groups.sort() + for group in groups: + forms.header(group, narrow=True) + for command in by_group[group]: forms.section(command["title"]) - # html.write('<tr><td class=legend>%s</td>\n' % command["title"]) - # html.write('<td class=content>') command["render"]() - # html.write('</td></tr>') - # html.write("</table>") forms.end() html.end_form() html.write("</div>") diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 9aa164d..ee2930e 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -261,6 +261,7 @@ multisite_commands.append({ html.write(_("Comment") + ": ") == \ html.text_input("_ack_comment", size=48), "action" : command_acknowledgement, + "group" : _("Acknowledge"), }) @@ -450,6 +451,7 @@ multisite_commands.append({ "title" : _("Schedule downtimes"), "render" : lambda: paint_downtime_buttons("host"), "action" : command_downtime, + "group" : _("Downtimes"), }) multisite_commands.append({ @@ -458,6 +460,7 @@ multisite_commands.append({ "title" : _("Schedule downtimes"), "render" : lambda: paint_downtime_buttons("service"), "action" : command_downtime, + "group" : _("Downtimes"), }) # REMOVE DOWNTIMES (table downtimes)

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 45685688c1439d8646084188fcd08d6a445d72f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45685688c1439d… 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 <i>open</i>") ), - ( "ack", _("Expire events thar are in state <i>acknowledged</i>") ), + ( "open", _("Expire events that are in the state <i>open</i>") ), + ( "ack", _("Expire events that are in the state <i>acknowledged</i>") ), ], default_value = [ "open" ], )

11 years, 7 months

Check_MK Git: check_mk: Merge branch '1.2.2'

by Mathias Kettner

Module: check_mk Branch: master Commit: fc144ff54c60b12a56e1c8378526af814dcfa66b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc144ff54c60b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 13 11:16:10 2013 +0100 Merge branch '1.2.2' ---

11 years, 7 months

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