Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Fixed broken nagvis maps snapin; nagvis_base_url config option is now obsolete

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d34533b7481559ffa1e8b1aefea58af5a33c9a98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d34533b7481559… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 16:46:01 2011 +0100 Fixed broken nagvis maps snapin; nagvis_base_url config option is now obsolete --- web/plugins/sidebar/nagvis_maps.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/nagvis_maps.py b/web/plugins/sidebar/nagvis_maps.py index 8341d46..1c7daf1 100644 --- a/web/plugins/sidebar/nagvis_maps.py +++ b/web/plugins/sidebar/nagvis_maps.py @@ -33,8 +33,7 @@ import views, defaults def render_nagvis_maps(): - refresh_url = "%s/server/core/ajax_handler.php?mod=Multisite&act=getMaps" % \ - (defaults.url_prefix, nagvis_base_url) + refresh_url = "%snagvis/server/core/ajax_handler.php?mod=Multisite&act=getMaps" % (defaults.url_prefix) return refresh_url sidebar_snapins["nagvis_maps"] = {

12 years, 6 months

Check_MK Git: check_mk: NagVis permissions are now written when enabled via multisite option " wato_write_nagvis_auth"

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 37d1ad17af3b5776fc577b58113095fd71494fcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d1ad17af3b57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 16:47:13 2011 +0100 NagVis permissions are now written when enabled via multisite option "wato_write_nagvis_auth" --- web/htdocs/config.py | 2 + web/htdocs/wato.py | 22 ++++++++----- web/plugins/wato/nagvis_auth.py | 65 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 8 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 392ce4e..efb81ee 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -563,6 +563,8 @@ wato_max_snapshots = 50 wato_num_hostspecs = 12 wato_num_itemspecs = 15 +wato_write_nagvis_auth = False + # ____ ___ # | __ )_ _| diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ffab9ae..933ab78 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -857,11 +857,17 @@ def check_host_permissions(hostname, exception=True): return reason -def check_folder_permissions(folder, how, exception=True): - if config.may("wato.all_folders"): - return True - if how == "read" and config.may("wato.see_all_folders"): - return True +def check_folder_permissions(folder, how, exception=True, user = None): + if not user: + if config.may("wato.all_folders"): + return True + if how == "read" and config.may("wato.see_all_folders"): + return True + else: + if config.user_may(user, "wato.all_folders"): + return True + if how == "read" and config.user_may(user, "wato.see_all_folders"): + return True # Get contact groups of that folder effective = effective_attributes(None, folder) @@ -7610,7 +7616,7 @@ def save_users(profiles): # Call the users_saved hook try: - call_hook_users_saved() + call_hook_users_saved(users) except Exception, e: if config.debug: raise @@ -9862,9 +9868,9 @@ def call_hook_activate_changes(): call_hooks("activate-changes", collect_hosts(g_root_folder)) # This hook is executed when the save_users() function is called -def call_hook_users_saved(): +def call_hook_users_saved(users): if hook_registered('users-saved'): - call_hooks("users-saved") + call_hooks("users-saved", users) #. diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py new file mode 100644 index 0000000..a3bf39b --- /dev/null +++ b/web/plugins/wato/nagvis_auth.py @@ -0,0 +1,65 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Generate the permissions file for the multisite authorization module +def generate_auth_file(users): + import json + + auth_file = '%s/etc/nagvis/auth.multisite' % defaults.omd_root + + # + # 0. Data gathering - populate g_target_maps list + # + process_tree(api.get_folder_tree()) + + # + # 1. Write out the user permissions file + # + nagvis_users = {} + + for username, user in users.items(): + if not username in nagvis_users: + nagvis_users[username] = { 'permissions': [] } + + if 'language' in user: + nagvis_users[username]['language'] = user['language'] + + #if user_may(username, ''): + + # WATO folder relatived permissions + for mapname, wato_folder in g_target_maps.iteritems(): + if check_folder_permissions(wato_folder, 'read', False, user = username): + nagvis_users[username]['permissions'].append(('Map', 'view', mapname)) + + if check_folder_permissions(wato_folder, 'write', False, user = username): + nagvis_users[username]['permissions'].append(('Map', 'edit', mapname)) + + file(auth_file, 'w').write(json.dumps(nagvis_users)) + +# Only register this hook when configured to do so +# This works only in OMD for the moment +if config.wato_write_nagvis_auth and defaults.omd_root: + api.register_hook('users-saved', generate_auth_file)

12 years, 6 months

Check_MK Git: check_mk: Language of user is now configurable by admin; Added users-saved hook

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5c6e80752523a031dfdd845b35d57b68017cd471 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c6e80752523a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 15:28:43 2011 +0100 Language of user is now configurable by admin; Added users-saved hook --- web/htdocs/lib.py | 15 ++++++++ web/htdocs/login.py | 19 +--------- web/htdocs/wato.py | 35 ++++++++++++++++++++ web/plugins/views/nagvis.py | 76 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 17 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 688470a..92bd4e9 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -117,6 +117,21 @@ def load_web_plugins(forwhat, globalvars): if fn.endswith(".py"): execfile(local_plugins_path + "/" + fn, globalvars) +def get_languages(): + languages = [] + dirs = [ defaults.locale_dir ] + if defaults.omd_root: + dirs.append(defaults.omd_root + "/local/share/check_mk/locale") + + for lang_dir in dirs: + try: + languages += [ (val, val) for val in os.listdir(lang_dir) if not '.' in val ] + except OSError: + # Catch "OSError: [Errno 2] No such file or directory:" when directory not exists + pass + + return languages + def pnp_cleanup(s): return s \ .replace(' ', '_') \ diff --git a/web/htdocs/login.py b/web/htdocs/login.py index a8b1185..629dbc5 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -248,21 +248,6 @@ def page_logout(): html.set_http_header('Location', defaults.url_prefix + 'check_mk/') raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY -def get_languages(): - languages = [] - dirs = [ defaults.locale_dir ] - if defaults.omd_root: - dirs.append(defaults.omd_root + "/local/share/check_mk/locale") - - for lang_dir in dirs: - try: - languages += [ (val, val) for val in os.listdir(lang_dir) if not '.' in val ] - except OSError: - # Catch "OSError: [Errno 2] No such file or directory:" when directory not exists - pass - - return languages - def page_edit_profile(): html.header(_("Edit user profile")) @@ -282,7 +267,7 @@ def page_edit_profile(): # if config.may('edit_profile'): # Set the users language if requested - language = html.var('lang') + language = html.var('language') if language and language != config.get_language(): # Set custom language users[config.user_id]['language'] = language @@ -332,7 +317,7 @@ def page_edit_profile(): html.write("</td><td class=content>") default_label = _('Default (%s)') % config.default_language languages = [ ('', default_label) ] + languages - html.select("lang", languages, config.get_language(default_label)) + html.select("language", languages, config.get_language(default_label)) html.set_focus("lang") html.write("</td></tr>") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fd51453..ffab9ae 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7223,6 +7223,14 @@ def mode_edit_user(phase): # Roles new_user["roles"] = filter(lambda role: html.get_checkbox("role_" + role), roles.keys()) + + # Language configuration + language = html.var('language') + if language and language != config.default_language: + new_user['language'] = language + elif not language and 'language' in new_user: + del new_user['language'] + # Contact groups cgs = [] for c in contact_groups: @@ -7427,6 +7435,18 @@ def mode_edit_user(phase): html.write("</ul>") html.write("</td></tr>") + languages = get_languages() + if languages: + html.write("<tr><td class=legend>") + html.write(_("Language") + _(' Configure the default language ' + 'to be used in the multisite GUI.')) + html.write("</td><td class=content>") + default_label = _('Default (%s)') % config.default_language + languages = [ ('', default_label) ] + languages + html.select("language", languages, config.get_language(default_label)) + html.write("</td></tr>") + + # TODO: Later we could add custom macros here, which # then could be used for notifications. On the other hand, # if we implement some check_mk --notify, we could directly @@ -7588,6 +7608,15 @@ def save_users(profiles): elif os.path.exists(auth_file): os.remove(auth_file) + # Call the users_saved hook + try: + call_hook_users_saved() + except Exception, e: + if config.debug: + raise + else: + raise MKUserError(None, "Error executing hooks: %s" % str(e)) + #. # .-Roles----------------------------------------------------------------. # | ____ _ | @@ -9832,6 +9861,12 @@ def call_hook_activate_changes(): if hook_registered('activate-changes'): call_hooks("activate-changes", collect_hosts(g_root_folder)) +# This hook is executed when the save_users() function is called +def call_hook_users_saved(): + if hook_registered('users-saved'): + call_hooks("users-saved") + + #. # .-Helpers--------------------------------------------------------------. # | _ _ _ | diff --git a/web/plugins/views/nagvis.py b/web/plugins/views/nagvis.py new file mode 100644 index 0000000..d001fb7 --- /dev/null +++ b/web/plugins/views/nagvis.py @@ -0,0 +1,76 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Vorgehen: +# +# Es gibt eine Sektion mit NagVis spezifischen Berechtigungen. Die meißten NagVis +# internen Rechte wirken implizit. +# +# Im Multisite gibt es zwei Wege Nutzer zu berechtigen. Zunächst können pro Rolle +# die allgemeinen Rechte gesetzt werden. Das ist z.B. Full Access auf alles. +# +# Dann gibt es noch die Berechtigungen, die sich auf die WATO Folder Maps beziehen. +# Wir nehmn dazu einfach die Berechtigungen, die eh schon auf dem Folder liegen. +# Im Folder sind die Contactgroups definiert. Aus diesen wird dann die Berechtigung +# auf dem Folder abgeleitet. +# +# Auf WATO Ebene bedeutet die Zuordnung eine Contactgroup, dass diese Nutzer die +# Hosts via WATO editieren können. Also kann man daraus auch ableten, dass diese +# Nutzer die Maps in diesem Folder editieren dürfen. +# +# Wie werden die Anzeige-Berechtigungen geregelt? + +config.declare_permission_section('nagvis', _('NagVis')) + +config.declare_permission( + 'nagvis.*_*_*', + _('Full access'), + _('This permission grants full access to NagVis.'), + [ 'admin' ] +) + +config.declare_permission( + 'nagvis.Map_view_*', + _('View all maps'), + _('Grants read access to all maps.'), + [ 'guest' ] +) + +config.declare_permission( + 'nagvis.Map_edit_*', + _('Edit all maps'), + _('Grants modify access to all maps.'), + [] +) + +config.declare_permission( + 'nagvis.Map_delete_*', + _('Delete all maps'), + _('Permits to delete all maps.'), + [] +) + +# FIXME: Weitere permissions ergänzen

12 years, 6 months

Check_MK Git: check_mk: Changed user language to be stored in wato user store; Added permissions for profile/password change

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bc4742f855e89ecfc5376290962dc1915e27c3b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc4742f855e89e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 14:34:36 2011 +0100 Changed user language to be stored in wato user store; Added permissions for profile/password change --- web/htdocs/config.py | 49 ++++++++++++--------------- web/htdocs/index.py | 37 ++++++++------------ web/htdocs/login.py | 86 +++++++++++++++++++++++++------------------------ web/htdocs/sidebar.py | 6 ++- web/htdocs/wato.py | 22 ++++++++---- 5 files changed, 99 insertions(+), 101 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bc4742f855…

12 years, 6 months

Check_MK Git: check_mk: htmllib: Initialize mobile flag

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1da6ad8de2d0b477ded72978867ba20f876ffe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1da6ad8de2d0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 11:20:47 2011 +0100 htmllib: Initialize mobile flag --- web/htdocs/htmllib.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d7f59b4..c888114 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -172,6 +172,7 @@ class html: self.form_name = None self.form_vars = [] self.context_buttons_open = False + self.mobile = False def plugin_stylesheets(self): global plugin_stylesheets

12 years, 6 months

Check_MK Git: check_mk: Implemented user profile management page

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3744abf1c1504700bbef64d74ceb61168f64de54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3744abf1c15047… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 5 10:59:11 2011 +0100 Implemented user profile management page New page for changing the user password and the default language (if available) --- ChangeLog | 2 + web/htdocs/config.py | 29 +++++++- web/htdocs/images/sidebar_profile_hi.png | Bin 0 -> 848 bytes web/htdocs/images/sidebar_profile_lo.png | Bin 0 -> 957 bytes web/htdocs/index.py | 44 +++++++----- web/htdocs/login.py | 114 +++++++++++++++++++++++++++++- web/htdocs/sidebar.css | 12 +++- web/htdocs/sidebar.py | 3 +- web/htdocs/wato.py | 14 +--- web/plugins/pages/shipped.py | 1 + 10 files changed, 185 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3744abf1c1…

12 years, 6 months

Check_MK Git: check_mk: Further restructuration of commands

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 550b999ce33b66f7a39506909f58be474beef717 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=550b999ce33b66… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Dec 1 20:40:47 2011 +0100 Further restructuration of commands --- web/htdocs/views.py | 69 ++++------------------------ web/plugins/views/commands.py | 103 ++++++++++++++++++++++++++++++++++------ 2 files changed, 96 insertions(+), 76 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e5861f0..86cd034 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -60,18 +60,10 @@ def load_plugins(): loaded_with_language = current_language config.declare_permission_section("action", _("Commands on host and services")) - config.declare_permission("action.enablechecks", - _("Enable/disable checks"), - _("Enable and disable active or passive checks on hosts and services"), - [ "admin" ]) config.declare_permission("action.clearmodattr", _("Clear modified attributes"), _("Remove the information that an attribute (like check enabling) has been changed"), [ "admin" ]) - config.declare_permission("action.reschedule", - _("Reschedule checks"), - _("Reschedule host and service checks"), - [ "user", "admin" ]) config.declare_permission("action.fakechecks", _("Fake check results"), _("Manually submit check results for host and service checks"), @@ -2002,29 +1994,6 @@ def show_comment_actions(): def show_host_service_actions(what): - # if config.may("action.notifications"): - # html.write("<tr><td class=legend>"+_('Notifications')+"</td>\n" - # "<td class=content>\n" - # "<input type=submit name=_enable_notifications value=\""+_('Enable')+"\"> " - # "<input type=submit name=_disable_notifications value=\""+_('Disable')+"\">" - # "</td></tr>\n") - - if config.may("action.enablechecks") or config.may("action.reschedule"): - html.write("<tr><td class=legend>"+_('Active checks')+"</td>\n" - "<td class=content>\n") - if config.may("action.enablechecks"): - html.write("<input type=submit name=_enable_checks value=\""+_('Enable')+"\"> " - "<input type=submit name=_disable_checks value=\""+_('Disable')+"\"> ") - if config.may("action.reschedule"): - html.write("<input type=submit name=_resched_checks value=\""+_('Reschedule next check now')+"\">\n" - "</td></tr>\n") - - if config.may("action.enablechecks"): - html.write("<tr><td class=legend>"+_('Passive checks')+"</td>\n" - "<td class=content>\n") - html.write("<input type=submit name=_enable_passive_checks value=\""+_('Enable')+"\"> " - "<input type=submit name=_disable_passive_checks value=\""+_('Disable')+"\">" - "</td></tr>\n") if config.may("action.clearmodattr"): html.write("<tr><td class=legend>"+_('Modified attributes')+"</td>\n" @@ -2155,38 +2124,18 @@ def nagios_host_service_action_command(what, dataset): else: raise MKInternalError(_("Sorry, no actions possible on table %s") % tablename) - if html.var("_enable_notifications") and config.may("action.notifications"): - command = "ENABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec - title = _("enable notifications for") - - elif html.var("_disable_notifications") and config.may("action.notifications"): - command = "DISABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec - title = _("disable notifications for") - - elif html.var("_enable_checks") and config.may("action.enablechecks"): - command = "ENABLE_" + cmdtag + "_CHECK;%s" % spec - title = _("enable active checks of") - - elif html.var("_disable_checks") and config.may("action.enablechecks"): - command = "DISABLE_" + cmdtag + "_CHECK;%s" % spec - title = _("disable active checks of") - - elif html.var("_enable_passive_checks") and config.may("action.enablechecks"): - command = "ENABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec - title = _("enable passive checks of") - - elif html.var("_disable_passive_checks") and config.may("action.enablechecks"): - command = "DISABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec - title = _("disable passive checks of") + command = None + for cmd in multisite_commands: + if config.may(cmd["permission"]): + result = cmd["action"](cmdtag, spec) + if result: + command, title = result + break - elif html.var("_clear_modattr") and config.may("action.clearmodattr"): + if html.var("_clear_modattr") and config.may("action.clearmodattr"): command = "CHANGE_" + cmdtag + "_MODATTR;%s;0" % spec title = _("clear the information about modified attributes of") - elif html.var("_resched_checks") and config.may("action.reschedule"): - command = "SCHEDULE_FORCED_" + cmdtag + "_CHECK;%s;%d" % (spec, int(time.time())) - title = _("reschedule an immediate check of") - elif html.var("_fake") and config.may("action.fakechecks"): statename = html.var("_fake") pluginoutput = _("Manually set to %s by %s") % (statename, config.user_id) @@ -2285,7 +2234,7 @@ def nagios_host_service_action_command(what, dataset): title = _("remove all scheduled downtimes of ") return title, commands - else: + if not command: raise MKUserError(None, _("Sorry. This command is not implemented.")) if down_to: diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 44cdd5a..37c3156 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -36,19 +36,90 @@ # - function that outputs the HTML input fields # - function that creates the nagios command and title -# config.declare_permission("action.notifications", -# _("Enable/disable notifications"), -# _("Enable and disable notifications on hosts and services"), -# [ "admin" ]) -# -# multisite_commands.append({ -# "tables" : [ "host", "service" ], -# "permission" : "action.notifications", -# "title" : _("Notifications"), -# "render" : lambda: \ -# html.button("_enable_notifications", _("Enable")) == \ -# html.button("_disable_notifications", _("Disable")), -# "action" : lambda cmdtag, spec: \ -# "ENABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec, -# _("enable notifications for") -# }) +config.declare_permission("action.reschedule", + _("Reschedule checks"), + _("Reschedule host and service checks"), + [ "user", "admin" ]) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.reschedule", + "title" : _("Reschedule"), + "render" : lambda: \ + html.button("_resched_checks", _("Reschedule active checks")), + "action" : lambda cmdtag, spec: + html.var("_resched_checks") and ( + "SCHEDULE_FORCED_" + cmdtag + "_CHECK;%s;%d" % (spec, int(time.time())), + _("reschedule an immediate check of")) +}) + + + +config.declare_permission("action.notifications", + _("Enable/disable notifications"), + _("Enable and disable notifications on hosts and services"), + [ "admin" ]) + +def command_notifications(cmdtag, spec): + if html.var("_enable_notifications"): + return ("ENABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec, + _("enable notifications for")) + elif html.var("_disable_notifications"): + return ("DISABLE_" + cmdtag + "_NOTIFICATIONS;%s" % spec, + _("disable notifications for")) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.notifications", + "title" : _("Notifications"), + "render" : lambda: \ + html.button("_enable_notifications", _("Enable")) == \ + html.button("_disable_notifications", _("Disable")), + "action" : command_notifications, +}) + + + +config.declare_permission("action.enablechecks", + _("Enable/disable checks"), + _("Enable and disable active or passive checks on hosts and services"), + [ "admin" ]) + +def command_enable_active(cmdtag, spec): + if html.var("_enable_checks"): + return ("ENABLE_" + cmdtag + "_CHECKS;%s" % spec, + _("enable active checks for")) + elif html.var("_disable_checks"): + return ("DISABLE_" + cmdtag + "_CHECKS;%s" % spec, + _("disable active checks for")) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.enablechecks", + "title" : _("Active checks"), + "render" : lambda: \ + html.button("_enable_checks", _("Enable")) == \ + html.button("_disable_checks", _("Disable")), + "action" : command_enable_active, +}) + +def command_enable_passive(cmdtag, spec): + if html.var("_enable_passive_checks"): + return ("ENABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec, + _("enable passive checks for")) + elif html.var("_disable_passive_checks"): + return ("DISABLE_PASSIVE_" + cmdtag + "_CHECKS;%s" % spec, + _("disable passive checks for")) + +multisite_commands.append({ + "tables" : [ "host", "service" ], + "permission" : "action.enablechecks", + "title" : _("Passive checks"), + "render" : lambda: \ + html.button("_enable_passive_checks", _("Enable")) == \ + html.button("_disable_passive_checks", _("Disable")), + "action" : command_enable_passive, +}) + + +

12 years, 6 months

Check_MK Git: check_mk: All commands are modularized now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 11e1527fd24d0a60c4ff8104c0dfa923a8321424 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11e1527fd24d0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Dec 3 21:08:19 2011 +0100 All commands are modularized now --- web/htdocs/views.py | 383 +++++++---------------------------------- web/plugins/views/commands.py | 319 +++++++++++++++++++++++++++++++++- 2 files changed, 376 insertions(+), 326 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=11e1527fd2…

12 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' into mobile

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d815847efe55b09fac408028b79a50a7fde99f4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d815847efe55b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 4 23:34:03 2011 +0100 Merge branch 'master' into mobile Conflicts: web/htdocs/check_mk.css web/htdocs/login.py ---

12 years, 6 months

Check_MK Git: check_mk: Mobile: executing commands works

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d3fac902d4c9fb44a4ab2277595a23ef25777941 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3fac902d4c9fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 4 23:24:47 2011 +0100 Mobile: executing commands works --- web/htdocs/check_mk.css | 36 ++++++++++++++++++++++++ web/htdocs/htmllib.py | 26 +++++++++++++++-- web/htdocs/js/mobile.js | 34 ++++++++++++++++++++++ web/htdocs/mobile.css | 19 ++++++++++++ web/htdocs/mobile.py | 71 +++++++++++++++++++++++++++++++++++++++++----- web/htdocs/pages.css | 24 ---------------- web/htdocs/views.py | 9 +++-- 7 files changed, 180 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d3fac902d4…

12 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011