Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 discussions

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: ab762f296d5c9db1b45b7d0e566f83df4b484d4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab762f296d5c9d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 13 18:17:29 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 3 months

Check_MK Git: check_mk: Updated compile helper

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a7e531bad1b0b8c2c639490062ff8ff783b2784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a7e531bad1b0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 8 20:18:35 2011 +0200 Updated compile helper --- web/.f12 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/.f12 b/web/.f12 index 33fdab4..4c54e0f 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,3 +1,4 @@ #!/bin/bash C=$(sudo cp -rv * /omd/versions/default/share/check_mk/web/ | wc -l) echo "$C files copied" +sudo omd restart dk apache

13 years, 3 months

Check_MK Git: check_mk: WATO: improve layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82f9355674892487dc5321ee863ca20b33f8a809 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82f93556748924… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 8 20:54:59 2011 +0200 WATO: improve layout --- web/htdocs/check_mk.css | 35 +++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 26 +++++++++++++------------- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index c8be9b8..347969b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1721,6 +1721,41 @@ table.add_snapin i { .wato div.inherited h3 a { color: #468; } + +/* Path to current folder at top of screen */ +.wato div.folderpath { + margin-bottom: 6px; +} +.wato div.folderpath a, +.wato div.folderpath b { + -moz-border-radius: 3px; + background-color: #eee; + padding: 1px 5px; + color: #468; +} +.wato div.folderpath a { +/* color: #46c; */ + font-weight: bold; + text-decoration: none; +} +.wato div.folderpath a:hover { + color: black; + background-color: #fff; + /* text-decoration: underline; */ +} + +/* Information boxes displayed directly in the data area */ +.wato div.info { + margin-top: 10px; + marign-bottom: 10px; + padding: 5px 8px; + width: 800px; + -moz-border-radius: 3px; + background-image: url("images/form_background.png"); + background-repeat: repeat; +} + + /* ____ | _ \ _ __ ___ __ _ _ __ ___ ___ ___ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 93587f1..3f27d41 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -196,6 +196,7 @@ def mode_folder(phase): raise MKGeneralException(_("You called this page with a non-existing folder/file %s") % delname) else: + render_folder_path() show_filefolder_list(g_folder, "folder", _("Subfolders")) show_filefolder_list(g_folder, "file", _("Host lists")) @@ -563,10 +564,10 @@ def mode_file(phase): return "bulkcleanup" elif len(g_hosts) == 0: - html.write(_("There are no hosts in this file.")) + render_folder_path() + html.write("<div class=info>" + _("There are no hosts in this file.") + "</div>") else: - html.write(_("Hosts in file ")) render_folder_path() html.write("<p>") @@ -758,7 +759,7 @@ def mode_edithost(phase, new): html.write('<table class="form">\n') # host name - html.write("<tr><td class=legend>" + _("Hostname") + "</td><td class=content></td><td class=content>") + html.write("<tr><td class=legend colspan=2>" + _("Hostname") + "</td><td class=content>") if hostname and mode == "edit": html.write(hostname) else: @@ -772,7 +773,7 @@ def mode_edithost(phase, new): html.button("save", _("Save & Finish"), "submit") if not new: html.button("delete", _("Delete host!"), "submit") - html.button("services", _("Save & got to Services"), "submit") + html.button("services", _("Save & go to Services"), "submit") html.write("</td></tr>\n") html.write("</table>\n") html.hidden_fields() @@ -853,7 +854,7 @@ def mode_search(phase): html.write("<table class=form>") # host name - html.write("<tr><td class=legend>" + _("Hostname") + "</td><td class=content></td><td class=content>") + html.write("<tr><td class=legend colspan=2>" + _("Hostname") + "</td><td class=content>") html.text_input("host") html.set_focus("host") html.write("</td></tr>\n") @@ -931,10 +932,7 @@ def search_hosts_in_file(the_folder, the_file, crit): found.append((hostname, host, effective)) if found: - render_folder_path(the_folder, 0, True) - file_url = make_link_to([("mode", "file")], the_folder[".path"], the_file[".name"]) - html.write(' / <a href="%s">%s</a>' % (file_url, the_file["title"])) - html.write(":") + render_folder_path(the_folder, the_file, True) found.sort() html.write("<table class=data><tr><th>%s</th>" % (_("Hostname"), )) for attr in host_attributes: @@ -2132,12 +2130,14 @@ def move_host_to(hostname, target_filename): move_hosts_to([hostname], target_filename) def render_folder_path(the_folder = 0, the_file = 0, link_to_last = False): + if the_folder == 0: the_folder = g_folder the_file = g_file def render_component(p, title): - return '<a href="%s">%s</a>' % (make_link_to([], path), title) + return '<a href="%s">%s</a>' % ( + html.makeuri_contextless([("filename", "/" + "/".join(p))]), title) path = () comps = [] @@ -2153,12 +2153,12 @@ def render_folder_path(the_folder = 0, the_file = 0, link_to_last = False): if link_to_last: comps.append(render_component(the_file[".path"], the_file["title"])) else: - comps.append(the_file["title"]) + comps.append("<b>" + the_file["title"] + "</b>") if not the_file and not link_to_last: - comps.append(the_folder["title"]) + comps.append("<b>" + the_folder["title"] + "</b>") - html.write(" / ".join(comps)) + html.write("<div class=folderpath>%s</div>\n" % " / ".join(comps)) # +----------------------------------------------------------------------+ # | ____ |

13 years, 3 months

Check_MK Git: check_mk: WATO: cleanup of IPAddressAttribute

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0674e2db0e72bc0b1799abdc3d59b0fe73f9499 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0674e2db0e72b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 8 21:08:55 2011 +0200 WATO: cleanup of IPAddressAttribute --- web/htdocs/wato.py | 10 ++++------ web/plugins/wato/builtin_attributes.py | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3f27d41..ad4dcd7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2329,8 +2329,9 @@ class TextAttribute(Attribute): class IPAddressAttribute(TextAttribute): - def __init__(self, name, title, help = None): - TextAttribute.__init__(self, name, title, help, "", mandatory = True) + def __init__(self, name, title, help = None, mandatory = False, dnslookup = False): + TextAttribute.__init__(self, name, title, help, "", mandatory = mandatory) + self._dnslookup = dnslookup def render_input(self, value): if value == None: @@ -2354,9 +2355,6 @@ class IPAddressAttribute(TextAttribute): tdclass = 'dnserror' return ip, tdclass, text - def is_mandatory(self): - return True # empty value allowed, but missing not - def paint(self, value, hostname): if value == None: ip, tdclass, text = self.do_dns(hostname) @@ -2366,7 +2364,7 @@ class IPAddressAttribute(TextAttribute): def validate_input(self): value = self.from_html_vars() - if not value: # empty -> use DNS + if not value and self._dnslookup: # empty -> use DNS hostname = html.var("host") ip, text, tdclass = self.do_dns(hostname) if not ip: diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 88b5856..5c6945f 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -31,6 +31,7 @@ declare_host_attribute(TextAttribute("alias", _("Alias"), declare_host_attribute(IPAddressAttribute("ipaddress", _("IP Address"), _("IP Address of the host. Leave emtpy to use automatic " "hostname lookup. Enter a hostname to use dynamic resoluting " - "during the actual monitoring.")), True, False) + "during the actual monitoring."), mandatory=True, dnslookup=True), + show_in_table=True, show_in_folder=True)

13 years, 3 months

Check_MK Git: check_mk: WATO: some layout improvements

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0c4490fb1b023ce5425c3e48487d72e370fb0c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c4490fb1b023c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 8 22:37:26 2011 +0200 WATO: some layout improvements --- web/htdocs/check_mk.css | 45 +++++++++++++++++---- web/htdocs/htmllib.py | 7 +++- web/htdocs/wato.py | 104 +++++++++++++++++++++++++++------------------- 3 files changed, 104 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0c4490fb1b…

13 years, 3 months

Check_MK Git: check_mk: Merge branch 'newwato'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4cdc16bcf144709566bd42ab02489205df84759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4cdc16bcf1447… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 13 14:02:33 2011 +0200 Merge branch 'newwato' ---

13 years, 3 months

Check_MK Git: check_mk: Dashboards: intermediate state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3b94e9ce308b28a7982fa1336684ff52543212ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b94e9ce308b28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 13 18:16:55 2011 +0200 Dashboards: intermediate state --- web/htdocs/dashboard.py | 289 ++++++++++++++++++++++++++++++++++++++ web/htdocs/js/dashboard.js | 80 +++++++++++ web/plugins/dashboard/builtin.py | 43 ++++++ 3 files changed, 412 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3b94e9ce30…

13 years, 3 months

Check_MK Git: check_mk: WATO: lock removing mandatory attributes from folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5f2a6a261d79b352df26da9ae77bcf615347470b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f2a6a261d79b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 19:12:16 2011 +0200 WATO: lock removing mandatory attributes from folders --- web/htdocs/wato.py | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c1330f..800f8cc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -437,7 +437,7 @@ def mode_editfolder(phase, what, new): attributes = the_thing.get("attributes", {}) parent = g_folder.get(".parent") - configure_attributes({what: attributes}, "folder", parent) + configure_attributes({what: attributes}, "folder", parent, g_folder) html.write('<tr><td colspan=3 class="buttons">') html.button("save", _("Save & Finish"), "submit") @@ -2505,7 +2505,9 @@ def have_folder_attributes(): # "folder" -> properies of folder or file # "search" -> search dialog # "bulk" -> bulk change -def configure_attributes(hosts, for_what, parent): +# parent: The parent file/folder of the objects to configure +# myself: For mode "folder" the folder/file itself +def configure_attributes(hosts, for_what, parent, myself=None): # html.write("<pre>%s</pre>" % pprint.pformat(hosts)) for attr in host_attributes: @@ -2570,14 +2572,19 @@ def configure_attributes(hosts, for_what, parent): # Checkbox for activating this attribute - # Determine current state of visibility: If the form has already - # been submitted (i.e. search or input error), then we take the - # previous state of the box. In search mode we make those boxes - # active that have an empty string as default value (simple - # text boxed). In bulk mode we make those attributes active that - # have an explicitely set value over all hosts. - # In host and folder mode we make those - # attributes active that are currently set. + # Determine current state of visibility: If the form has already been submitted (i.e. search + # or input error), then we take the previous state of the box. In search mode we make those + # boxes active that have an empty string as default value (simple text boxed). In bulk + # mode we make those attributes active that have an explicitely set value over all hosts. + # In host and folder mode we make those attributes active that are currently set. + + # Also determine, if the attribute can be switched off at all. Problematic here are + # mandatory attributes. We must make sure, that at least one folder/file/host in the + # chain defines an explicit value for that attribute. If we show a host and no folder/file + # inherits an attribute to that host, the checkbox will be always active and locked. + # The same is the case if we show a file/folder and at least one host below this + # has not set that attribute. In case of bulk edit we never lock: During bulk edit no + # attribute ca be removed anyway. checkbox_name = "_change_%s" % attrname cb = html.get_checkbox(checkbox_name) @@ -2590,6 +2597,8 @@ def configure_attributes(hosts, for_what, parent): active = unique and len(values) > 0 elif for_what == "folder": active = attrname in host + if attr.is_mandatory() and some_host_hasnt_set(myself, attrname): + force_entry = True else: # "host" if attr.is_mandatory() and not has_inherited: force_entry = True @@ -2649,6 +2658,21 @@ def configure_attributes(hosts, for_what, parent): html.write("</td></tr>\n") +def some_host_hasnt_set(container, attrname): + if ".folders" in container: # we are a folder: + for folder in container[".folders"].values(): + if some_host_hasnt_set(folder, attrname): + return True + for afile in container[".files"].values(): + if some_host_hasnt_set(afile, attrname): + return True + else: # we are a host list + hosts = read_configuration_file(container[".parent"], container) + for host in hosts: + if attrname not in host: + return True + return False + # Compute effective (explicit and inherited) attributes # for a host. This returns a dictionary with a value for # each host attribute

13 years, 3 months

Check_MK Git: check_mk: WATO: lock mandatory attributes in folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6db2eb6c587646f7328a460557974f02e87ac6dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6db2eb6c587646… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 20:29:17 2011 +0200 WATO: lock mandatory attributes in folders --- web/htdocs/wato.py | 60 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 22 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 800f8cc..7152cfa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -312,9 +312,10 @@ def mode_editfolder(phase, what, new): target_folder = find_folder(g_folder[".path"][:-1]) else: target_folder = g_folder - html.context_button(_("Abort"), make_link([("mode", "folder")])) if what == "file" and not new: - html.context_button(_("Hosts"), make_link([("mode", "file")])) + html.context_button(_("Abort"), make_link([("mode", "file")])) + else: + html.context_button(_("Abort"), make_link([("mode", "folder")])) elif phase == "action": @@ -357,7 +358,7 @@ def mode_editfolder(phase, what, new): new_thing["num_hosts"] = 0 g_files[newpath] = new_thing - g_folder[what + "s"][name] = new_thing + g_folder["." + what + "s"][name] = new_thing log_audit(new_thing, "new-" + what, _("Created new %s %s") % (the_what, title)) else: @@ -437,7 +438,7 @@ def mode_editfolder(phase, what, new): attributes = the_thing.get("attributes", {}) parent = g_folder.get(".parent") - configure_attributes({what: attributes}, "folder", parent, g_folder) + configure_attributes({what: attributes}, "folder", parent, the_thing) html.write('<tr><td colspan=3 class="buttons">') html.button("save", _("Save & Finish"), "submit") @@ -1197,7 +1198,7 @@ def bulk_cleanup_attributes(the_file, hosts): if attr.is_mandatory() and not is_inherited: html.write(_("This attribute is mandatory and there is no value " - "define in the host list or any parent folder.")) + "defined in the host list or any parent folder.")) else: html.checkbox("_clean_%s" % attrname, False) html.write(" clean this attribute on <b>%s</b> hosts" % @@ -1809,11 +1810,12 @@ def write_configuration_file(folder, thefile, hosts): out.write("host_attributes.update(%s)\n" % pprint.pformat(hosts)) - def delete_configuration_file(folder, thefile): path = make_config_path(folder, thefile) if os.path.exists(path): - os.remove(path) + os.remove(path) # remove the actual configuration file + if os.path.exists(path + ".wato"): + os.remove(path + ".wato") # remove the .wato file # This is a dummy implementation which works without tags @@ -2008,10 +2010,15 @@ def delete_folder_after_confirm(del_folder): % (file_os_path(del_folder), del_folder["title"])) if c: del g_folder[".folders"][del_folder[".name"]] + folder_path = make_config_path(del_folder) try: - os.rmdir(make_conig_path(del_folder)) + os.remove(folder_path + "/.wato") + os.rmdir(folder_path) except: pass + if os.path.exists(folder_path): + raise MKGeneralException(_("Cannot remove the folder '%s': probably there are " + "still non-WATO files contained in this directory.") % folder_path) save_folder_config() log_audit(file_os_path(del_folder), "delete-folder", _("Deleted empty folder %s")% file_os_path(del_folder)) @@ -2491,7 +2498,7 @@ def collect_attributes(do_validate = True): if do_validate: attr.validate_input() - host[attr.name()] = attr.from_html_vars() + host[attrname] = attr.from_html_vars() return host def have_folder_attributes(): @@ -2589,7 +2596,17 @@ def configure_attributes(hosts, for_what, parent, myself=None): checkbox_name = "_change_%s" % attrname cb = html.get_checkbox(checkbox_name) force_entry = False - if cb != None: + + # first handle mandatory cases + if for_what == "folder" and attr.is_mandatory() \ + and some_host_hasnt_set(myself, attrname) \ + and not has_inherited: + force_entry = True + active = True + elif for_what == "host" and attr.is_mandatory() and not has_inherited: + force_entry = True + active = True + elif cb != None: active = cb # get previous state of checkbox elif for_what == "search": active = attr.default_value() == "" # show empty text search fields always @@ -2597,24 +2614,18 @@ def configure_attributes(hosts, for_what, parent, myself=None): active = unique and len(values) > 0 elif for_what == "folder": active = attrname in host - if attr.is_mandatory() and some_host_hasnt_set(myself, attrname): - force_entry = True else: # "host" - if attr.is_mandatory() and not has_inherited: - force_entry = True - active = True - else: - active = attrname in host + active = attrname in host html.write('<td class=checkbox>') if force_entry: - html.write("<input type=checkbox name=\"%s\" CHECKED DISABLED></div>" % checkbox_name) + html.write("<input type=checkbox name=\"ignored_%s\" CHECKED DISABLED></div>" % checkbox_name) + html.hidden_field(checkbox_name, "on") else: html.checkbox(checkbox_name, active, onchange="wato_toggle_attribute(this, '%s');" % attrname ) # Only select if value is unique html.write("</td>") - # Now comes the input fields and the inherited / default values # as two DIV elements, one of which is visible at one time. html.write('<td class=content>') @@ -2661,14 +2672,19 @@ def configure_attributes(hosts, for_what, parent, myself=None): def some_host_hasnt_set(container, attrname): if ".folders" in container: # we are a folder: for folder in container[".folders"].values(): - if some_host_hasnt_set(folder, attrname): + if attrname in folder.get("attributes", {}): + return False + elif some_host_hasnt_set(folder, attrname): return True for afile in container[".files"].values(): - if some_host_hasnt_set(afile, attrname): + if attrname in afile.get("attributes", {}): + return False + elif some_host_hasnt_set(afile, attrname): return True + else: # we are a host list hosts = read_configuration_file(container[".parent"], container) - for host in hosts: + for host in hosts.values(): if attrname not in host: return True return False

13 years, 3 months

Check_MK Git: check_mk: WATO: fix HTML header when confirming actions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c63591aa1cfb0f05bc37dcbf142006513f9d3135 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c63591aa1cfb0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 8 20:17:14 2011 +0200 WATO: fix HTML header when confirming actions --- web/htdocs/wato.py | 61 ++++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7152cfa..93587f1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -127,7 +127,10 @@ def page_handler(h): html.add_user_error(e.varname, e.message) # Title - html.header("%s - %s" % (title, modefunc("title"))) + mode_title = modefunc("title") + if mode_title: + title += " - " + mode_title + html.header(title) html.write("<script type='text/javascript' src='js/wato.js'></script>") html.write("<div class=wato>\n") @@ -165,7 +168,7 @@ def page_handler(h): def mode_folder(phase): if phase == "title": - return _("Folder contents") + return None elif phase == "buttons": html.context_button(_("Properties"), make_link_to([("mode", "editfolder")], g_folder[".path"])) @@ -193,10 +196,6 @@ def mode_folder(phase): raise MKGeneralException(_("You called this page with a non-existing folder/file %s") % delname) else: - html.write(_("Contents of folder ")) - render_folder_path() - html.write("<p>") - show_filefolder_list(g_folder, "folder", _("Subfolders")) show_filefolder_list(g_folder, "file", _("Host lists")) @@ -296,9 +295,7 @@ def mode_editfolder(phase, what, new): name, title, roles = None, None, [] mode = "new" else: - page_title = _("Edit") + (" %s %s" % (the_what, g_folder[".name"])) - if what == "file": - page_title += "/" + g_file[".name"] + page_title = _("Edit Properties") name = the_thing[".name"] title = the_thing["title"] roles = the_thing["roles"] @@ -427,7 +424,7 @@ def mode_editfolder(phase, what, new): # Attributes inherited to hosts if have_folder_attributes(): - html.write("<tr><td class=legend colspan=3>") + html.write("<tr><td class=title colspan=3>") html.write(_("The following attributes will be inherited to all hosts " "in this %s") % the_what) html.write("</td></tr>") @@ -1356,10 +1353,8 @@ def clear_audit_log(): os.rename(path, newpath) def clear_audit_log_after_confirm(): - if not html.transaction_valid(): - return None # Browser reload - wato_html_head(_("Confirm deletion of audit logfile")) - c = html.confirm(_("Do you really want to clear audit logfile?")) + c = wato_confirm(_("Confirm deletion of audit logfile"), + _("Do you really want to clear audit logfile?")) if c: clear_audit_log() return None, _("Cleared audit logfile.") @@ -1969,11 +1964,8 @@ def show_service_table(hostname, firsttime): def delete_host_after_confirm(delname): - if not html.transaction_valid(): - return None # Browser reload - - wato_html_head(_("Confirm host deletion")) - c = html.confirm(_("Do you really want to delete the host <tt>%s</tt>?") % delname) + c = wato_confirm(_("Confirm host deletion"), + _("Do you really want to delete the host <tt>%s</tt>?") % delname) if c: del g_hosts[delname] g_file["num_hosts"] -= 1 @@ -1988,8 +1980,8 @@ def delete_host_after_confirm(delname): return None # browser reload def delete_hosts_after_confirm(hosts): - wato_html_head(_("Confirm deletion of %d hosts") % len(hosts)) - c = html.confirm(_("Do you really want to delete the %d selected hosts?") % len(hosts)) + c = wato_confirm(_("Confirm deletion of %d hosts") % len(hosts), + _("Do you really want to delete the %d selected hosts?") % len(hosts)) if c: for delname in hosts: del g_hosts[delname] @@ -2005,9 +1997,9 @@ def delete_hosts_after_confirm(hosts): return None # browser reload def delete_folder_after_confirm(del_folder): - wato_html_head(_("Confirm folder deletion")) - c = html.confirm(_("Do you really want to delete the folder <tt>%s</tt> (%s)?") - % (file_os_path(del_folder), del_folder["title"])) + c = wato_confirm(_("Confirm folder deletion"), + _("Do you really want to delete the folder <tt>%s</tt> (%s)?") + % (file_os_path(del_folder), del_folder["title"])) if c: del g_folder[".folders"][del_folder[".name"]] folder_path = make_config_path(del_folder) @@ -2031,9 +2023,10 @@ def delete_folder_after_confirm(del_folder): def delete_file_after_confirm(del_file): - wato_html_head(_("Confirm file deletion")) - c = html.confirm(_("Do you really want to delete the host list <b>%s</b>, " - "which is containing %d hosts?") % (del_file["title"], del_file["num_hosts"])) + c = wato_confirm(_("Confirm file deletion"), + _("Do you really want to delete the host list <b>%s</b>, " + "which is containing %d hosts?") + % (del_file["title"], del_file["num_hosts"])) if c: hosts = read_configuration_file(g_folder, del_file) for delname in hosts: @@ -2047,12 +2040,19 @@ def delete_file_after_confirm(del_file): delete_configuration_file(g_folder, del_file) save_folder_config() call_hook_host_changed(g_folder) + global g_file + g_file = None return "folder" elif c == False: # not yet confirmed return "" else: return None # browser reload +# Show confirmation dialog, send HTML-header if dialog is shown. +def wato_confirm(html_title, message): + if not html.var("filled_in") == "confirm": + wato_html_head(html_title) + return html.confirm(message) def file_os_path(f): return "/" + "/".join(f[".path"]) @@ -2062,7 +2062,7 @@ g_html_head_open = False def wato_html_head(title): global g_html_head_open g_html_head_open = True - html.header("Check_MK WATO - " + title) + html.header(title) html.write("<div class=wato>\n") def host_move_combo(host = None): @@ -2572,9 +2572,9 @@ def configure_attributes(hosts, for_what, parent, myself=None): inherited_value = attr.default_value() # Legend and Help - html.write("<tr><td class=legend>%s" % attr.title()) + html.write("<tr><td class=legend><h3>%s</h3>" % attr.title()) if attr.help(): - html.write("<br><i>%s</i>" % attr.help()) + html.write("<i>%s</i>" % attr.help()) html.write("</td>") # Checkbox for activating this attribute @@ -2599,6 +2599,7 @@ def configure_attributes(hosts, for_what, parent, myself=None): # first handle mandatory cases if for_what == "folder" and attr.is_mandatory() \ + and myself \ and some_host_hasnt_set(myself, attrname) \ and not has_inherited: force_entry = True

13 years, 3 months

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011