Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 5831f582f196e2f1a4134c9a78e37c2bbea69943 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5831f582f196e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 16:43:24 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Reworked default downtime into adhoc downtime

by Andreas Boesl

Module: check_mk Branch: master Commit: 56a1a75c6ac58430cbb480cec7db2643ae41968e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56a1a75c6ac584… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 3 14:13:03 2013 +0200 Reworked default downtime into adhoc downtime --- ChangeLog | 2 +- web/plugins/config/builtin.py | 2 +- web/plugins/views/commands.py | 26 ++++++++++++---- web/plugins/wato/check_mk_configuration.py | 45 +++++++++++++++------------- 4 files changed, 47 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50ce77e..198cee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,7 +65,7 @@ * Sorter Host IP address: fixed sorting, no longer uses str compare on ip * Views: New: Draw rule editor icon in multisite views (default off) Can be activated in global settings - * New global multisite options: Default downtime duration and comment + * New global multisite options: Adhoc downtime with duration and comment Display current date in dashboard * LDAP: Using asynchronous searches / added optional support for paginated searches (Can be enabled in connection settings) diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c1abc51..d5ebc38 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -181,7 +181,7 @@ auth_by_http_header = False multisite_draw_ruleicon = False # Default downtime configuration -default_downtime = {} +adhoc_downtime = {} # Display dashboard date pagetitle_date_format = None diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index e8ae959..8598ef1 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -347,7 +347,10 @@ def command_downtime(cmdtag, spec, row): down_to = time.time() + minutes * 60 title = _("<b>schedule an immediate downtime for the next %d minutes</b> on" % minutes) - + elif html.var("_down_adhoc"): + minutes = config.adhoc_downtime.get("duration",0) + down_to = time.time() + minutes * 60 + title = _("<b>schedule an immediate downtime for the next %d minutes</b> on" % minutes) elif html.var("_down_custom"): down_from = html.get_datetime_input("_down_from") down_to = html.get_datetime_input("_down_to") @@ -376,7 +379,10 @@ def command_downtime(cmdtag, spec, row): return commands, title if down_to: - comment = html.var_utf8("_down_comment") + if html.var("_down_adhoc"): + comment = config.adhoc_downtime.get("comment","") + else: + comment = html.var_utf8("_down_comment") if not comment: raise MKUserError("_down_comment", _("You need to supply a comment for your downtime.")) if html.var("_down_flexible"): @@ -414,14 +420,13 @@ def get_child_hosts(site, hosts, recurse): return list(new_childs) def paint_downtime_buttons(what): - downtime_duration = config.default_downtime.get("duration", 60) - downtime_comment = config.default_downtime.get("comment", "") + html.write(_('Downtime Comment')+": ") - html.text_input("_down_comment", downtime_comment, size=60, submit="") + html.text_input("_down_comment", "", size=60, submit="") html.write("<hr>") html.button("_down_from_now", _("From now for")) html.write(" ") - html.number_input("_down_minutes", downtime_duration, size=4, submit="_down_from_now") + html.number_input("_down_minutes", 60, size=4, submit="_down_from_now") html.write("  " + _("minutes")) html.write("<hr>") html.button("_down_2h", _("2 hours")) @@ -432,6 +437,15 @@ def paint_downtime_buttons(what): html.write("   -  ") html.button("_down_remove", _("Remove all")) html.write("<hr>") + if config.adhoc_downtime and config.adhoc_downtime.get("duration"): + adhoc_duration = config.adhoc_downtime.get("duration") + adhoc_comment = config.adhoc_downtime.get("comment", "") + html.button("_down_adhoc", _("Adhoc for %d minutes") % adhoc_duration) + html.write(" ") + html.write(_('with comment')+": ") + html.write(adhoc_comment) + html.write("<hr>") + html.button("_down_custom", _("Custom time range")) html.datetime_input("_down_from", time.time(), submit="_down_custom") html.write("  "+_('to')+"  ") diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f6b1537..9186127 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -280,26 +280,31 @@ register_configvar(group, domain = "multisite") register_configvar(group, - "default_downtime", - Dictionary( - title = _("Default downtime settings"), - help = _("This setting allows to set a default downtime comment and the duration for the button <i>From now for...</i>. "\ - "The schedule downtime formular uses these values as default. "), - optional_keys = False, - elements = [ - ("duration", Integer( - title = _("Duration"), - help = _("The duration in minutes of the default downtime."), - minvalue = 1, - unit = _("minutes"), - default_value = 60, - )), - ("comment", TextUnicode( - title = _("Downtime comment"), - help = _("The default comment for a downtime."), - size = 80 - )), - ], + "adhoc_downtime", + Optional( + Dictionary( + optional_keys = False, + elements = [ + ("duration", Integer( + title = _("Duration"), + help = _("The duration in minutes of the adhoc downtime."), + minvalue = 1, + unit = _("minutes"), + default_value = 60, + )), + ("comment", TextUnicode( + title = _("Adhoc comment"), + help = _("The comment which is automatically sent with an adhoc downtime"), + size = 80, + allow_empty = False + )), + ], + ), + title = _("Adhoc downtime"), + label = _("Enable adhoc downtime"), + help = _("This setting allows to set an adhoc downtime comment and its duration. " + "When enabled a new button <tt>Adhoc downtime for xx minutes</tt> will " + "be available in the command form"), ), domain = "multisite", )

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 4178ea16502cdbce194e02a2c70725eab84a0975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4178ea16502cdb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 3 14:13:12 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Made tables searchable and limited

by Lars Michelsen

Module: check_mk Branch: master Commit: e5b9c2dc753cc13e8876b57a5262e32b33c9c419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5b9c2dc753cc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 14:10:09 2013 +0200 Made tables searchable and limited --- ChangeLog | 1 + web/htdocs/pages.css | 3 + web/htdocs/table.py | 70 +++++++++++++++++-- web/htdocs/wato.py | 101 +++++++++++----------------- web/plugins/config/builtin.py | 4 ++ web/plugins/wato/check_mk_configuration.py | 11 +++ 6 files changed, 122 insertions(+), 68 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e5b9c2dc75…

11 years, 2 months

Check_MK Git: check_mk: Recoded form based login for better handling of special cases; Recognizing userdb_automatic_sync in page hook now

by Lars Michelsen

Module: check_mk Branch: master Commit: 4318feffe50ebf4fd9158d449dca0ff88ea31263 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4318feffe50ebf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 11:42:42 2013 +0200 Recoded form based login for better handling of special cases; Recognizing userdb_automatic_sync in page hook now --- web/htdocs/index.py | 26 +++++++++++++++----------- web/htdocs/login.py | 23 ++++++----------------- web/htdocs/main.py | 5 ++++- web/htdocs/userdb.py | 5 ++++- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index f70d908..b781421 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -294,21 +294,25 @@ def handler(req, profiling = True): # While api call don't show the login dialog raise MKUnauthenticatedException(_('You are not authenticated.')) + # Redirect to the login-dialog with the current url as original target + # Never render the login form directly when accessing urls like "index.py" + # or "dashboard.py". This results in strange problems. + if req.myfile != 'login': + html.set_http_header('Location', + defaults.url_prefix + 'check_mk/login.py?_origtarget=%s' % + htmllib.urlencode(html.makeuri([]))) + raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY + # Initialize the i18n for the login dialog. This might be overridden # later after user login load_language(html.var("lang", config.get_language())) - # After auth check the regular page can be shown - result = login.page_login(plain_error) - if type(result) == tuple: - # This is the redirect to the requested page directly after successful login - req.user = result[0] - req.uri = result[1] - req.myfile = req.uri.split("/")[-1][:-3] - handler = pagehandlers.get(req.myfile, page_not_found) - else: - release_all_locks() - return result + # This either displays the login page or validates the information submitted + # to the login form. After successful login a http redirect to the originally + # requested page is performed. + login.page_login(plain_error) + release_all_locks() + return apache.OK # Call userdb page hooks which are executed on a regular base to e.g. syncronize # information withough explicit user triggered actions diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 35cb19c..83de0f9 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -197,22 +197,11 @@ def do_login(): # c) Show the real requested page (No redirect needed) set_auth_cookie(username, load_serial(username)) - # Use redirects for URLs or simply execute other handlers for - # mulitsite modules - if '/' in origtarget or '?' in origtarget: - html.set_http_header('Location', origtarget) - raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY - else: - # Remove login vars to hide them from the next page handler - try: - del html.req.vars['_username'] - del html.req.vars['_password'] - del html.req.vars['_login'] - del html.req.vars['_origtarget'] - except: - pass - - return (username, origtarget) + # Never use inplace redirect handling anymore as used in the past. This results + # in some unexpected situations. We simpy use 302 redirects now. So we have a + # clear situation. + html.set_http_header('Location', origtarget) + raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY else: userdb.on_failed_login(username) raise MKUserError(None, _('Invalid credentials.')) @@ -264,7 +253,7 @@ def normal_login_page(called_directly = True): html.write("<img id=login_window src=\"images/login_window.png\">") html.write("<div id=version>%s</div>" % defaults.check_mk_version) - html.begin_form("login", method = 'POST', add_transid = False) + html.begin_form("login", method = 'POST', add_transid = False, action = 'login.py') html.hidden_field('_login', '1') html.hidden_field('_origtarget', htmllib.attrencode(origtarget)) html.write("<label id=label_user class=legend for=_username>%s:</label><br />" % _('Username')) diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 87ebd11..5ccb624 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -28,7 +28,10 @@ import defaults, config def page_index(): start_url = html.var("start_url", config.start_url) - html.req.headers_out.add("Cache-Control", "max-age=7200, public"); + # Do not cache the index page -> caching problems when page is accessed + # while not logged in + #html.req.headers_out.add("Cache-Control", "max-age=7200, public"); + html.req.headers_out.add("Cache-Control", "no-cache"); if "%s" in config.page_heading: heading = config.page_heading % (defaults.omd_site or _("Multisite")) else: diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index b7f1f16..82191c6 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -575,7 +575,7 @@ def hook_save(users): if config.debug: import traceback html.show_error( - "<h3>" + _("Error executing sync hook") + "</h3>" + "<h3>" + _("Error executing save hook") + "</h3>" "<pre>%s</pre>" % (traceback.format_exc()) ) else: @@ -603,6 +603,9 @@ def general_page_hook(): # Catch all exceptions and log them to apache error log. Let exceptions raise trough # when debug mode is enabled. def hook_page(): + if 'page' not in config.userdb_automatic_sync: + return + for connector in enabled_connectors(): handler = connector.get('page', None) if not handler:

11 years, 2 months

Check_MK Git: check_mk: Fixed complete disabling of automatic syncs

by Lars Michelsen

Module: check_mk Branch: master Commit: 413618e293708f31913abed278168013864abb02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413618e293708f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 11:21:56 2013 +0200 Fixed complete disabling of automatic syncs --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 213fcd2..82afd8a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -411,7 +411,7 @@ register_configvar(group, ('wato_users', 'When opening WATO Users & Contacts'), ('page', 'During regular page processing'), ], - allow_empty = False, + allow_empty = True, ), domain = "multisite", )

11 years, 2 months

Check_MK Git: check_mk: manual userdb sync: better success message handling

by Lars Michelsen

Module: check_mk Branch: master Commit: a013d90d1d0bfe628cd061423d14694a76633ac0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a013d90d1d0bfe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 09:49:41 2013 +0200 manual userdb sync: better success message handling --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b0f570a..4dfbb78 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7966,7 +7966,7 @@ def mode_users(phase): return None elif html.var('_sync'): if userdb.hook_sync(add_to_changelog = True): - html.message(_("The user synchronization completed successfully.")) + return None, _('The user synchronization completed successfully.') return None entries = users.items()

11 years, 2 months

Check_MK Git: check_mk: Added webservice to trigger userdb syncrhonizations from external

by Lars Michelsen

Module: check_mk Branch: master Commit: 9618096bc0a0cff956728696ba31b15e640b3a71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9618096bc0a0cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 09:58:18 2013 +0200 Added webservice to trigger userdb syncrhonizations from external --- web/htdocs/userdb.py | 13 ++++++++++++- web/plugins/pages/shipped.py | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 25d06da..b7f1f16 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -524,7 +524,7 @@ def hook_login(username, password): # Is called on: # a) before rendering the user management page in WATO # b) a user is created during login (only for this user) -def hook_sync(connector_id = None, add_to_changelog = False, only_username = None): +def hook_sync(connector_id = None, add_to_changelog = False, only_username = None, raise_exc = False): if connector_id: connectors = [ get_connector(connector_id) ] else: @@ -537,6 +537,8 @@ def hook_sync(connector_id = None, add_to_changelog = False, only_username = Non try: handler(add_to_changelog, only_username) except MKLDAPException, e: + if raise_exc: + raise if config.debug: import traceback html.show_error( @@ -550,6 +552,8 @@ def hook_sync(connector_id = None, add_to_changelog = False, only_username = Non ) no_errors = False except: + if raise_exc: + raise import traceback html.show_error( "<h3>" + _("Error executing sync hook") + "</h3>" @@ -614,3 +618,10 @@ def hook_page(): (connector['id'], traceback.format_exc())) general_page_hook() + +def ajax_sync(): + try: + hook_sync(add_to_changelog = False, raise_exc = True) + html.write('OK') + except Exception, e: + html.write('ERROR %s' % e) diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index e470577..523e92d 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -38,6 +38,7 @@ import dashboard import login import help import bi +import userdb # map URLs to page rendering functions @@ -78,5 +79,6 @@ pagehandlers.update({ "dashlet_pnpgraph" : dashboard.dashlet_pnpgraph, "dashlet_nodata" : dashboard.dashlet_nodata, "bi_availability" : bi.page_availability, + "ajax_userdb_sync" : userdb.ajax_sync, })

11 years, 2 months

Check_MK Git: check_mk: Added option to disable automatic userdb synchronizations in multisite

by Lars Michelsen

Module: check_mk Branch: master Commit: a689fcc247f6f7be5eaa573d4ec9c8ae77260e06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a689fcc247f6f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 3 09:38:35 2013 +0200 Added option to disable automatic userdb synchronizations in multisite --- ChangeLog | 1 + web/htdocs/userdb.py | 4 +++ web/htdocs/wato.py | 41 ++++++++++++++++------------ web/plugins/config/builtin.py | 17 ++++++------ web/plugins/wato/check_mk_configuration.py | 19 +++++++++++++ 5 files changed, 57 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 829ce94..f8cd5ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ searches (Can be enabled in connection settings) * Added option to enable browser scrollbar to the multisite sidebar (only via "sidebar_show_scrollbar = True" in multisite.mk + * Added option to disable automatic userdb synchronizations in multisite WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index f864524..25d06da 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -530,6 +530,7 @@ def hook_sync(connector_id = None, add_to_changelog = False, only_username = Non else: connectors = enabled_connectors() + no_errors = True for connector in connectors: handler = connector.get('sync', None) if handler: @@ -547,12 +548,15 @@ def hook_sync(connector_id = None, add_to_changelog = False, only_username = Non "<h3>" + _("Error executing sync hook") + "</h3>" "<pre>%s</pre>" % (e) ) + no_errors = False except: import traceback html.show_error( "<h3>" + _("Error executing sync hook") + "</h3>" "<pre>%s</pre>" % (traceback.format_exc()) ) + no_errors = False + return no_errors # Hook function can be registered here to be executed during saving of the # new user construct diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f808789..b0f570a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7928,13 +7928,15 @@ def mode_users(phase): elif phase == "buttons": global_buttons() - html.context_button(_("New user"), make_link([("mode", "edit_user")]), "new") + html.context_button(_("New User"), make_link([("mode", "edit_user")]), "new") + if 'wato_users' not in config.userdb_automatic_sync: + html.context_button(_("Sync Users"), html.makeactionuri([("_sync", 1)]), "replicate") return # Execute all connectors synchronisations of users. This must be done before # loading the users, because it might modify the users list. But don't execute # it during actions, this should save some time. - if phase != "action": + if phase != "action" and 'wato_users' in config.userdb_automatic_sync: userdb.hook_sync(add_to_changelog = True) roles = userdb.load_roles() @@ -7943,23 +7945,28 @@ def mode_users(phase): contact_groups = userdb.load_group_information().get("contact", {}) if phase == "action": - delid = html.var("_delete") - if delid == config.user_id: - raise MKUserError(None, _("You cannot delete your own account!")) + if html.var('_delete'): + delid = html.var("_delete") + if delid == config.user_id: + raise MKUserError(None, _("You cannot delete your own account!")) - if delid not in users: - return None # The account does not exist (anymore), no deletion needed + if delid not in users: + return None # The account does not exist (anymore), no deletion needed - c = wato_confirm(_("Confirm deletion of user %s" % delid), - _("Do you really want to delete the user %s?" % delid)) - if c: - del users[delid] - userdb.save_users(users) - log_pending(SYNCRESTART, None, "edit-users", _("Deleted user %s" % (delid))) - return None - elif c == False: - return "" - else: + c = wato_confirm(_("Confirm deletion of user %s" % delid), + _("Do you really want to delete the user %s?" % delid)) + if c: + del users[delid] + userdb.save_users(users) + log_pending(SYNCRESTART, None, "edit-users", _("Deleted user %s" % (delid))) + return None + elif c == False: + return "" + else: + return None + elif html.var('_sync'): + if userdb.hook_sync(add_to_changelog = True): + html.message(_("The user synchronization completed successfully.")) return None entries = users.items() diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index be85e05..7398ebc 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -196,14 +196,15 @@ pagetitle_date_format = None # \___/|___/\___|_| |____/|____/ # -user_connectors = ['htpasswd'] -ldap_connection = {} -ldap_userspec = {} -ldap_groupspec = {} -ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire': {}} -ldap_cache_livetime = 300 -ldap_debug_log = None -default_user_profile = { +user_connectors = ['htpasswd'] +userdb_automatic_sync = [ 'wato_users', 'page' ] +ldap_connection = {} +ldap_userspec = {} +ldap_groupspec = {} +ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire': {}} +ldap_cache_livetime = 300 +ldap_debug_log = None +default_user_profile = { 'roles': ['user'], } lock_on_logon_failures = False diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f6b1537..213fcd2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -398,6 +398,25 @@ register_configvar(group, ) register_configvar(group, + "userdb_automatic_sync", + ListChoice( + title = _('Automatic User Synchronization'), + help = _('By default the users are synchronized automatically in several situations. ' + 'The sync is started when opening the "Users & Contacts" page in configuration and ' + 'during each page rendering. Each connector can then specify if it wants to perform ' + 'any actions. For example the LDAP connector will start the sync once the cached user ' + 'information are too old.'), + default_value = [ 'wato_users', 'page' ], + choices = [ + ('wato_users', 'When opening WATO Users & Contacts'), + ('page', 'During regular page processing'), + ], + allow_empty = False, + ), + domain = "multisite", +) + +register_configvar(group, "ldap_connection", Dictionary( title = _("LDAP Connection Settings"),

11 years, 2 months

Check_MK Git: check_mk: winperf_tcp_conn: use same WATO rule as Unix based check

by Mathias Kettner

Module: check_mk Branch: master Commit: 84df0ff944930499dd40185f0e6cd2ba215d33bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84df0ff9449304… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 18:03:19 2013 +0200 winperf_tcp_conn: use same WATO rule as Unix based check --- checks/winperf_tcp_conn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/winperf_tcp_conn b/checks/winperf_tcp_conn index 8d4b7af..7f812da 100644 --- a/checks/winperf_tcp_conn +++ b/checks/winperf_tcp_conn @@ -69,6 +69,6 @@ check_info["winperf_tcp_conn"] = { 'inventory_function': inventory_winperf_tcp_conn, 'service_description': 'TCP connections', 'has_perfdata': True, - 'group': 'tcp_conn_stats_win', + 'group': 'tcp_conn_stats', }

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013