Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 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: 107f3fae3c3eb143736a038bfafa2c2578a36544 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=107f3fae3c3eb1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 3 20:08:53 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 11 months

Check_MK Git: check_mk: WATO: fixed invalid download filename of wato snapshot

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2007ef1a513ffa562a7e98b003fd589abf8a5588 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2007ef1a513ffa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 3 20:08:44 2011 +0100 WATO: fixed invalid download filename of wato snapshot --- web/htdocs/wato.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2e50dfa..0af96ff 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3761,11 +3761,11 @@ def mode_snapshot(phase): return False download_file = snapshots[-1] - download_file = os.path.join(snapshot_dir, download_file) - if os.path.exists(download_file): + download_path = os.path.join(snapshot_dir, download_file) + if os.path.exists(download_path): html.req.headers_out['Content-Disposition'] = 'Attachment; filename=' + download_file html.req.headers_out['content_type'] = 'application/x-tar' - html.write(open(download_file).read()) + html.write(open(download_path).read()) return False # create snapshot

12 years, 11 months

Check_MK Git: check_mk: WATO: new debug function that creates random hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b8de26e42782b2da62fb481d8ec8aec01874bb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b8de26e42782b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 20:05:45 2011 +0100 WATO: new debug function that creates random hosts --- web/htdocs/images/icon_random.png | Bin 0 -> 3965 bytes web/htdocs/js/check_mk.js | 2 +- web/htdocs/wato.py | 92 ++++++++++++++++++++++++++++++++---- 3 files changed, 82 insertions(+), 12 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2b8de26e42…

12 years, 11 months

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: 339b07950b4c3558094c5a44c52e493484369d1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=339b07950b4c35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 20:05:55 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 11 months

Check_MK Git: check_mk: WATO: TextAttribute, new parameter size( default size=20)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e5650e2e19ce59eb2ea7d74a180d54110d634a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e5650e2e19ce5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 3 20:02:15 2011 +0100 WATO: TextAttribute, new parameter size(default size=20) --- web/htdocs/wato.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1105dda..2e50dfa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3175,10 +3175,11 @@ class Attribute: # A simple text attribute. It is stored in # a Python unicode string class TextAttribute(Attribute): - def __init__(self, name, title, help = None, default_value="", mandatory=False, allow_empty=True): + def __init__(self, name, title, help = None, default_value="", mandatory=False, allow_empty=True, size=20): Attribute.__init__(self, name, title, help, default_value) self._mandatory = mandatory self._allow_empty = allow_empty + self._size = size def paint(self, value, hostname): if not value: @@ -3192,7 +3193,7 @@ class TextAttribute(Attribute): def render_input(self, value): if value == None: value = "" - html.text_input("attr_" + self.name(), value) + html.text_input("attr_" + self.name(), value, size = self._size) def from_html_vars(self): value = html.var_utf8("attr_" + self.name())

12 years, 11 months

Check_MK Git: check_mk: WATO: small improvements on snapshot page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d42c19fb12c3637f22c6a0d23eaf824d74462094 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d42c19fb12c363… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 18:16:12 2011 +0100 WATO: small improvements on snapshot page --- web/htdocs/multitar.py | 6 +++- web/htdocs/wato.py | 75 +++++++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index 7f39a53..3db296f 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -82,7 +82,11 @@ def extract_from_file(filename, components): # Extract a tarball def extract(tar, components): for what, name, path in components: - subtarstream = tar.extractfile(name + ".tar") + try: + subtarstream = tar.extractfile(name + ".tar") + except: + pass # may be missing, e.g. sites.tar is only present + # if some sites have been created. if what == "dir": target_dir = path diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b9b8927..1105dda 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -735,18 +735,12 @@ def mode_folder(phase): if html.var("_delete_folder") and html.transaction_valid(): delname = html.var("_delete_folder") - if delname in g_folder[".folders"]: - del_folder = g_folder[".folders"][delname] - if len(del_folder[".folders"]) > 0: - raise MKUserError(None, _("The folder %s cannot be deleted, it still contains some subfolders.") - % del_folder["title"]) - config.need_permission("wato.manage_folders") - if True != check_folder_permissions(g_folder, "write", False): - raise MKAuthException(_("Sorry. In order to delete a folder you need write permissions to its " - "parent folder.")) - return delete_folder_after_confirm(del_folder) - else: - raise MKGeneralException(_("You called this page with a non-existing folder/file %s") % delname) + del_folder = g_folder[".folders"][delname] + config.need_permission("wato.manage_folders") + if True != check_folder_permissions(g_folder, "write", False): + raise MKAuthException(_("Sorry. In order to delete a folder you need write permissions to its " + "parent folder.")) + return delete_folder_after_confirm(del_folder) ### Operations on HOSTS @@ -1240,25 +1234,19 @@ def delete_hosts_after_confirm(hosts): def delete_folder_after_confirm(del_folder): msg = _("Do you really want to delete the folder %s?") % del_folder["title"] if not config.wato_hide_filenames: - msg += "<br>" + _("(The directory <tt>%s</tt>)") % folder_dir(del_folder) + msg += _(" Its directory is <tt>%s</tt>.") % folder_dir(del_folder) + num_hosts = num_hosts_in(del_folder) + if num_hosts: + msg += _(" The folder contains <b>%d</b> hosts, which will also be deleted!") % num_hosts c = wato_confirm(_("Confirm folder deletion"), msg) if c: mark_affected_sites_dirty(g_folder) del g_folder[".folders"][del_folder[".name"]] folder_path = folder_dir(del_folder) - try: - for ext in [ ".wato", "hosts.mk", "rules.mk" ]: - if os.path.exists(folder_path + "/" + ext): - os.remove(folder_path + "/" + ext) - 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) - - log_pending(AFFECTED, del_folder, "delete-folder", _("Deleted empty folder %s")% folder_dir(del_folder)) + shutil.rmtree(folder_path) + log_pending(AFFECTED, del_folder, "delete-folder", + _("Deleted empty folder %s")% folder_dir(del_folder)) call_hook_folder_deleted(del_folder) return "folder" elif c == False: # not yet confirmed @@ -3763,7 +3751,7 @@ def mode_snapshot(phase): if html.has_var("_download_file"): download_file = html.var("_download_file") if not download_file.startswith('wato-snapshot') and download_file != 'latest': - raise MKUserError(None, _("Invalid download file specified")) + raise MKUserError(None, _("Invalid download file specified.")) # Find the latest snapshot file if download_file == 'latest': @@ -3786,14 +3774,16 @@ def mode_snapshot(phase): return None, _("Created snapshot <tt>%s</tt>.") % filename else: return None + # upload snapshot elif html.has_var("_upload_file"): if html.var("_upload_file") == "": - raise MKUserError(None, _("You need to select a file for upload")) + raise MKUserError(None, _("Please select a file for upload.")) return None if html.check_transaction(): multitar.extract_from_buffer(html.var("_upload_file"), backup_paths) - log_pending(SYNCRESTART, None, "snapshot-restored", _("Restored from uploaded file")) + log_pending(SYNCRESTART, None, "snapshot-restored", + _("Restored from uploaded file")) return None, _("Successfully restored configuration.") else: return None @@ -3801,7 +3791,7 @@ def mode_snapshot(phase): # delete file elif html.has_var("_delete_file"): delete_file = html.var("_delete_file") - c = wato_confirm(_("Confirm delete snapshot"), + c = wato_confirm(_("Confirm deletion of snapshot"), _("Are you sure you want to delete the snapshot <br><br>%s?") % delete_file ) @@ -3823,8 +3813,9 @@ def mode_snapshot(phase): ) if c: multitar.extract_from_file(snapshot_dir + snapshot_file, backup_paths) - log_pending(SYNCRESTART, None, "snapshot-restored", _("Restored snapshot %s") % snapshot_file) - return None, _("Successfully restored Snapshot.") + log_pending(SYNCRESTART, None, "snapshot-restored", + _("Restored snapshot %s") % snapshot_file) + return None, _("Successfully restored snapshot.") elif c == False: # not yet confirmed return "" else: @@ -3842,17 +3833,35 @@ def mode_snapshot(phase): else: html.write('<table class=data>') html.write('<h3>' + _("Snapshots") + '</h3>') + html.write("<tr>") + html.write("<th>%s</th>" % _("Actions")) + html.write("<th>%s</th>" % _("Filename")) + html.write("<th>%s</th>" % _("Age")) + html.write("</tr>") odd = "odd" for name in snapshots: odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0"><td>' % odd) - html.buttonlink(make_action_link([("mode","snapshot"),("_restore_snapshot", name)]), _("Restore")) - html.buttonlink(make_action_link([("mode","snapshot"),("_delete_file", name)]), _("Delete")) + + # Buttons + html.buttonlink(make_action_link( + [("mode","snapshot"),("_restore_snapshot", name)]), _("Restore")) + html.buttonlink(make_action_link( + [("mode","snapshot"),("_delete_file", name)]), _("Delete")) html.write("<td>") + + # Snapshot name html.write('<a href="%s">%s</a>' % (make_action_link([("mode","snapshot"),("_download_file", name)]), name)) + + # Age + html.write("<td class=number>") + age = time.time() - os.stat(snapshot_dir + name).st_mtime + html.write(html.age_text(age)) + html.write("</td>") html.write('</table>') + html.write("<h3>" + _("Restore from uploaded file") + "</h3>") html.begin_form("upload_form", None, "POST") html.upload_file("_upload_file")

12 years, 11 months

Check_MK Git: check_mk: WATO: make check period configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c854a583d2ed03fc723cc59a9b7ade9822fc0310 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c854a583d2ed03… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 16:56:41 2011 +0100 WATO: make check period configurable --- web/plugins/wato/check_mk_configuration.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d7f74c1..8d72eeb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -505,6 +505,25 @@ register_rule(group, "as the 'service time'.")), itemtype = "service") +register_rule(group, + "extra_host_conf:check_period", + TimeperiodSelection( + title = _("Check period for hosts"), + help = _("If you specify a check period for a host then active checks of that " + "host will only take place within that period. In the rest of the time " + "the state of the host will stay at its last status.")), + ) + +register_rule(group, + "extra_service_conf:check_period", + TimeperiodSelection( + title = _("Check period for services"), + help = _("If you specify a notification period for a service then active checks " + "of that service will only be done in that period. Please note, that the " + "checks driven by Check_MK are passive checks and are not affected by this " + "rule. You can use the rule for the active Check_MK check, however.")), + itemtype = "service") + class MonitoringIcon(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs)

12 years, 11 months

Check_MK Git: check_mk: WATO: inhibit deletion of used timeperiods

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eadec49a85a0257c3c1b118c6959146e4de4b801 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eadec49a85a025… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 16:57:00 2011 +0100 WATO: inhibit deletion of used timeperiods --- web/htdocs/wato.py | 65 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 13 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7718e56..b9b8927 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5206,19 +5206,29 @@ def mode_timeperiods(phase): if phase == "action": delname = html.var("_delete") - c = wato_confirm(_("Confirm deletion of time period %s") % delname, - _("Do you really want to delete the time period '%s'? If it " - "is still in use by an object, you will not be able to " - "activate your changed configuration?") % delname) - if c: - del timeperiods[delname] - save_timeperiods(timeperiods) - log_pending(SYNCRESTART, None, "edit-timeperiods", _("Deleted timeperiod %s") % delname) - return None - elif c == False: - return "" - else: - return None + if html.transaction_valid(): + usages = find_usage_of_timeperiod(delname) + if usages: + message = "<b>%s</b><br>%s:<ul>" % \ + (_("You cannot delete this timeperiod."), + _("It is still in use by")) + for title, link in usages: + message += '<li><a href="%s">%s</a></li>\n' % (link, title) + message += "</ul>" + raise MKUserError(None, message) + + c = wato_confirm(_("Confirm deletion of time period %s") % delname, + _("Do you really want to delete the time period '%s'? I've checked it: " + "it is not being used by any rule or user profile right now.") % delname) + if c: + del timeperiods[delname] + save_timeperiods(timeperiods) + log_pending(SYNCRESTART, None, "edit-timeperiods", _("Deleted timeperiod %s") % delname) + return None + elif c == False: + return "" + else: + return None html.write("<h3>" + _("Timeperiod definitions") + "</h3>") @@ -5498,6 +5508,35 @@ class TimeperiodSelection(ElementSelection): elements = dict([ (name, "%s - %s" % (name, tp["alias"])) for (name, tp) in timeperiods.items() ]) return elements +# Check if a timeperiod is currently in use and cannot be deleted +# Returns a list of occurrances. +# Possible usages: +# - user accounts (notification period) +# - rules: service/host-notification/check-period +def find_usage_of_timeperiod(tpname): + + # Part 1: Rules + used_in = [] + for varname, ruleset in load_all_rulesets().items(): + rulespec = g_rulespecs[varname] + if isinstance(rulespec.get("valuespec"), TimeperiodSelection): + for folder, rule in ruleset: + value, tag_specs, host_list, item_list = parse_rule(rulespec, rule) + if value == tpname: + used_in.append(("%s: %s" % (_("Ruleset"), g_rulespecs[varname]["title"]), + make_link([("mode", "edit_ruleset"), ("varname", varname)]))) + break + + # Part 2: Users + for userid, user in load_users().items(): + tp = user.get("notification_period") + if tp == tpname: + used_in.append(("%s: %s" % (_("User"), userid), + make_link([("mode", "edit_user"), ("edit", userid)]))) + + return used_in + + #. # .-Sites----------------------------------------------------------------. # | ____ _ _ |

12 years, 11 months

Check_MK Git: check_mk: Remote <br> from permission helps

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 894a923c70ae2c56a470492306c1023ee13e8ef6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=894a923c70ae2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 13:40:04 2011 +0100 Remote <br> from permission helps --- web/htdocs/config.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index d660047..0720f79 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -165,7 +165,7 @@ declare_permission("edit_permissions", declare_permission("see_all", "See all Nagios objects", - "See all objects regardless of contacts and contact groups. If combined<br>with 'perform commands' then commands may be done on all objects.", + "See all objects regardless of contacts and contact groups. If combined with 'perform commands' then commands may be done on all objects.", [ "admin", "guest" ]) declare_permission("edit_views", @@ -185,24 +185,24 @@ declare_permission("force_views", declare_permission("view_option_columns", "Change view display columns", - "Interactively change the number of columns being displayed by a view<br>(does not edit or customize the view)", + "Interactively change the number of columns being displayed by a view (does not edit or customize the view)", [ "admin", "user", "guest" ]) declare_permission("view_option_refresh", "Change view display refresh", - "Interactively change the automatic browser reload of a view being displayed<br>(does not edit or customize the view)", + "Interactively change the automatic browser reload of a view being displayed (does not edit or customize the view)", [ "admin", "user" ]) declare_permission("painter_options", "Change column display options", - "Some of the display columns offer options for customizing their output.<br>" - "For example time stamp columns can be displayed absolute, relative or<br>" + "Some of the display columns offer options for customizing their output. " + "For example time stamp columns can be displayed absolute, relative or " "in a mixed style. This permission allows the user to modify display options", [ "admin", "user", "guest" ]) declare_permission("act", "Perform commands", - "Allows users to perform Nagios commands. If now futher permissions are granted,<br>actions can only be done one objects one is a contact for", + "Allows users to perform Nagios commands. If now futher permissions are granted, actions can only be done one objects one is a contact for", [ "admin", "user" ])

12 years, 11 months

Check_MK Git: check_mk: Multisite: correctly show dead Livestatus connections

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a6e691379ace0507377e217d39ac00bed5cddd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a6e691379ace0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 14:07:38 2011 +0100 Multisite: correctly show dead Livestatus connections in case the connect fails and there is no status host. --- web/htdocs/index.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 8146d3a..095a8fa 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -128,7 +128,10 @@ def connect_to_livestatus(html): html.site_status[sitename]["exception"] = deadinfo["exception"] shs = deadinfo.get("status_host_state") html.site_status[sitename]["status_host_state"] = shs - statename = { 1:"down", 2:"unreach", 3:"waiting", }.get(shs, "unknown") + if shs == None: + statename = "dead" + else: + statename = { 1:"down", 2:"unreach", 3:"waiting", }.get(shs, "unknown") html.site_status[sitename]["state"] = statename else:

12 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011