Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: WATO: rename descripton to alias

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3e1eade647e8311c4f97f8173fc12825e1fcbfb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3e1eade647e83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 11:57:39 2011 +0100 WATO: rename descripton to alias --- web/htdocs/wato.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 783f141..8592924 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5282,7 +5282,7 @@ def mode_edit_group(phase, what): html.write("</td></tr>") html.write("<tr><td class=legend>") - html.write(_("Alias A description of this group.")) + html.write(_("Alias An Alias or description of this group.")) html.write("</td><td class=content>") html.text_input("alias", name and groups.get(name, "") or "") html.write("</td></tr>") @@ -5613,7 +5613,7 @@ def mode_edit_timeperiod(phase): else: alias = "" html.write("<tr><td class=legend>") - html.write(_("Alias") + " " + _("A description of the timeperiod")) + html.write(_("Alias") + " " + _("An alias or description of the timeperiod")) html.write("</td><td class=content>") html.text_input("alias", alias, size = 50) if not new: @@ -5861,7 +5861,7 @@ def mode_sites(phase): html.write("<table class=data>") html.write("<tr><th>" + _("Actions") + "<th>" + _("Site-ID") - + "</th><th>" + _("Alias / Description") + + "</th><th>" + _("Alias") + "</th><th>" + _("Connection") + "</th><th>" + _("Status host") + "</th><th>" + _("Disabled") @@ -6104,7 +6104,7 @@ def mode_edit_site(phase): # Alias html.write("<tr><td class=legend>") - html.write(_("Alias") + " " + _("A name or description of the site")) + html.write(_("Alias") + " " + _("An alias or description of the site")) html.write("</td><td class=content>") html.text_input("alias", site.get("alias", ""), size = 50) if not new: @@ -7495,7 +7495,7 @@ def mode_roles(phase): html.write("<tr>" + "<th>" + _("Actions") + "</th>" + "<th>" + _("ID") + "</th>" - + "<th>" + _("Description") + "</th>" + + "<th>" + _("Alias") + "</th>" + "<th>" + _("Type") + "</th>" + "<th>" + _("Modifications") + "</th>" + "<th>" + _("Users") + "</th>" @@ -7525,7 +7525,7 @@ def mode_roles(phase): # ID html.write("<td>%s</td>" % id) - # Description + # Alias html.write("<td>%s</td>" % role["alias"]) # Type @@ -7619,7 +7619,7 @@ def mode_edit_role(phase): # Alias html.write("<tr><td class=legend>") - html.write(_("Alias") + " " + _("An optional description of the timeperiod")) + html.write(_("Alias") + " " + _("An alias or description of the role")) html.write("</td><td class=content>") html.text_input("alias", role.get("alias", ""), size = 50) html.write("</td></tr>") @@ -7906,7 +7906,7 @@ def mode_edit_hosttag(phase): if not re.match("^[-a-z0-9A-Z_]*$", id): raise MKUserError("id_%d" % nr, _("Invalid tag ID. Only the characters a-z, A-Z, 0-9, _ and - are allowed.")) if not descr: - raise MKUserError("descr_%d" % nr, _("Please supply a description for the tag with the ID %s.") % id) + raise MKUserError("descr_%d" % nr, _("Please supply an alias for the tag with the ID %s.") % id) if not id: id = None if have_none_tag: @@ -8004,7 +8004,7 @@ def mode_edit_hosttag(phase): # Title html.write("<tr><td class=legend>") - html.write(_("Title") + " " + _("A description of this tag group")) + html.write(_("Title") + " " + _("An alias or description of this tag group")) html.write("</td><td class=content>") html.text_input("title", title, size = 30) html.write("</td></tr>") @@ -8027,7 +8027,7 @@ def mode_edit_hosttag(phase): html.write("</td><td class=content>") html.write("<table>") html.write("<tr><th>%s</th><th>%s</th></tr>" % - (_("Tag ID"), _("Description"))) + (_("Tag ID"), _("Alias"))) for nr in range(max(num_choices, len(choices))): if nr < len(choices): tag_id, descr = choices[nr]

12 years, 7 months

Check_MK Git: check_mk: WATO: make deletion of local site possible

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a4b377d0bb852ed0bee83917336e1a8612fb5c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4b377d0bb852e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 11:48:29 2011 +0100 WATO: make deletion of local site possible --- web/htdocs/wato.py | 50 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 668edcf..783f141 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -432,12 +432,13 @@ def load_folder(dir, name="", path="", parent=None): folder["attributes"] = {} # Add information about the effective site of this folder - if "site" in folder["attributes"]: - folder[".siteid"] = folder["attributes"]["site"] - elif parent: - folder[".siteid"] = parent[".siteid"] - else: - folder[".siteid"] = default_site() + if is_distributed(): + if "site" in folder["attributes"]: + folder[".siteid"] = folder["attributes"]["site"] + elif parent: + folder[".siteid"] = parent[".siteid"] + else: + folder[".siteid"] = default_site() # Now look subdirectories for entry in os.listdir(dir): @@ -550,10 +551,11 @@ def load_hosts_file(folder): # Compute site attribute, because it is needed at various # places. - if "site" in host: - host[".siteid"] = host["site"] - else: - host[".siteid"] = folder[".siteid"] + if is_distributed(): + if "site" in host: + host[".siteid"] = host["site"] + else: + host[".siteid"] = folder[".siteid"] hosts[hostname] = host @@ -5710,7 +5712,7 @@ def find_usage_of_timeperiod(tpname): #. -# .-Sites----------------------------------------------------------------. +# .-Multisite Connections------------------------------------------------. # | ____ _ _ | # | / ___|(_) |_ ___ ___ | # | \___ \| | __/ _ \/ __| | @@ -5735,13 +5737,19 @@ def mode_sites(phase): if phase == "action": delid = html.var("_delete") if delid and html.transaction_valid(): - # Make sure that site is not being used by hosts and folders - site_ids = set([]) - find_folder_sites(site_ids, g_root_folder, True) - if delid in site_ids: - raise MKUserError(None, - _("You cannot delete this connection. " - "It has folders/hosts assigned to it.")) + # The last connection can always be deleted. In that case we + # fallb back to non-distributed-WATO and the site attribute + # will be removed. + test_sites = dict(sites.items()) + del test_sites[delid] + if is_distributed(test_sites): + # Make sure that site is not being used by hosts and folders + site_ids = set([]) + find_folder_sites(site_ids, g_root_folder, True) + if delid in site_ids: + raise MKUserError(None, + _("You cannot delete this connection. " + "It has folders/hosts assigned to it.")) c = wato_confirm(_("Confirm deletion of site %s" % delid), _("Do you really want to delete the connection to the site %s?" % delid)) @@ -6389,8 +6397,10 @@ def do_remote_automation(site, command, vars): # Determine, if we have any slaves to distribute # configuration to. -def is_distributed(): - for site in config.sites.values(): +def is_distributed(sites = None): + if sites == None: + sites = config.sites + for site in sites.values(): if site.get("replication"): return True return False

12 years, 7 months

Check_MK Git: check_mk: WATO: allow cloning of users

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f010c576a1f2f1548ef572335bb718e7f51e6e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f010c576a1f2f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 11:28:59 2011 +0100 WATO: allow cloning of users --- web/htdocs/wato.py | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bcaa15b..668edcf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6933,8 +6933,10 @@ def mode_users(phase): # Buttons edit_url = make_link([("mode", "edit_user"), ("edit", id)]) delete_url = html.makeactionuri([("_delete", id)]) + clone_url = make_link([("mode", "edit_user"), ("clone", id)]) html.write("<td class=buttons>") icon_button(edit_url, _("Properties"), "edit") + icon_button(clone_url, _("Create a copy of this user"), "clone") icon_button(delete_url, _("Delete"), "delete") html.write("</td>") @@ -7001,7 +7003,8 @@ def mode_users(phase): def mode_edit_user(phase): users = load_users() - userid = html.var("edit", None) # missing -> new user + userid = html.var("edit") # missing -> new user + cloneid = html.var("clone") # Only needed in 'new' mode new = userid == None if phase == "title": if new: @@ -7014,7 +7017,10 @@ def mode_edit_user(phase): return if new: - user = {} + if cloneid: + user = users.get(cloneid, {}) + else: + user = {} else: user = users.get(userid, {}) @@ -7111,7 +7117,7 @@ def mode_edit_user(phase): html.write(_("User ID")) html.write("</td><td class=content>") if new: - html.text_input("userid", userid) + html.text_input("userid", userid) html.set_focus("userid") else: html.write(userid) @@ -7144,11 +7150,12 @@ def mode_edit_user(phase): # Locking html.write("<tr><td class=legend>") - html.write(_("Locking the password prevents a user from logging in without " - "the need of changing the password.")) + html.write(_("Disabling the password prevents a user from logging in without " + "the need of changing the password. Notifications are not affected " + "by this setting.")) html.write("</td><td class=content>") html.checkbox("locked", user.get("locked", False)) - html.write(_(" lock the password of this account")) + html.write(_(" disable the password of this account")) html.write("</td></tr>") # Email address

12 years, 7 months

Check_MK Git: check_mk: WATO: unified buttons, use icons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59884da87469097cf1fa843b914aa4330d87e2c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59884da8746909… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 17 11:15:34 2011 +0100 WATO: unified buttons, use icons --- web/htdocs/images/button_clone_hi.png | Bin 0 -> 2365 bytes web/htdocs/images/button_clone_lo.png | Bin 0 -> 3005 bytes web/htdocs/images/button_download_hi.png | Bin 0 -> 3255 bytes web/htdocs/images/button_download_lo.png | Bin 0 -> 3986 bytes web/htdocs/images/button_edithost_hi.png | Bin 2795 -> 0 bytes web/htdocs/images/button_restore_hi.png | Bin 0 -> 2063 bytes web/htdocs/images/button_restore_lo.png | Bin 0 -> 2484 bytes .../{button_edithost_lo.png => icon_edit.png} | Bin 3408 -> 3408 bytes web/htdocs/wato.py | 34 ++++++++++---------- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/web/htdocs/images/button_clone_hi.png b/web/htdocs/images/button_clone_hi.png new file mode 100644 index 0000000..3d2c769 Binary files /dev/null and b/web/htdocs/images/button_clone_hi.png differ diff --git a/web/htdocs/images/button_clone_lo.png b/web/htdocs/images/button_clone_lo.png new file mode 100644 index 0000000..bc10ac0 Binary files /dev/null and b/web/htdocs/images/button_clone_lo.png differ diff --git a/web/htdocs/images/button_download_hi.png b/web/htdocs/images/button_download_hi.png new file mode 100644 index 0000000..83c4dde Binary files /dev/null and b/web/htdocs/images/button_download_hi.png differ diff --git a/web/htdocs/images/button_download_lo.png b/web/htdocs/images/button_download_lo.png new file mode 100644 index 0000000..4164108 Binary files /dev/null and b/web/htdocs/images/button_download_lo.png differ diff --git a/web/htdocs/images/button_edithost_hi.png b/web/htdocs/images/button_edithost_hi.png deleted file mode 100644 index fb33ba5..0000000 Binary files a/web/htdocs/images/button_edithost_hi.png and /dev/null differ diff --git a/web/htdocs/images/button_restore_hi.png b/web/htdocs/images/button_restore_hi.png new file mode 100644 index 0000000..22d569f Binary files /dev/null and b/web/htdocs/images/button_restore_hi.png differ diff --git a/web/htdocs/images/button_restore_lo.png b/web/htdocs/images/button_restore_lo.png new file mode 100644 index 0000000..321e824 Binary files /dev/null and b/web/htdocs/images/button_restore_lo.png differ diff --git a/web/htdocs/images/button_edithost_lo.png b/web/htdocs/images/icon_edit.png similarity index 100% rename from web/htdocs/images/button_edithost_lo.png rename to web/htdocs/images/icon_edit.png diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 345a205..bcaa15b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -719,7 +719,7 @@ def mode_folder(phase): global_buttons() if config.may("wato.rulesets") or config.may("wato.seeall"): html.context_button(_("Rulesets"), make_link([("mode", "rulesets")]), "rulesets") - html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "properties") + html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") if config.may("wato.manage_folders"): html.context_button(_("New folder"), make_link([("mode", "newfolder")]), "newfolder") if config.may("wato.manage_hosts"): @@ -935,7 +935,7 @@ def show_subfolders(folder): enter_url = make_link_to([("mode", "folder")], entry) html.write("<td class=buttons>") - icon_button(edit_url, _("Edit the properties of this folder"), "folderproperties") + icon_button(edit_url, _("Edit the properties of this folder"), "edit") if config.may("wato.manage_folders"): icon_button(delete_url, _("Delete this folder"), "delete") html.write("</td>") @@ -1085,7 +1085,7 @@ def show_hosts(folder): html.write('</td>\n') html.write("<td class=buttons>") - icon_button(edit_url, _("Edit the properties of this host"), "edithost") + icon_button(edit_url, _("Edit the properties of this host"), "edit") icon_button(services_url, _("Edit the services of this host, do an inventory"), "services") if config.may("wato.manage_hosts"): icon_button(clone_url, _("Create a clone of this host"), "insert") @@ -3992,10 +3992,10 @@ def mode_snapshot(phase): html.write('<tr class="data %s0"><td>' % odd) # Buttons - html.buttonlink(make_action_link( - [("mode","snapshot"),("_restore_snapshot", name)]), _("Restore")) - html.buttonlink(make_action_link( - [("mode","snapshot"),("_delete_file", name)]), _("Delete")) + icon_button(make_action_link( + [("mode","snapshot"),("_restore_snapshot", name)]), _("Restore"), "restore") + icon_button(make_action_link( + [("mode","snapshot"),("_delete_file", name)]), _("Delete"), "delete") html.write("<td>") # Snapshot name @@ -5206,8 +5206,8 @@ def mode_groups(phase, what): edit_url = make_link([("mode", "edit_%s_group" % what), ("edit", name)]) delete_url = html.makeactionuri([("_delete", name)]) html.write("<td class=buttons>") - html.buttonlink(edit_url, _("Properties")) - html.buttonlink(delete_url, _("Delete")) + icon_button(edit_url, _("Properties"), "edit") + icon_button(delete_url, _("Delete"), "delete") html.write("</td><td>%s</td><td>%s</td>" % (name, alias)) if what == "contact": html.write("<td>%s</td>" % ", ".join( @@ -5426,8 +5426,8 @@ def mode_timeperiods(phase): delete_url = html.makeactionuri([("_delete", name)]) html.write("<td class=buttons>") - html.buttonlink(edit_url, _("Properties")) - html.buttonlink(delete_url, _("Delete")) + icon_button(edit_url, _("Properties"), "edit") + icon_button(delete_url, _("Delete"), "delete") html.write("</td>") html.write("<td>%s</td>" % name) @@ -5873,8 +5873,8 @@ def mode_sites(phase): edit_url = make_link([("mode", "edit_site"), ("edit", id)]) delete_url = html.makeactionuri([("_delete", id)]) html.write("<td class=buttons>") - html.buttonlink(edit_url, _("Properties")) - html.buttonlink(delete_url, _("Delete")) + icon_button(edit_url, _("Properties"), "edit") + icon_button(delete_url, _("Delete"), "delete") # Alias html.write("</td><td>%s</td><td>%s</td>" % (id, site.get("alias", ""))) @@ -6934,8 +6934,8 @@ def mode_users(phase): edit_url = make_link([("mode", "edit_user"), ("edit", id)]) delete_url = html.makeactionuri([("_delete", id)]) html.write("<td class=buttons>") - html.buttonlink(edit_url, _("Properties")) - html.buttonlink(delete_url, _("Delete")) + icon_button(edit_url, _("Properties"), "edit") + icon_button(delete_url, _("Delete"), "delete") html.write("</td>") # ID @@ -7499,8 +7499,8 @@ def mode_roles(phase): edit_url = make_link([("mode", "edit_role"), ("edit", id)]) clone_url = html.makeactionuri([("_clone", id)]) delete_url = html.makeactionuri([("_delete", id)]) - html.buttonlink(edit_url, _("Properties")) - html.buttonlink(clone_url, _("Clone")) + icon_button(edit_url, _("Properties"), "edit") + icon_button(clone_url, _("Clone"), "clone") if not role.get("builtin"): html.buttonlink(delete_url, _("Delete")) html.write("</td>")

12 years, 7 months

Check_MK Git: check_mk: WATO: avoid restart on Multisite vars reset

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff2d6c78bc16dac2a5d8f5b3a16337b884cea2ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff2d6c78bc16da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 16 20:31:41 2011 +0100 WATO: avoid restart on Multisite vars reset --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d202562..345a205 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4949,7 +4949,7 @@ def mode_globalvars(phase): del current_settings[varname] save_configuration_settings(current_settings) msg = _("Resetted configuration variable %s to its default.") % varname - log_pending(SYNCRESTART, None, "edit-configvar", msg) + log_pending(need_restart and SYNCRESTART or SYNC, None, "edit-configvar", msg) return "globalvars", msg elif c == False: return ""

12 years, 7 months

Check_MK Git: check_mk: Multisite: show only most frequently used buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f242262e030adb5b6d74785728d1ad3da25d90f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f242262e030adb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 16 20:29:09 2011 +0100 Multisite: show only most frequently used buttons This feature can be disabled in multisite.mk --- ChangeLog | 2 + web/htdocs/check_mk.css | 10 +++++++- web/htdocs/config.py | 3 ++ web/htdocs/htmllib.py | 32 +++++++++++++++++++++++---- web/htdocs/images/contextlink_short.png | Bin 0 -> 633 bytes web/htdocs/images/contextlink_short_hi.png | Bin 0 -> 628 bytes web/htdocs/images/icon_notification.png | Bin 1173 -> 4609 bytes web/htdocs/images/icon_pnp.png | Bin 6115 -> 3063 bytes web/htdocs/js/check_mk.js | 23 ++++++++++++++++++++ web/htdocs/views.py | 26 +++++++++++++++------- web/plugins/pages/shipped.py | 1 + web/plugins/views/builtin.py | 17 ++++++++------ web/plugins/wato/check_mk_configuration.py | 18 +++++++++++++++ 13 files changed, 111 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f242262e03…

12 years, 7 months

Check_MK Git: check_mk: Multsite: cleanup context buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 705ad91f5f74861dd55acee58e0e5aa1162ab751 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=705ad91f5f7486… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 17:30:32 2011 +0100 Multsite: cleanup context buttons --- web/htdocs/htmllib.py | 9 +++++++- web/htdocs/views.py | 43 +++++++++++++++++++---------------------- web/plugins/views/builtin.py | 3 ++ 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0c1c0e6..9e49e1c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -169,6 +169,7 @@ class html: self.link_target = None self.form_name = None self.form_vars = [] + self.context_buttons_open = False def plugin_stylesheets(self): global plugin_stylesheets @@ -320,11 +321,17 @@ class html: def begin_context_buttons(self): self.write("<table class=contextlinks><tr><td>\n") + self.context_buttons_open = True def end_context_buttons(self): - self.write("</td></tr></table>\n") + if self.context_buttons_open: + self.write("</td></tr></table>\n") + self.context_buttons_open = False def context_button(self, title, url, icon=None, hot=False, id=None): + if not self.context_buttons_open: + self.begin_context_buttons() + if icon: title = '<img src="images/icon_%s.png">%s' % (icon, title) if id: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f663e03..6aae97f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1583,21 +1583,6 @@ def view_linktitle(view): def show_context_links(thisview, active_filters): - # Show button to WATO, if permissions allow this - if config.wato_enabled and config.may("wato.use"): - html.begin_context_buttons() - execute_hooks('buttons-begin') - first = False - host = html.var("host") - if host: - url = wato.api.link_to_host(host) - else: - url = wato.api.link_to_path(html.var("wato_folder", "")) - html.context_button(_("WATO"), url, "wato") - - else: - first = True - # compute list of html variables used actively by hidden or shown # filters. active_filter_vars = set([]) @@ -1606,6 +1591,23 @@ def show_context_links(thisview, active_filters): if html.has_var(var): active_filter_vars.add(var) + # html.begin_context_buttons() called automatically by html.context_button() + # That way if no button is painted we avoid the empty container + execute_hooks('buttons-begin') + + # WATO: If we have a host context, then show button to WATO, if permissions allow this + if "host" in active_filter_vars \ + and config.wato_enabled \ + and config.may("wato.use") \ + and (config.may("wato.hosts") or config.may("wato.seeall")): + host = html.var("host") + if host: + url = wato.api.link_to_host(host) + else: + url = wato.api.link_to_path(html.var("wato_folder", "")) + html.context_button(_("WATO"), url, "wato") + + # sort views after text of possible button (sort buttons after their text) sorted_views = [] for view in html.available_views.values(): @@ -1638,17 +1640,12 @@ def show_context_links(thisview, active_filters): # add context link to this view if len(used_contextvars): - if first: - first = False - html.begin_context_buttons() - execute_hooks('buttons-begin') vars_values = [ (var, html.var(var)) for var in set(used_contextvars) ] - html.context_button(linktitle, html.makeuri_contextless(vars_values + [("view_name", name)]), view.get("icon")) + html.context_button(linktitle, + html.makeuri_contextless(vars_values + [("view_name", name)]), view.get("icon")) execute_hooks('buttons-end') - - if not first: - html.end_context_buttons() + html.end_context_buttons() # Retrieve data via livestatus, convert into list of dicts, diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 661a083..375965f 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -551,6 +551,7 @@ multisite_builtin_views.update({ ('st3', 'on'), ('stp', '')], 'hidden': True, + 'hidebutton' : True, 'hide_filters': ['site', 'host'], 'layout': 'boxed', 'mustsearch': False, @@ -1165,6 +1166,7 @@ multisite_builtin_views.update({ 'hard_filtervars': [ ('is_summary_host', '0'),], 'hidden': True, + 'hidebutton': True, 'hide_filters': ['site'], 'layout': 'boxed', 'mustsearch': False, @@ -1759,6 +1761,7 @@ multisite_builtin_views.update({ ('host_check_command', ''), ('service_output', '')], 'hidden': True, + 'hidebutton': True, 'hide_filters': ['site'], 'layout': 'boxed', 'linktitle': _('Services of Site'),

12 years, 7 months

Check_MK Git: check_mk: Multisite: fixed checkboxes once more

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83d6a3177fcd7e509b47de26b9d0cdff33dc8878 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83d6a3177fcd7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 17:10:23 2011 +0100 Multisite: fixed checkboxes once more --- web/htdocs/htmllib.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b925afa..0c1c0e6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -439,11 +439,14 @@ class html: # between False and None. The browser does not set the variables for # Checkboxes that are not checked :-( def get_checkbox(self, varname, form_name = None): - if not self.has_var("filled_in") or ( # no form filled in + if self.has_var(varname): + return not not self.var(varname) + elif not self.has_var("filled_in") or ( # no form filled in self.form_name != None and self.var("filled_in") != self.form_name): # wrong form filled in return None else: - return not not self.req.vars.get(varname) + # Form filled in but variable missing -> Checkbox not checked + return False def datetime_input(self, varname, default_value): try:

12 years, 7 months

Check_MK Git: check_mk: Windows agent: make extensions to execute configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: becaf05fa4a8cf2fa8755d635cf6ac8416fb4b8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=becaf05fa4a8cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 16:44:31 2011 +0100 Windows agent: make extensions to execute configurable --- ChangeLog | 2 + agents/windows/check_mk.ini | 8 ++++++- agents/windows/check_mk_agent.cc | 40 +++++++++++++++++++++++++++++++++++- agents/windows/check_mk_agent.exe | Bin 101376 -> 101888 bytes 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8c8d5d..2d92ae1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,8 @@ for examples. * Windows agent: do not execute *.txt and *.dir in <<<plugins>>> and <<<local>>> + * Windows agent: make extensions to execute configurable (see + example check_mk.ini) * Windows agent: agent now reuses TCP port even when taskkill'ed, so a system reboot is (hopefully) not neccessary anymore * Windows agent: section <<<df>>> now also outputs junctions (windows diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index e208b6e..c156a0f 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -2,12 +2,18 @@ # Restrict access to certain IP addresses # only_from = 127.0.0.1 192.168.56.0/24 + # Do only execute programs and scripts with + # the following suffixes (in local and plugins). + # Per default all extensions except txt and dir + # are being executed. + # execute = exe bat vbs + # Restrict the following configuration variables # in [global] to the following hosts # host = winsrv* zab???ad # Just output certain sections (e.g. for upper hosts) - # sections = check_mk df + # sections = check_mk plugins df [winperf] diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7717858..e911a62 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -96,6 +96,7 @@ #define MAX_ONLY_FROM 32 #define MAX_WINPERF_COUNTERS 64 #define MAX_MRPE_COMMANDS 64 +#define MAX_EXECUTE_SUFFIXES 64 // Default buffer size for reading performance counters #define DEFAULT_BUFFER_SIZE 40960L @@ -191,6 +192,9 @@ unsigned int g_num_winperf_counters = 0; struct mrpe_entry g_mrpe_entries[MAX_MRPE_COMMANDS]; unsigned int g_num_mrpe_entries = 0; +// Configuration of execution suffixed +unsigned g_num_execute_suffixes = 0; +char *g_execute_suffixes[MAX_EXECUTE_SUFFIXES]; // .----------------------------------------------------------------------. // | _ _ _ | @@ -1320,8 +1324,20 @@ bool banned_exec_name(char *name) return false; char *extension = name + strlen(name) - 4; - return ( !strcasecmp(extension, ".dir") - || !strcasecmp(extension, ".txt")); + if (g_num_execute_suffixes) { + if (extension[0] != '.') + return true; + extension ++; + unsigned i; + for (i=0; i<g_num_execute_suffixes; i++) + if (!strcasecmp(extension, g_execute_suffixes[i])) + return false; + return true; + } + else{ + return ( !strcasecmp(extension, ".dir") + || !strcasecmp(extension, ".txt")); + } } void run_plugin(SOCKET &out, char *path) @@ -1795,12 +1811,30 @@ void parse_only_from(char *value) add_only_from(word); } +void parse_execute(char *value) +{ + // clean array if this options has been parsed already + while (g_num_execute_suffixes) + free(g_execute_suffixes[--g_num_execute_suffixes]); + + char *suffix; + while (0 != (suffix = next_word(&value))) { + if (g_num_execute_suffixes < MAX_EXECUTE_SUFFIXES) { + g_execute_suffixes[g_num_execute_suffixes++] = strdup(suffix); + } + } +} + bool handle_global_config_variable(char *var, char *value) { if (!strcmp(var, "only_from")) { parse_only_from(value); return true; } + else if (!strcmp(var, "execute")) { + parse_execute(value); + return true; + } else if (!strcmp(var, "sections")) { enabled_sections = 0; char *word; @@ -2326,6 +2360,8 @@ void cleanup() if (eventlog_buffer_size > 0) delete [] eventlog_buffer; unregister_all_eventlogs(); // frees a few bytes + while (g_num_execute_suffixes) + free(g_execute_suffixes[--g_num_execute_suffixes]); } void show_version() diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 19d8e36..e2e4994 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 7 months

Check_MK Git: check_mk: Remove obsolete icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b07e0065a21e98a0cb24e08eb3bc1cd7fc81079c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b07e0065a21e98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 16:10:44 2011 +0100 Remove obsolete icon --- web/htdocs/images/icon_downtime.gif | Bin 1071 -> 0 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_downtime.gif b/web/htdocs/images/icon_downtime.gif deleted file mode 100644 index 5cf9f45..0000000 Binary files a/web/htdocs/images/icon_downtime.gif and /dev/null differ

12 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011