Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 discussions

Check_MK Git: check_mk: WATO: Improve layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6b0b0dab1da0217d1c8e39e3ca6f421be3cb9d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6b0b0dab1da02… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 8 20:18:22 2011 +0200 WATO: Improve layout --- web/htdocs/check_mk.css | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 2ea3954..c8be9b8 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1077,13 +1077,15 @@ table.form img.toggleheader.hover { cursor: pointer; } -table.form td.legend { +/* Left side where title and help is printed */ +table.form td.legend, table.form td.title { color: #274750; border: 1px solid #fff; - /* border-right-style: none; */ height: 32px; padding-top: 10px; } + +/* Bottom row with action buttons, right justified */ table.form td.buttons { color: #274750; border: 1px solid #fff; @@ -1091,6 +1093,13 @@ table.form td.buttons { padding-top: 10px; text-align: right; } + +/* Inter-heading row over complete width */ +table.form td.title { + border-right-style: solid; + font-weight: bold; +} + table.form td.legend.border { border-right-style: solid; } @@ -1624,18 +1633,37 @@ table.add_snapin i { */ .wato table.form { - /* width: 50%; - left: 25%; - position: relative;*/ + width: 800px; } .wato table.form td.legend { border-right-style: none; + padding-bottom: 8px; +} + +.wato table.form td.legend h3 { + padding: 0px; + margin: 0px 0px 5px 0px; + font-size: 9pt; + font-weight: normal; +} +.wato table.form td.legend i { + margin-top: 13px; + font-size: 9pt; + color: white; +} + +.wato table.form td.content { + border-left-style: solid; + width: 494px; + padding-top: 7px; + padding-bottom: 7px; } .wato table.form td.checkbox { width: 40px; height: 40px; + padding-top: 7px; vertical-align: top; text-align: right; border: 1px solid white;

13 years, 3 months

Check_MK Git: check_mk: WATO: fix calling hooks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f24ee97021ecbcdecbf9ab98a66a6ca88409cec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f24ee97021ecb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 18:07:56 2011 +0200 WATO: fix calling hooks --- web/htdocs/wato.py | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1036139..3724ea2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -744,6 +744,7 @@ def mode_edithost(phase, new): else: log_pending(hostname, "edit-host", _("Edited properties of host [%s]") % hostname) write_the_configuration_file() + call_hook_host_changed(g_file) if new: return go_to_services and "firstinventory" or "file" else: @@ -1071,6 +1072,7 @@ def mode_bulk_edit(phase): host.update(changed_attributes) log_pending(hostname, "bulk-edit", _("Changed attributes of host %s in bulk mode") % hostname) write_the_configuration_file() + call_hook_host_changed(g_file) return "file" return @@ -1117,6 +1119,7 @@ def mode_bulk_cleanup(phase): log_pending(hostname, "bulk-cleanup", _("Cleaned %d attributes of host %s in bulk mode") % ( num_cleaned, hostname)) write_the_configuration_file() + call_hook_host_changed(g_file) return "file" return @@ -1913,6 +1916,7 @@ def delete_host_after_confirm(delname): write_the_configuration_file() log_pending(delname, "delete-host", _("Deleted host %s") % delname) check_mk_automation("delete-host", [delname]) + call_hook_host_changed(g_file) return "file" elif c == False: # not yet confirmed return "" @@ -1929,6 +1933,7 @@ def delete_hosts_after_confirm(hosts): check_mk_automation("delete-host", [delname]) log_pending(delname, "delete-host", _("Deleted host %s") % delname) write_the_configuration_file() + call_hook_host_changed(g_file) return "file", _("Successfully deleted %d hosts") % len(hosts) elif c == False: # not yet confirmed return "" @@ -1972,6 +1977,7 @@ def delete_file_after_confirm(del_file): del g_folder["files"][del_file["name"]] delete_configuration_file(g_folder, del_file) save_folder_config() + call_hook_host_changed(g_folder) return "folder" elif c == False: # not yet confirmed return "" @@ -2040,14 +2046,15 @@ def move_hosts_to(hostnames, target_filename): g_file["num_hosts"] -= 1 del g_hosts[hostname] if len(hostnames) == 1: - log_audit(hostname, "move-host", _("Moved host from %s to %s") % + log_pending(hostname, "move-host", _("Moved host from %s to %s") % (file_os_path(g_file), file_os_path(target_file))) num_moved += 1 write_configuration_file(target_folder, target_file, target_hosts) write_the_configuration_file() + call_hook_host_changed(g_root_folder) if len(hostnames) > 1: - log_audit(target_file, "move-host", _("Moved %d hosts from %s to %s") % + log_pending(target_file, "move-host", _("Moved %d hosts from %s to %s") % (num_moved, file_os_path(g_file), file_os_path(target_file))) return num_moved @@ -2441,12 +2448,13 @@ def configure_attributes(hosts, for_what, parent): continue # "bulk": determine, if this attribute has the same setting for all hosts. - values = set([]) + values = [] num_haveit = 0 for hostname, host in hosts.items(): if attrname in host: num_haveit += 1 - values.add(host[attrname]) + if host[attrname] not in values: + values.append(host[attrname]) # The value of this attribute is unique amongst all hosts if # either no host has a value for this attribute, or all have @@ -2531,7 +2539,7 @@ def configure_attributes(hosts, for_what, parent): html.write('<div id="attr_entry_%s" style="%s">' % (attrname, (not active) and "display: none" or "")) if len(values) == 1: - defvalue = list(values)[0] + defvalue = values[0] else: defvalue = attr.default_value() attr.render_input(defvalue) @@ -2549,7 +2557,7 @@ def configure_attributes(hosts, for_what, parent): elif not unique: html.write(_("<i>This value differs between the selected hosts.</i>")) else: - value = list(values)[0] + value = values[0] elif for_what in [ "host", "folder" ]: html.write("<h3>" + inherited_from + "</h3>")

13 years, 3 months

Check_MK Git: check_mk: WATO: always show search button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dd01b73e4323d3bda8e69939c2df05aef9e4870d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd01b73e4323d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 3 11:02:07 2011 +0200 WATO: always show search button --- web/htdocs/wato.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3724ea2..3a777d4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1827,8 +1827,7 @@ def make_action_link_to(vars, folder_path, filename = None): return make_link_to(vars + [("_transid", html.current_transid())], folder_path, filename) def search_button(): - if len(g_folder["files"]) > 0 or len(g_folder["folders"]) > 0: - html.context_button(_("Search"), make_link([("mode", "search")])) + html.context_button(_("Search"), make_link([("mode", "search")])) def changelog_button(): pending = parse_audit_log("pending") @@ -2262,6 +2261,11 @@ class IPAddressAttribute(TextAttribute): def __init__(self, name, title, help = None): TextAttribute.__init__(self, name, title, help, "", mandatory = True) + def render_input(self, value): + if value == None: + value = "" + html.text_input("attr_" + self.name(), value, size=15) + def from_html_vars(self): value = html.var("attr_" + self.name()) if not value:

13 years, 3 months

Check_MK Git: check_mk: WATO: reworked and extended API functions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 39ef70cdf413a1c30e13d304a075c54f8c20a833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39ef70cdf413a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 3 17:40:48 2011 +0200 WATO: reworked and extended API functions --- web/htdocs/wato.py | 128 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 106 insertions(+), 22 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3a777d4..eb6dc9a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -264,7 +264,7 @@ def show_filefolder_list(thing, what, title): if what == "file": num_hosts = entry["num_hosts"] else: - num_hosts = count_files(entry) + num_hosts = count_hosts(entry) html.write("<td>%d</td>" % num_hosts) html.write("</tr>") html.write("</table>") @@ -1571,12 +1571,13 @@ def find_folder(path, in_folder = None): else: return find_folder(rest, in_folder["folders"][name]) -def count_files(folder): +def count_hosts(folder): num = 0 for f in folder["files"].values(): num += f["num_hosts"] for sf in folder["folders"].values(): - num += count_files(sf) + num += count_hosts(sf) + folder["num_hosts"] = num return num # Load all hosts from all configuration files. @@ -2602,14 +2603,16 @@ def effective_attributes(host, container): # +----------------------------------------------------------------------+ -# | _ _ _ | -# | | | | | ___ ___ | | _____ | -# | | |_| |/ _ \ / _ \| |/ / __| | -# | | _ | (_) | (_) | <\__ \ | -# | |_| |_|\___/ \___/|_|\_\___/ | +# | _ _ _ ___ _ ____ ___ | +# | | | | | ___ ___ | | _____ ( _ ) / \ | _ \_ _| | +# | | |_| |/ _ \ / _ \| |/ / __| / _ \/\ / _ \ | |_) | | | +# | | _ | (_) | (_) | <\__ \ | (_> < / ___ \| __/| | | +# | |_| |_|\___/ \___/|_|\_\___/ \___/\/ /_/ \_\_| |___| | # | | # +----------------------------------------------------------------------+ -# | Hooks are a ways plugins can add own activities at certain points | +# | The API allows addons to query information about configured hosts. | +# | | +# | Hooks are a way how addons can add own activities at certain points | # | of time, e.g. when a host as been edited of the changes have been | # | activated. | # +----------------------------------------------------------------------+ @@ -2619,24 +2622,89 @@ def effective_attributes(host, container): hooks = {} -def register_hook(name, func): - hooks.setdefault(name, []).append(func) +class API: + def register_hook(self, name, func): + hooks.setdefault(name, []).append(func) + + # Get a (flat) dictionary containing all hosts with their *effective* + # attributes (containing all inherited and default values where appropriate). + def get_all_hosts(self): + load_folder_config() + return collect_hosts(g_root_folder) + + def get_folder(self, path): + load_folder_config() + the_thing = g_root_folder + while len(path) > 0: + c = path[0] + if c in the_thing["folders"]: + the_thing = the_thing["folders"][c] + else: + return None + path = path[1:] + + # add information about number of hosts + count_hosts(the_thing) + return the_thing + + def get_file(self, path): + folder = self.get_folder(path[:-1]) + if not folder or not path[-1] in folder["files"]: + return None + the_file = folder["files"][path[-1]] + if not the_file: + return None + hosts = read_configuration_file(folder, the_file) + new_file = {} + new_file.update(the_file) + new_file["hosts"] = hosts + return new_file + + + # Get all effective data of a host. The_file must be returned by get_file() + def get_host(self, the_file, hostname): + host = the_file["hosts"][hostname] + eff = effective_attributes(host, the_file) + eff["name"] = hostname + return eff + + # Return displayable information about host + def get_host_painted(self, host): + result = [] + for attr in host_attributes: + attrname = attr.name() + if attrname in host: + tdclass, content = attr.paint(host[attrname], host["name"]) + result.append((attr.title(), content)) + return result -def call_hooks(name, *args): - for hk in hooks.get(name, []): - hk(*args) -def call_hook_host_changed(the_thing): # called for file or folder - if "hosts-changed" in hooks: - hosts = collect_hosts(the_thing) - call_hooks("hosts-changed", hosts) + def cleanup_directory(self, thing): + # drop 'parent' entry, recursively + def drop_internal(thing): + new_thing = {} + new_thing.update(thing) + if "parent" in new_thing: + del new_thing["parent"] + if "files" in new_thing: + new_thing["files"] = drop_internal_dict(new_thing["files"]) + if "folders" in new_thing: + new_thing["folders"] = drop_internal_dict(new_thing["folders"]) + return new_thing - # The same with all hosts! - if "all-hosts-changed" in hooks: - hosts = collect_hosts(g_root_folder) - call_hooks("all-hosts-changed", hosts) + def drop_internal_dict(self, thingdict): + new_dict = {} + for name, thing in thingdict.items(): + new_dict[name] = drop_internal(thing) + return new_dict + + return drop_internal(thing) +api = API() + + +# internal helper functions for API def collect_hosts(the_thing): if "folders" in the_thing: # a folder hosts = {} @@ -2649,8 +2717,24 @@ def collect_hosts(the_thing): hosts = read_configuration_file(the_thing["parent"], the_thing) effective_hosts = dict([ (hn, effective_attributes(h, the_thing)) for (hn, h) in hosts.items() ]) + for host in effective_hosts.values(): + host["file"] = the_thing["path"] return effective_hosts +def call_hooks(name, *args): + for hk in hooks.get(name, []): + hk(*args) + +def call_hook_host_changed(the_thing): # called for file or folder + if "hosts-changed" in hooks: + hosts = collect_hosts(the_thing) + call_hooks("hosts-changed", hosts) + + # The same with all hosts! + if "all-hosts-changed" in hooks: + hosts = collect_hosts(g_root_folder) + call_hooks("all-hosts-changed", hosts) + # +----------------------------------------------------------------------+ # | ____ _ _ |

13 years, 3 months

Check_MK Git: check_mk: WATO: internal cleanup in dictionaries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73fae29623595753188749deb431e411a04c2d5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73fae296235957… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 15:05:06 2011 +0200 WATO: internal cleanup in dictionaries Entries prefixed with a dot are not not persistet. --- web/htdocs/wato.py | 84 ++++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=73fae29623…

13 years, 3 months

Check_MK Git: check_mk: WATO: replace folders.mk by inline files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e67bb8130b405881ac9be50e49bae2bc7ab11e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e67bb8130b405… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 16:39:32 2011 +0200 WATO: replace folders.mk by inline files The folder configuration is now stored in the directorz structure of check_mk/conf.d itself. Redundancies are removed. --- web/htdocs/wato.py | 252 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 150 insertions(+), 102 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6e67bb8130…

13 years, 3 months

Check_MK Git: check_mk: WATO: prevent cleaning of mandatory attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d671cd6a8237cc79feb2af43729f325b1fdd6035 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d671cd6a8237cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 7 18:51:33 2011 +0200 WATO: prevent cleaning of mandatory attributes --- web/htdocs/wato.py | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7625b7b..2c1330f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1138,7 +1138,7 @@ def mode_bulk_cleanup(phase): html.begin_form("bulkcleanup", None, "POST") html.write("<table class=form>") - if not bulk_cleanup_attributes(hosts): + if not bulk_cleanup_attributes(g_file, hosts): html.write("<tr><td class=buttons>") html.write(_("The selected hosts have no explicit attributes")) html.write("</td></tr>\n") @@ -1160,7 +1160,7 @@ def bulk_collect_cleaned_attributes(): return to_clean -def bulk_cleanup_attributes(hosts): +def bulk_cleanup_attributes(the_file, hosts): num_shown = 0 for attr in host_attributes: attrname = attr.name() @@ -1174,16 +1174,34 @@ def bulk_cleanup_attributes(hosts): if num_haveit == 0: continue + # If the attribute is mandatory and no value is inherited + # by file or folder, the attribute cannot be cleaned. + container = the_file + is_inherited = False + while container: + if "attributes" in container and attrname in container["attributes"]: + is_inherited = True + inherited_value = container["attributes"][attrname] + break + container = container.get(".parent") + + num_shown += 1 + # Legend and Help html.write("<tr><td class=legend>%s" % attr.title()) if attr.help(): html.write("<br><i>%s</i>" % attr.help()) html.write("</td>") html.write("<td class=content>") - html.checkbox("_clean_%s" % attrname, False) - html.write(" clean this attribute on <b>%s</b> hosts" % - (num_haveit == len(hosts) and "all selected" or str(num_haveit))) + + 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.")) + else: + html.checkbox("_clean_%s" % attrname, False) + html.write(" clean this attribute on <b>%s</b> hosts" % + (num_haveit == len(hosts) and "all selected" or str(num_haveit))) html.write("</td></tr>") return num_shown > 0 @@ -2231,7 +2249,8 @@ class Attribute: return self._show_in_folder # Wether it is allowed that a host has no explicit - # value here (inherited or direct value) + # value here (inherited or direct value). An mandatory + # has *no* default value. def is_mandatory(self): return False @@ -2562,6 +2581,7 @@ def configure_attributes(hosts, for_what, parent): checkbox_name = "_change_%s" % attrname cb = html.get_checkbox(checkbox_name) + force_entry = False if cb != None: active = cb # get previous state of checkbox elif for_what == "search": @@ -2571,12 +2591,18 @@ def configure_attributes(hosts, for_what, parent): elif for_what == "folder": active = attrname in host else: # "host" - active = attrname in host or \ - (not (has_inherited and attr.is_mandatory())) + if attr.is_mandatory() and not has_inherited: + force_entry = True + active = True + else: + active = attrname in host html.write('<td class=checkbox>') - html.checkbox(checkbox_name, active, - onchange="wato_toggle_attribute(this, '%s');" % attrname ) # Only select if value is unique + if force_entry: + html.write("<input type=checkbox name=\"%s\" CHECKED DISABLED></div>" % checkbox_name) + else: + html.checkbox(checkbox_name, active, + onchange="wato_toggle_attribute(this, '%s');" % attrname ) # Only select if value is unique html.write("</td>")

13 years, 3 months

Check_MK Git: check_mk: WATO: fixed several minor problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f57c459f1e390c5637f8627f9e6171c3d7bac62c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f57c459f1e390c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 11:33:03 2011 +0200 WATO: fixed several minor problems --- web/htdocs/config.py | 2 +- web/htdocs/wato.py | 51 +++++++++++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index fac958a..f903282 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -453,7 +453,7 @@ default_language = None config_files = [] host_tags = [] -wato_hide_filenames = False +wato_hide_filenames = True # ____ ___ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e3dc97f..f4f2613 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -366,10 +366,16 @@ def mode_editfolder(phase, what, new): html.reload_sidebar() # refresh WATO snapin save_folder_config() - if what == "file": - rewrite_config_file(g_folder, the_thing) - else: - rewrite_config_files_below(the_thing) # due to inherited attributes + + # Due to changes in folder/file attributes, host files + # might need to be rewritten in order to reflect Changes + # in Nagios-relevant attributes. + if not new: + if what == "file": + rewrite_config_file(g_folder, the_thing) + else: + rewrite_config_files_below(the_thing) # due to inherited attributes + return "folder" @@ -378,7 +384,7 @@ def mode_editfolder(phase, what, new): html.write('<table class="form">\n') # title - html.write("<tr><td class=legend>Title</td><td class=content></td><td class=content>") + html.write("<tr><td class=legend colspan=2>Title</td><td class=content>") html.text_input("title", title) html.set_focus("title") html.write("</td></tr>\n") @@ -387,12 +393,12 @@ def mode_editfolder(phase, what, new): if not (what == "folder" and not new and g_folder == g_root_folder): if not config.wato_hide_filenames: if what == "folder": - html.write("<tr><td class=legend>" + _("Internal directory name") + "<br><i>" + html.write("<tr><td class=legend colspan=2>" + _("Internal directory name") + "<br><i>" + _("This is the name of subdirectory where the files and<br> " "other folders will be created. You cannot change this later") + "</i></td><td class=content>") else: - html.write("<tr><td class=legend>" + _("Internal file name") + "<br><i>" + html.write("<tr><td class=legend colspan=2>" + _("Internal file name") + "<br><i>" + _("This is the name of Check_MK configuration file where<br>" "the hosts will be created. It well automatically get the<br>" "extension <tt>.mk</tt>. Do not specify this extension here.<br>" @@ -407,25 +413,26 @@ def mode_editfolder(phase, what, new): html.write("</td></tr>\n") # permissions - html.write("<tr><td class=legend>" + _("Grant access to") + "</td><td class=content></td><td class=content>") + html.write("<tr><td class=legend colspan=2>" + _("Grant access to") + "</td><td class=content>") for role in config.roles: html.checkbox("role_" + role, role in g_folder["roles"]) html.write(" " + role + "<br>") html.write("</td></tr>") # Attributes inherited to hosts - html.write("<tr><td class=legend colspan=3>") - html.write(_("The following attributes will be inherited to all hosts " - "in this %s") % the_what) - html.write("</td></tr>") - if new: - attributes = { } - parent = g_folder - else: - attributes = the_thing.get("attributes", {}) - parent = g_folder.get("parent") + if have_folder_attributes(): + html.write("<tr><td class=legend colspan=3>") + html.write(_("The following attributes will be inherited to all hosts " + "in this %s") % the_what) + html.write("</td></tr>") + if new: + attributes = { } + parent = g_folder + else: + attributes = the_thing.get("attributes", {}) + parent = g_folder.get("parent") - configure_attributes({what: attributes}, "folder", parent) + configure_attributes({what: attributes}, "folder", parent) html.write('<tr><td colspan=3 class="buttons">') html.button("save", _("Save & Finish"), "submit") @@ -2409,6 +2416,12 @@ def collect_attributes(do_validate = True): host[attr.name()] = attr.from_html_vars() return host +def have_folder_attributes(): + for attr in host_attributes: + if attr.show_in_folder(): + return True + return False + # Show HTML form for editing attributes. for_what can be: # "host" -> normal host edit dialog # "folder" -> properies of folder or file

13 years, 3 months

Check_MK Git: check_mk: Multisite: load all CSS style sheets in htdocs/css

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee35d76804135ec5fb826219c411dec15478ac47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee35d76804135e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 16:48:03 2011 +0200 Multisite: load all CSS style sheets in htdocs/css --- web/htdocs/css/README | 2 ++ web/htdocs/htmllib.py | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/web/htdocs/css/README b/web/htdocs/css/README new file mode 100644 index 0000000..4d0aec6 --- /dev/null +++ b/web/htdocs/css/README @@ -0,0 +1,2 @@ +Put your custom *.css file here. They will all be loaded +automatically. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b09bab5..ea4b466 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -158,6 +158,21 @@ class html: self.output_format = "html" self.status_icons = {} + def plugin_stylesheets(self): + global plugin_stylesheets + try: + return plugin_stylesheets + except: + plugins_paths = [ defaults.web_dir + "/htdocs/css" ] + if defaults.omd_root: + plugins_paths.append(defaults.omd_root + "/local/share/check_mk/web/htdocs/css") + plugin_stylesheets = set([]) + for dir in plugins_paths: + for fn in os.listdir(dir): + if fn.endswith(".css"): + plugin_stylesheets.add(fn) + return plugin_stylesheets + def set_output_format(self, f): self.output_format = f @@ -455,8 +470,14 @@ class html: self.write(title) self.write('''</title> <link rel="stylesheet" type="text/css" href="check_mk.css">''') + + # Load all style sheets in htdocs/css + for css in self.plugin_stylesheets(): + self.write(' <link rel="stylesheet" type="text/css" href="css/%s">' % css) + if config.custom_style_sheet: self.write(' <link rel="stylesheet" type="text/css" href="%s">' % config.custom_style_sheet) + self.write(''' <script type='text/javascript' src='js/check_mk.js'></script> <script type='text/javascript' src='js/hover.js'></script>

13 years, 3 months

Check_MK Git: check_mk: WATO: fix minor problems, introduce API hooks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9473f5c466ef19b9c2740150083c8dcac5594b4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9473f5c466ef19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 16:48:40 2011 +0200 WATO: fix minor problems, introduce API hooks --- web/htdocs/wato.py | 98 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 81 insertions(+), 17 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f4f2613..d06f0ce 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -254,7 +254,7 @@ def show_filefolder_list(thing, what, title): tdclass, content = attr.paint(entry["attributes"][attrname], "") else: tdclass, content = "", "" - html.write('<td class"%s">%s</td>' % (tdclass, content)) + html.write('<td class="%s">%s</td>' % (tdclass, content)) # Internal filename if not config.wato_hide_filenames: @@ -332,10 +332,9 @@ def mode_editfolder(phase, what, new): # Roles and Permissions roles = [ role for role in config.roles if html.var("role_" + role) ] - # Attributes to inherit to hosts attributes = collect_attributes() - # html.write("<pre>%s</pre>" % pprint.pformat(attributes)) - + attributes_changed = not new and attributes != the_thing.get("attributes", {}) + if new: newpath = g_folder["path"] + (name,) new_thing = { @@ -370,11 +369,13 @@ def mode_editfolder(phase, what, new): # Due to changes in folder/file attributes, host files # might need to be rewritten in order to reflect Changes # in Nagios-relevant attributes. - if not new: + if attributes_changed: if what == "file": rewrite_config_file(g_folder, the_thing) else: rewrite_config_files_below(the_thing) # due to inherited attributes + log_pending(the_thing, "edit-" + what, _("Changed attributes of %s %s") % (the_what, title)) + call_hook_host_changed(the_thing) return "folder" @@ -762,7 +763,7 @@ def mode_edithost(phase, new): html.set_focus("host") html.write("</td></tr>\n") - configure_attributes({hostname: host}, "host", g_folder) + configure_attributes({hostname: host}, "host", g_file) html.write('<tr><td class="buttons" colspan=3>') html.button("save", _("Save & Finish"), "submit") @@ -2169,7 +2170,7 @@ class Attribute: # Render HTML code displaying a value def paint(self, value, hostname): - return "", "" + return "", value # Wether or not to show this attribute in tables. # This value is set by declare_host_attribute @@ -2181,6 +2182,11 @@ class Attribute: def show_in_folder(self): return self._show_in_folder + # Wether it is allowed that a host has no explicit + # value here (inherited or direct value) + def is_mandatory(self): + return False + # Render HTML input fields displaying the value and # make it editable. If filter == True, then the field # is to be displayed in filter mode (as part of the @@ -2206,7 +2212,7 @@ class Attribute: # Checks if the give value matches the search attributes # that are represented by the current HTML variables. def filter_matches(self, crit, value, hostname): - return False + return crit == value # A simple text attribute. It is stored in @@ -2222,6 +2228,9 @@ class TextAttribute(Attribute): else: return "", value + def is_mandatory(self): + return self._mandatory + def render_input(self, value): if value == None: value = "" @@ -2250,7 +2259,7 @@ class IPAddressAttribute(TextAttribute): TextAttribute.__init__(self, name, title, help, "", mandatory = True) def from_html_vars(self): - value = html.var_utf8("attr_" + self.name()) + value = html.var("attr_" + self.name()) if not value: value = None return value @@ -2265,6 +2274,9 @@ class IPAddressAttribute(TextAttribute): text = _("(hostname not resolvable!)") 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: @@ -2339,12 +2351,6 @@ class HostTagAttribute(Attribute): value = None return value - def filter_matches(self, crit, value, hostname): - if crit == "|": - return True # no tag selected - else: - return crit == value - # Special function for computing the setting of a specific # tag group from the total list of tags of a host @@ -2458,6 +2464,7 @@ def configure_attributes(hosts, for_what, parent): # This does not apply in "search" mode. inherited_from = None inherited_value = None + has_inherited = False if for_what == "host": what = "file" @@ -2472,7 +2479,9 @@ def configure_attributes(hosts, for_what, parent): url = make_link_to([("mode", "editfolder")], container["path"]) inherited_from = _("Inherited from ") + '<a href="%s">%s</a>' % (url, container["title"]) inherited_value = container["attributes"][attrname] + has_inherited = True break + container = container.get("parent") what = "folder" @@ -2505,8 +2514,11 @@ def configure_attributes(hosts, for_what, parent): active = attr.default_value() == "" # show empty text search fields always elif for_what == "bulk": active = unique and len(values) > 0 - else: # host, folder + elif for_what == "folder": active = attrname in host + else: # "host" + active = attrname in host or \ + (not (has_inherited and attr.is_mandatory())) html.write('<td class=checkbox>') html.checkbox(checkbox_name, active, @@ -2563,7 +2575,7 @@ def configure_attributes(hosts, for_what, parent): def effective_attributes(host, container): chain = [ host ] while container: - chain.append(container.get("attributes")) + chain.append(container.get("attributes", {})) container = container.get("parent") eff = {} @@ -2579,6 +2591,58 @@ def effective_attributes(host, container): return eff + +# +----------------------------------------------------------------------+ +# | _ _ _ | +# | | | | | ___ ___ | | _____ | +# | | |_| |/ _ \ / _ \| |/ / __| | +# | | _ | (_) | (_) | <\__ \ | +# | |_| |_|\___/ \___/|_|\_\___/ | +# | | +# +----------------------------------------------------------------------+ +# | Hooks are a ways plugins can add own activities at certain points | +# | of time, e.g. when a host as been edited of the changes have been | +# | activated. | +# +----------------------------------------------------------------------+ + +# Inform plugins about changes of hosts. the_thing can be: +# a folder, a file or a host + +hooks = {} + +def register_hook(name, func): + hooks.setdefault(name, []).append(func) + +def call_hooks(name, *args): + for hk in hooks.get(name, []): + hk(*args) + +def call_hook_host_changed(the_thing): # called for file or folder + if "hosts-changed" in hooks: + hosts = collect_hosts(the_thing) + call_hooks("hosts-changed", hosts) + + # The same with all hosts! + if "all-hosts-changed" in hooks: + hosts = collect_hosts(g_root_folder) + call_hooks("all-hosts-changed", hosts) + + +def collect_hosts(the_thing): + if "folders" in the_thing: # a folder + hosts = {} + for fi in the_thing.get("files", []).values(): + hosts.update(collect_hosts(fi)) + for fo in the_thing["folders"].values(): + hosts.update(collect_hosts(fo)) + return hosts + elif "num_hosts" in the_thing: # a file + hosts = read_configuration_file(the_thing["parent"], the_thing) + effective_hosts = dict([ (hn, effective_attributes(h, the_thing)) + for (hn, h) in hosts.items() ]) + return effective_hosts + + # +----------------------------------------------------------------------+ # | ____ _ _ | # | | _ \| |_ _ __ _(_)_ __ ___ |

13 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011