Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

Disabled a few abstract-method warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 39a79d50686fd930b422e8a58528098a96f20153 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39a79d50686fd9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 10 13:24:29 2018 +0200 Disabled a few abstract-method warnings. Change-Id: Idf44a88577078b534f2c09b0d0d293b4f8ced20a --- cmk_base/data_sources/abstract.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index c7be076..cbc1f0a 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -554,6 +554,12 @@ class DataSource(object): class CheckMKAgentDataSource(DataSource): """Abstract base class for all data sources that work with the Check_MK agent data format""" + + # NOTE: This class is obviously still abstract, but pylint fails to see + # this, even in the presence of the meta class assignment below, see + # https://github.com/PyCQA/pylint/issues/179. + + # pylint: disable=abstract-method __metaclass__ = abc.ABCMeta def __init__(self, hostname, ipaddress): @@ -730,6 +736,12 @@ class CheckMKAgentDataSource(DataSource): class ManagementBoardDataSource(DataSource): """Abstract base class for all data sources that work with the management board configuration""" + + # NOTE: This class is obviously still abstract, but pylint fails to see + # this, even in the presence of the meta class assignment below, see + # https://github.com/PyCQA/pylint/issues/179. + + # pylint: disable=abstract-method __metaclass__ = abc.ABCMeta _for_mgmt_board = True

6 years, 2 months

Refactored mode_edit_user to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: bf352041b97aed60cc8d7126af11f2a3ef7dbddb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf352041b97aed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:23 2018 +0200 Refactored mode_edit_user to WatoMode Change-Id: I0b56bf33cce099193560ad7d780e0ef36feb384e --- web/htdocs/wato.py | 710 +++++++++++++++++++++++++++-------------------------- 1 file changed, 366 insertions(+), 344 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bf352041b9…

6 years, 2 months

Refactored notifications list to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 13316ecb49d8564b2fe9c56b0093e36918339127 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13316ecb49d856… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:18 2018 +0200 Refactored notifications list to WatoMode Change-Id: I27f1aea6655b8e4f82312dc770e290d85ef7c8ca --- web/htdocs/wato.py | 431 +++++++++++++++++++++++++++++------------------------ 1 file changed, 234 insertions(+), 197 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=13316ecb49…

6 years, 2 months

Refactored mode_editfolder to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a74b62568fa85c75c41e13660f9fd03154a38bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a74b62568fa85… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:45:58 2018 +0200 Refactored mode_editfolder to WatoMode Change-Id: I545e39133546358d8e74317ccb6b836a731bde37 --- web/htdocs/wato.py | 96 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 32 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dfc07f6..2a304f9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1243,50 +1243,44 @@ class ModeAjaxPopupMoveToFolder(WatoWebApiMode): # | creation of new folders. | # '----------------------------------------------------------------------' -def mode_editfolder(phase, new): - if new: - page_title = _("Create new folder") - name, title = None, None - else: - page_title = _("Folder properties") - name = watolib.Folder.current().name() - title = watolib.Folder.current().title() +class FolderMode(WatoMode): + __metaclass__ = abc.ABCMeta + def __init__(self): + super(FolderMode, self).__init__() + self._folder = self._init_folder() - if phase == "title": - return page_title + @abc.abstractmethod + def _init_folder(self): + # TODO: Needed to make pylint know the correct type of the return value. + # Will be cleaned up in future when typing is established + return watolib.Folder(name=None) - elif phase == "buttons": + + @abc.abstractmethod + def _save(self, title, attributes): + raise NotImplementedError() + + + def buttons(self): if html.has_var("backfolder"): back_folder = watolib.Folder.folder(html.var("backfolder")) else: - back_folder = watolib.Folder.current() + back_folder = self._folder html.context_button(_("Back"), back_folder.url(), "back") - elif phase == "action": + def action(self): if not html.check_transaction(): return "folder" # Title title = TextUnicode().from_html_vars("title") TextUnicode(allow_empty = False).validate_value(title, "title") - title_changed = not new and title != watolib.Folder.current().title() - - # OS filename - if new: - if not config.wato_hide_filenames: - name = html.var("name", "").strip() - watolib.check_wato_foldername("name", name) - else: - name = watolib.create_wato_foldername(title) attributes = watolib.collect_attributes("folder") - if new: - watolib.Folder.current().create_subfolder(name, title, attributes) - else: - watolib.Folder.current().edit(title, attributes) + self._save(title, attributes) # Edit icon on subfolder preview should bring user back to parent folder if html.has_var("backfolder"): @@ -1294,11 +1288,14 @@ def mode_editfolder(phase, new): return "folder" - else: + # TODO: Clean this method up! Split new/edit handling to sub classes + def page(self): + new = self._folder.name() is None + watolib.Folder.current().show_breadcrump() watolib.Folder.current().need_permission("read") - if not new and watolib.Folder.current().locked(): + if new and watolib.Folder.current().locked(): watolib.Folder.current().show_locking_information() html.begin_form("edit_host", method = "POST") @@ -1306,7 +1303,7 @@ def mode_editfolder(phase, new): # title forms.header(_("Title")) forms.section(_("Title")) - TextUnicode().render_input("title", title) + TextUnicode().render_input("title", self._folder.title()) html.set_focus("title") # folder name (omit this for root folder) @@ -1316,7 +1313,7 @@ def mode_editfolder(phase, new): if new: html.text_input("name") else: - html.write_text(name) + html.write_text(self._folder.name()) html.help(_("This is the name of subdirectory where the files and " "other folders will be created. You cannot change this later.")) @@ -1339,6 +1336,41 @@ def mode_editfolder(phase, new): html.end_form() + +class ModeEditFolder(FolderMode): + def _init_folder(self): + return watolib.Folder.current() + + + def title(self): + return _("Folder properties") + + + def _save(self, title, attributes): + self._folder.edit(title, attributes) + + + +class ModeCreateFolder(FolderMode): + def _init_folder(self): + return watolib.Folder(name=None) + + + def title(self): + return _("Create new folder") + + + def _save(self, title, attributes): + if not config.wato_hide_filenames: + name = html.var("name", "").strip() + watolib.check_wato_foldername("name", name) + else: + name = watolib.create_wato_foldername(title) + + watolib.Folder.current().create_subfolder(name, title, attributes) + + + class ModeAjaxSetFoldertree(WatoWebApiMode): def page(self): request = self.webapi_request() @@ -18539,8 +18571,8 @@ modes = { # ident, permissions, handler function "main" : ([], ModeMain), "folder" : (["hosts"], ModeFolder), - "newfolder" : (["hosts", "manage_folders"], lambda phase: mode_editfolder(phase, True)), - "editfolder" : (["hosts" ], lambda phase: mode_editfolder(phase, False)), + "newfolder" : (["hosts", "manage_folders"], ModeCreateFolder), + "editfolder" : (["hosts" ], ModeEditFolder), "newhost" : (["hosts", "manage_hosts"], lambda phase: mode_edit_host(phase, new=True, is_cluster=False)), "newcluster" : (["hosts", "manage_hosts"], lambda phase: mode_edit_host(phase, new=True, is_cluster=True)), "rename_host" : (["hosts", "manage_hosts"], mode_rename_host),

6 years, 2 months

Refactored ajax_set_foldertree call to WatoWebApiMode

by Lars Michelsen

Module: check_mk Branch: master Commit: fc52f1c77b8a02ef965e3caf35e1007008f1c781 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc52f1c77b8a02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:45:32 2018 +0200 Refactored ajax_set_foldertree call to WatoWebApiMode Change-Id: I3bb1aaa1fce85c071ca52a3bb0e46b21c54a1602 --- web/htdocs/wato.py | 6 ++++-- web/plugins/pages/wato.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 430ff78..71d6edf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1339,8 +1339,10 @@ def mode_editfolder(phase, new): html.end_form() -def ajax_set_foldertree(): - config.user.save_file("foldertree", (html.var('topic'), html.var('target'))) +class ModeAjaxSetFoldertree(WatoWebApiMode): + def page(self): + request = self.webapi_request() + config.user.save_file("foldertree", (request.get('topic'), request.get('target'))) #. diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 0c2992e..a4b4e68 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -37,7 +37,7 @@ register_handlers({ "noauth:automation" : wato.page_automation, "user_profile" : wato.page_user_profile, "user_change_pw" : lambda: wato.page_user_profile(change_pw=True), - "ajax_set_foldertree" : wato.ajax_set_foldertree, + "ajax_set_foldertree" : lambda: wato.ModeAjaxSetFoldertree().handle_page(), "wato_ajax_diag_host" : lambda: wato.ModeAjaxDiagHost().handle_page(), "wato_ajax_profile_repl" : watolib.ajax_profile_repl, "wato_ajax_execute_check" : lambda: wato.ModeAjaxExecuteCheck().handle_page(),

6 years, 2 months

Refactored user profile replication to WatoWebApiMode

by Lars Michelsen

Module: check_mk Branch: master Commit: cf845b2e317f9b2344255fa59194c7d449d0d0d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf845b2e317f9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:45:53 2018 +0200 Refactored user profile replication to WatoWebApiMode Change-Id: Ia0323fe9f8bc66c4037b9c029ab1994860d98380 --- web/htdocs/js/wato.js | 42 +++++++++++++++++++++++++++++++----------- web/htdocs/wato.py | 46 ++++++++++++++++++++++++++++++++++++++++++---- web/htdocs/watolib.py | 37 ------------------------------------- web/plugins/pages/wato.py | 3 +-- 4 files changed, 74 insertions(+), 54 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 4b95ef5..29d7283 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -886,8 +886,28 @@ function finish_activation() var profile_replication_progress = new Array(); function wato_do_profile_replication(siteid, est, progress_text) { - get_url("wato_ajax_profile_repl.py?site=" + siteid, - wato_profile_replication_result, siteid); + call_ajax("wato_ajax_profile_repl.py", { + response_handler : function (handler_data, response_json) { + var response = JSON.parse(response_json); + var success = response.result_code === 0; + var msg = response.result; + + set_profile_replication_result(handler_data["site_id"], success, msg); + }, + error_handler : function (handler_data, status_code, error_msg) { + set_profile_replication_result(handler_data["site_id"], False, + "Failed to perform profile replication [" + status_code + "]: " + error_msg); + }, + method : "POST", + post_data : "request=" + encodeURIComponent(JSON.stringify({ + "site": siteid + })), + handler_data : { + "site_id": siteid + }, + add_ajax_id : false + }); + profile_replication_progress[siteid] = 20; // 10 of 10 10ths setTimeout("profile_replication_step('"+siteid+"', "+est+", '"+progress_text+"');", est/20); } @@ -916,15 +936,15 @@ function profile_replication_step(siteid, est, progress_text) { } } -// g_num_replsites is set by the page code in wato.py to the number async jobs started -// in total -function wato_profile_replication_result(siteid, code) { - profile_replication_progress[siteid] = 0; - var oDiv = document.getElementById("site-" + siteid); - if (code[0] == "0") - profile_replication_set_status(siteid, 'repl_success', code.substr(2)); - else - profile_replication_set_status(siteid, 'repl_failed', code.substr(2)); +function set_profile_replication_result(site_id, success, msg) { + profile_replication_progress[site_id] = 0; + + var icon_name = success ? 'repl_success' : 'repl_failed'; + + profile_replication_set_status(site_id, icon_name, msg); + + // g_num_replsites is set by the page code in wato.py to the number async jobs started + // in total g_num_replsites--; if (0 == g_num_replsites) { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5eb0d43..dfc07f6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15017,10 +15017,10 @@ def user_profile_async_replication_page(): def user_profile_async_replication_dialog(sites): repstatus = watolib.load_replication_status() - html.message(_('In order to activate your changes available on all remote sites, your user profile needs ' - 'to be replicated to the remote sites. This is done on this page now. Each site ' - 'is being represented by a single image which is first shown gray and then fills ' - 'to green during synchronisation.')) + html.p(_('In order to activate your changes available on all remote sites, your user profile needs ' + 'to be replicated to the remote sites. This is done on this page now. Each site ' + 'is being represented by a single image which is first shown gray and then fills ' + 'to green during synchronisation.')) html.h3(_('Replication States')) html.open_div(id_="profile_repl") @@ -15278,6 +15278,44 @@ def page_user_profile(change_pw=False): html.footer() +class ModeAjaxProfileReplication(WatoWebApiMode): + """AJAX handler for asynchronous replication of user profiles (changed passwords)""" + + def page(self): + request = self.webapi_request() + + site_id = request.get("site") + if not site_id: + raise MKUserError(None, "The site_id is missing") + + if site_id not in config.sitenames(): + raise MKUserError(None, _("The requested site does not exist")) + + status = sites.state(site_id, {}).get("state", "unknown") + if status == "dead": + raise MKGeneralException(_('The site is marked as dead. Not trying to replicate.')) + + site = config.site(site_id) + result = self._synchronize_profile(site_id, site, config.user.id) + + if result != True: + watolib.add_profile_replication_change(site_id, result) + raise MKGeneralException(result) + + return _("Replication completed successfully.") + + + def _synchronize_profile(self, site_id, site, user_id): + users = userdb.load_users(lock = False) + if not user_id in users: + raise MKUserError(None, _('The requested user does not exist')) + + start = time.time() + result = watolib.push_user_profile_to_site(site, user_id, users[user_id]) + duration = time.time() - start + watolib.ActivateChanges().update_activation_time(site_id, watolib.ACTIVATION_TIME_PROFILE_SYNC, duration) + return result + #. # .--Agent-Output--------------------------------------------------------. # | _ _ ___ _ _ | diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 879179f..8ad01a4 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4525,43 +4525,6 @@ def push_user_profile_to_site(site, user_id, profile): return response -def synchronize_profile(site_id, site, user_id): - users = userdb.load_users(lock = False) - if not user_id in users: - raise MKUserError(None, _('The requested user does not exist')) - - start = time.time() - result = push_user_profile_to_site(site, user_id, users[user_id]) - duration = time.time() - start - ActivateChanges().update_activation_time(site_id, ACTIVATION_TIME_PROFILE_SYNC, duration) - return result - - -# AJAX handler for asynchronous replication of user profiles (changed passwords) -def ajax_profile_repl(): - site_id = html.var("site") - - status = sites.state(site_id, {}).get("state", "unknown") - if status == "dead": - result = _('The site is marked as dead. Not trying to replicate.') - - else: - site = config.site(site_id) - try: - result = synchronize_profile(site_id, site, config.user.id) - except Exception, e: - logger.exception() - result = "%s" % e - - if result == True: - answer = "0 %s" % _("Replication completed successfully.") - else: - answer = "1 %s" % (_("Error: %s") % result) - add_profile_replication_change(site_id, result) - - html.write(answer) - - # Add pending entry to make sync possible later for admins def add_profile_replication_change(site_id, result): add_change("edit-users", _('Profile changed (sync failed: %s)') % result, diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 3ea86c0..e13873c 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -25,7 +25,6 @@ # Boston, MA 02110-1301 USA. import wato -import watolib register_handlers({ "wato" : wato.page_handler, @@ -35,7 +34,7 @@ register_handlers({ "user_profile" : wato.page_user_profile, "user_change_pw" : lambda: wato.page_user_profile(change_pw=True), - "wato_ajax_profile_repl" : watolib.ajax_profile_repl, + "wato_ajax_profile_repl" : lambda: wato.ModeAjaxProfileReplication().handle_page(), "automation_login" : lambda: wato.ModeAutomationLogin().page(), "noauth:automation" : lambda: wato.ModeAutomation().page(),

6 years, 2 months

Refactored WATO automation pages to WatoModes

by Lars Michelsen

Module: check_mk Branch: master Commit: 29205ff39ad49c52fd02ebd42bef4a79714bd1ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29205ff39ad49c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:45:46 2018 +0200 Refactored WATO automation pages to WatoModes Change-Id: I765018e996997b66adca3a24b04fc28191ed3aec --- web/htdocs/wato.py | 169 ++++++++++++++++++++++++++++------------------ web/plugins/pages/wato.py | 7 +- 2 files changed, 107 insertions(+), 69 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 71d6edf..5eb0d43 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10792,40 +10792,77 @@ def sort_sites(sitelist): # | automation functions on slaves. | # '----------------------------------------------------------------------' -def page_automation_login(): - if not config.user.may("wato.automation"): - raise MKAuthException(_("This account has no permission for automation.")) - # When we are here, a remote (master) site has successfully logged in - # using the credentials of the administrator. The login is done be exchanging - # a login secret. If such a secret is not yet present it is created on - # the fly. - html.set_output_format("python") - html.write_html(repr(watolib.get_login_secret(True))) - - -def page_automation(): - secret = html.var("secret") - if not secret: - raise MKAuthException(_("Missing secret for automation command.")) - if secret != watolib.get_login_secret(): - raise MKAuthException(_("Invalid automation secret.")) - - # The automation page is accessed unauthenticated. After leaving the index.py area - # into the page handler we always want to have a user context initialized to keep - # the code free from special cases (if no user logged in, then...). So fake the - # logged in user here. - config.set_super_user() - - # To prevent mixups in written files we use the same lock here as for - # the normal WATO page processing. This might not be needed for some - # special automation requests, like inventory e.g., but to keep it simple, - # we request the lock in all cases. - watolib.lock_exclusive() +class ModeAutomationLogin(WatoMode): + """Is executed by the central Check_MK site during creation of the WATO master/slave sync to + + When the page method is execute a remote (master) site has successfully + logged in using valid credentials of an administrative user. The login is + done be exchanging a login secret. If such a secret is not yet present it + is created on the fly.""" + def page(self): + if not config.user.may("wato.automation"): + raise MKAuthException(_("This account has no permission for automation.")) + + html.set_output_format("python") + html.write_html(repr(watolib.get_login_secret(True))) + + + +class ModeAutomation(WatoMode): + """Executes the requested automation call + + This page is accessible without regular login. The request is authenticated using the given + login secret that has previously been exchanged during "site login" (see above). + """ + + def __init__(self): + super(ModeAutomation, self).__init__() + + # The automation page is accessed unauthenticated. After leaving the index.py area + # into the page handler we always want to have a user context initialized to keep + # the code free from special cases (if no user logged in, then...). So fake the + # logged in user here. + config.set_super_user() + + # To prevent mixups in written files we use the same lock here as for + # the normal WATO page processing. This might not be needed for some + # special automation requests, like inventory e.g., but to keep it simple, + # we request the lock in all cases. + watolib.lock_exclusive() + + init_wato_datastructures(with_wato_lock=False) + + + def _from_vars(self): + self._authenticate() + self._command = html.var("command") + + + def _authenticate(self): + secret = html.var("secret") + + if not secret: + raise MKAuthException(_("Missing secret for automation command.")) + + if secret != watolib.get_login_secret(): + raise MKAuthException(_("Invalid automation secret.")) + + + def page(self): + if self._command == "checkmk-automation": + self._execute_cmk_automation() + + elif self._command == "push-profile": + self._execute_push_profile() + + elif watolib.automation_command_exists(self._command): + self._execute_automation_command() + + else: + raise MKGeneralException(_("Invalid automation command: %s.") % self._command) - init_wato_datastructures(with_wato_lock=False) - command = html.var("command") - if command == "checkmk-automation": + def _execute_cmk_automation(self): cmk_command = html.var("automation") args = watolib.mk_eval(html.var("arguments")) indata = watolib.mk_eval(html.var("indata")) @@ -10835,56 +10872,56 @@ def page_automation(): # Don't use write_text() here (not needed, because no HTML document is rendered) html.write(repr(result)) - elif command == "push-profile": + + def _execute_push_profile(self): try: # Don't use write_text() here (not needed, because no HTML document is rendered) - html.write(watolib.mk_repr(automation_push_profile())) + html.write(watolib.mk_repr(self._automation_push_profile())) except Exception, e: logger.exception() if config.debug: raise html.write_text(_("Internal automation error: %s\n%s") % (e, traceback.format_exc())) - elif watolib.automation_command_exists(command): - try: - # Don't use write_text() here (not needed, because no HTML document is rendered) - html.write(repr(watolib.execute_automation_command(command))) - except Exception, e: - logger.exception() - if config.debug: - raise - html.write_text(_("Internal automation error: %s\n%s") % \ - (e, traceback.format_exc())) - else: - raise MKGeneralException(_("Invalid automation command: %s.") % command) + def _automation_push_profile(self): + site_id = html.var("siteid") + if not site_id: + raise MKGeneralException(_("Missing variable siteid")) -def automation_push_profile(): - site_id = html.var("siteid") - if not site_id: - raise MKGeneralException(_("Missing variable siteid")) + user_id = html.var("user_id") + if not user_id: + raise MKGeneralException(_("Missing variable user_id")) - user_id = html.var("user_id") - if not user_id: - raise MKGeneralException(_("Missing variable user_id")) + our_id = config.omd_site() - our_id = config.omd_site() + if our_id != None and our_id != site_id: + raise MKGeneralException( + _("Site ID mismatch. Our ID is '%s', but you are saying we are '%s'.") % + (our_id, site_id)) - if our_id != None and our_id != site_id: - raise MKGeneralException( - _("Site ID mismatch. Our ID is '%s', but you are saying we are '%s'.") % - (our_id, site_id)) + profile = html.var("profile") + if not profile: + raise MKGeneralException(_('Invalid call: The profile is missing.')) - profile = html.var("profile") - if not profile: - raise MKGeneralException(_('Invalid call: The profile is missing.')) + users = userdb.load_users(lock = True) + profile = watolib.mk_eval(profile) + users[user_id] = profile + userdb.save_users(users) - users = userdb.load_users(lock = True) - profile = watolib.mk_eval(profile) - users[user_id] = profile - userdb.save_users(users) + return True - return True + + def _execute_automation_command(self): + try: + # Don't use write_text() here (not needed, because no HTML document is rendered) + html.write(repr(watolib.execute_automation_command(self._command))) + except Exception, e: + logger.exception() + if config.debug: + raise + html.write_text(_("Internal automation error: %s\n%s") % \ + (e, traceback.format_exc())) #. diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index a4b4e68..3ea86c0 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -33,13 +33,14 @@ register_handlers({ "ajax_start_activation" : lambda: wato.ModeAjaxStartActivation().handle_page(), "ajax_activation_state" : lambda: wato.ModeAjaxActivationState().handle_page(), - "automation_login" : wato.page_automation_login, - "noauth:automation" : wato.page_automation, "user_profile" : wato.page_user_profile, "user_change_pw" : lambda: wato.page_user_profile(change_pw=True), + "wato_ajax_profile_repl" : watolib.ajax_profile_repl, + + "automation_login" : lambda: wato.ModeAutomationLogin().page(), + "noauth:automation" : lambda: wato.ModeAutomation().page(), "ajax_set_foldertree" : lambda: wato.ModeAjaxSetFoldertree().handle_page(), "wato_ajax_diag_host" : lambda: wato.ModeAjaxDiagHost().handle_page(), - "wato_ajax_profile_repl" : watolib.ajax_profile_repl, "wato_ajax_execute_check" : lambda: wato.ModeAjaxExecuteCheck().handle_page(), "fetch_agent_output" : lambda: wato.PageFetchAgentOutput().page(), "download_agent_output" : lambda: wato.PageDownloadAgentOutput().page(),

6 years, 2 months

Refactored mode_rename_host to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 35fbbc45576ddcfe360b6ff193726a70f8a7fa0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35fbbc45576ddc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:04 2018 +0200 Refactored mode_rename_host to WatoMode Change-Id: I90104d03580b06808b49d01bc4b9bb85555c5066 --- web/htdocs/wato.py | 70 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2a304f9..4823d76 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1908,26 +1908,28 @@ def HostnameRenaming(**kwargs): ]) -def mode_rename_host(phase): - host_name = html.var("host") - if not watolib.Folder.current().has_host(host_name): - raise MKGeneralException(_("You called this page with an invalid host name.")) +class ModeRenameHost(WatoMode): + def _from_vars(self): + host_name = html.var("host") - if not config.user.may("wato.rename_hosts"): - raise MKGeneralException(_("You don't have the right to rename hosts")) + if not watolib.Folder.current().has_host(host_name): + raise MKGeneralException(_("You called this page with an invalid host name.")) + if not config.user.may("wato.rename_hosts"): + raise MKGeneralException(_("You don't have the right to rename hosts")) - host = watolib.Folder.current().host(host_name) - host.need_permission("write") + self._host = watolib.Folder.current().host(host_name) + self._host.need_permission("write") - if phase == "title": - return _("Rename %s %s") % (_("Cluster") if host.is_cluster() else _("Host"), host_name) + def title(self): + return _("Rename %s %s") % (_("Cluster") if self._host.is_cluster() else _("Host"), self._host.name()) - elif phase == "buttons": + + def buttons(self): global_buttons() - html.context_button(_("Host Properties"), host.edit_url(), "back") + html.context_button(_("Host Properties"), self._host.edit_url(), "back") host_renaming_job = RenameHostsBackgroundJob() if host_renaming_job.is_available(): @@ -1937,9 +1939,8 @@ def mode_rename_host(phase): ("back_url", html.makeuri([])), ], filename="wato.py"), "background_job_details") - return - elif phase == "action": + def action(self): if watolib.get_number_of_pending_changes(): raise MKUserError("newname", _("You cannot rename a host while you have pending changes.")) @@ -1948,12 +1949,12 @@ def mode_rename_host(phase): c = wato_confirm(_("Confirm renaming of host"), _("Are you sure you want to rename the host <b>%s</b> into <b>%s</b>? " "This involves a restart of the monitoring core!") % - (host_name, newname)) + (self._host.name(), newname)) if c: # Creating pending entry. That makes the site dirty and that will force a sync of # the config to that site before the automation is being done. - host_renaming_job = RenameHostsBackgroundJob(title=_("Renaming of %s -> %s") % (host.name(), newname)) - renamings = [(watolib.Folder.current(), host.name(), newname)] + host_renaming_job = RenameHostsBackgroundJob(title=_("Renaming of %s -> %s") % (self._host.name(), newname)) + renamings = [(watolib.Folder.current(), self._host.name(), newname)] host_renaming_job.set_function(rename_hosts_background_job, renamings) host_renaming_job.start() job_id = host_renaming_job.get_job_id() @@ -1961,29 +1962,30 @@ def mode_rename_host(phase): job_details_url = html.makeuri_contextless([ ("mode", "background_job_details"), ("job_id", job_id), - ("back_url", host.folder().url()), + ("back_url", self._host.folder().url()), ], filename="wato.py") html.response.http_redirect(job_details_url) elif c == False: # not yet confirmed return "" - return - html.help(_("The renaming of hosts is a complex operation since a host's name is being " - "used as a unique key in various places. It also involves stopping and starting " - "of the monitoring core. You cannot rename a host while you have pending changes.")) - html.begin_form("rename_host", method="POST") - forms.header(_("Rename to host %s") % host_name) - forms.section(_("Current name")) - html.write_text(host_name) - forms.section(_("New name")) - html.text_input("newname", "") - forms.end() - html.set_focus("newname") - html.button("rename", _("Rename host!"), "submit") - html.hidden_fields() - html.end_form() + def page(self): + html.help(_("The renaming of hosts is a complex operation since a host's name is being " + "used as a unique key in various places. It also involves stopping and starting " + "of the monitoring core. You cannot rename a host while you have pending changes.")) + + html.begin_form("rename_host", method="POST") + forms.header(_("Rename host %s") % self._host.name()) + forms.section(_("Current name")) + html.write_text(self._host.name()) + forms.section(_("New name")) + html.text_input("newname", "") + forms.end() + html.set_focus("newname") + html.button("rename", _("Rename host!"), "submit") + html.hidden_fields() + html.end_form() def rename_host_in_folder(folder, oldname, newname): @@ -18575,7 +18577,7 @@ modes = { "editfolder" : (["hosts" ], ModeEditFolder), "newhost" : (["hosts", "manage_hosts"], lambda phase: mode_edit_host(phase, new=True, is_cluster=False)), "newcluster" : (["hosts", "manage_hosts"], lambda phase: mode_edit_host(phase, new=True, is_cluster=True)), - "rename_host" : (["hosts", "manage_hosts"], mode_rename_host), + "rename_host" : (["hosts", "manage_hosts"], ModeRenameHost), "bulk_rename_host" : (["hosts", "manage_hosts"], mode_bulk_rename_host), "bulk_import" : (["hosts", "manage_hosts"], ModeBulkImport), "host_attrs" : (["hosts", "manage_hosts"], ModeCustomHostAttrs),

6 years, 2 months

Refactored mode_bulk_rename_host to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 878c7f70a4b34f0bb1b8ed96dfdc74a55c806f2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=878c7f70a4b34f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 2 10:46:10 2018 +0200 Refactored mode_bulk_rename_host to WatoMode Change-Id: If6dfd9c90928e92498822a9f5f76bb0ec70d52fd --- web/htdocs/wato.py | 387 +++++++++++++++++++++++++++-------------------------- 1 file changed, 195 insertions(+), 192 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=878c7f70a4…

6 years, 2 months

6341 FIX Fixed "SyntaxError: invalid syntax" warning when installing bakery packages on older systems

by Lars Michelsen

Module: check_mk Branch: master Commit: a8123e4cb11f60b85e611aed34691aed5f952d81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8123e4cb11f60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 10 12:37:19 2018 +0200 6341 FIX Fixed "SyntaxError: invalid syntax" warning when installing bakery packages on older systems When installing agent bakery RPMs/DEBs an error message "SyntaxError: invalid syntax" could occur. This was caused by a pre-install script that should warn about incompatible Python versions. This script was incompatible to older Python versions, like Python 2.4. At least in case of the RPMs the installation did complete despite of this message. Change-Id: I208b4d92731e3d7bf63c1476468b4502c1c1e0c7 --- .werks/6341 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/6341 b/.werks/6341 new file mode 100644 index 0000000..86ee224 --- /dev/null +++ b/.werks/6341 @@ -0,0 +1,15 @@ +Title: Fixed "SyntaxError: invalid syntax" warning when installing bakery packages on older systems +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1531218870 + +When installing agent bakery RPMs/DEBs an error message "SyntaxError: invalid syntax" could occur. +This was caused by a pre-install script that should warn about incompatible Python versions. This +script was incompatible to older Python versions, like Python 2.4. + +At least in case of the RPMs the installation did complete despite of this message.

6 years, 2 months

← Newer
1
...
33
34
35
36
37
38
39
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018