Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64205 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: 60a0c167587a49c4697388d5fe504a3bf1b1c666 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60a0c167587a49… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 11:22:29 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: WATO: fix bug in saving checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ca05d33a190ddc6f419fd4405a021d11e17dc81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ca05d33a190dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 11:22:23 2012 +0100 WATO: fix bug in saving checks --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 866144d..244b42f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1889,6 +1889,7 @@ def show_service_table(host, firsttime): table = check_mk_automation(host[".siteid"], "try-inventory", cache_options + [hostname]) if len(table) == 0 and cache_options != []: table = check_mk_automation(host[".siteid"], "try-inventory", [hostname]) + html.set_var("_scan", "on") except Exception, e: if config.debug: raise

12 years, 7 months

Check_MK Git: check_mk: Removing tailing spaces from usernames when using web form based login

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 42d55002268899c2b4df10189f159f72a2ce5e11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42d55002268899… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 10:22:45 2012 +0100 Removing tailing spaces from usernames when using web form based login --- web/htdocs/login.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 439e441..a1a3f8c 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -147,7 +147,7 @@ def do_login(): err = None if html.var('_login'): try: - username = html.var('_username', '') + username = html.var('_username', '').rstrip() if username == '': raise MKUserError('_username', _('No username given.'))

12 years, 7 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d999f570b038108de4ea0ad3c23b52ea1a520c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d999f570b0381… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 10:22:49 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 7 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: 190bb372b18ed47c4256b422442d613b4e8d2f2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=190bb372b18ed4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 10:16:30 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0629

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4c4a95a31b0b894f3c3ae30ed309b49523fa77f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4c4a95a31b0b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 10:16:25 2012 +0100 Updated bug entries #0629 --- .bugs/629 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/629 b/.bugs/629 new file mode 100644 index 0000000..716eabe --- /dev/null +++ b/.bugs/629 @@ -0,0 +1,10 @@ +Title: About page +Component: multisite +State: open +Date: 2012-01-31 10:15:54 +Targetversion: 1.2.0 +Class: todo + +Create an about page about Multisite, Check_MK and the +copyrights. This page can be reachable via the (C) Mathias Kettner +Link.

12 years, 7 months

Check_MK Git: check_mk: Multisite: Made hardcoded english language choosable in language selections

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a465eeb10539aa2d7b6a9a9b22867efe2b930e81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a465eeb10539aa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 09:45:04 2012 +0100 Multisite: Made hardcoded english language choosable in language selections --- web/htdocs/lib.py | 5 ++++- web/htdocs/wato.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index a25717c..0bc28e9 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -136,7 +136,10 @@ def get_language_alias(lang): return alias def get_languages(): - languages = [] + # Add the hard coded english language to the language list + # It must be choosable even if the administrator changed the default + # language to a custom value + languages = [ (None, _('English')) ] for lang_dir in get_language_dirs(): try: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c21f42c..59df3c3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9193,7 +9193,7 @@ def page_user_profile(): html.write("</td><td class=checkbox>") html.checkbox('_set_lang', active, onclick = 'wato_toggle_attribute(this, \'language\')') html.write("</td><td class=content>") - default_label = _('Default: %s') % (get_language_alias(config.default_language) or 'english') + default_label = _('Default: %s') % (get_language_alias(config.default_language) or _('English')) html.write('<div class="inherited" id="attr_default_language" style="%s">%s</div>' % (active and "display: none" or "", default_label)) html.write('<div id="attr_entry_language" style="%s">' % ((not active) and "display: none" or ""))

12 years, 7 months

Check_MK Git: check_mk: Reworked user language selection

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8fc6944c67396dd6e6f5f2b98ec9b867ed2e7f47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fc6944c67396d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 10:09:17 2012 +0100 Reworked user language selection --- web/htdocs/wato.py | 82 +++++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 42 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 59df3c3..866144d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6635,10 +6635,13 @@ def mode_edit_user(phase): roles.keys()) # Language configuration + set_lang = html.var('_set_lang') language = html.var('language') - if language and language != config.default_language: + if set_lang and language != config.default_language: + if language == '': + language = None new_user['language'] = language - elif not language and 'language' in new_user: + elif not set_lang and 'language' in new_user: del new_user['language'] # Contact groups @@ -6689,7 +6692,7 @@ def mode_edit_user(phase): html.write("<table class=form>") # ID - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Username")) html.write("</td><td class=content>") if new: @@ -6701,7 +6704,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Full name - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Full name") + "<br><i>" + _("Full name or alias of the user</i>")) html.write("</td><td class=content>") html.text_input("alias", user.get("alias", userid), size = 50) @@ -6710,7 +6713,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Authentication - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Authentication<br><i>If you want the user to be able to login " "then specify a password here. Users without a login make sense " "if they are monitoring contacts that are just used for " @@ -6745,7 +6748,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Locking - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("<i>Disabling the password will prevent a user from logging in while " "retaining the original password. Notifications are not affected " "by this setting.</i>")) @@ -6755,7 +6758,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Email address - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Email address<br><i>The email address is optional and is needed " "if the user is a monitoring contact and receives notifications " "via Email.")) @@ -6764,7 +6767,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Roles - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Roles<br><i>By assigning roles to a user he obtains permissions. " "If a user has more then one role, he gets the maximum of all " "permissions of his roles. " @@ -6780,7 +6783,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Contact groups - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") url1 = make_link([("mode", "contact_groups")]) url2 = make_link([("mode", "rulesets")]) html.write(_("Contact groups<br><i>Contact groups are used to assign monitoring " @@ -6808,7 +6811,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Notifications enabled - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Notifications enabled<br><i>Notifications are sent out " "when the status of a host or service changes.</i>")) html.write("</td><td class=content>") @@ -6817,7 +6820,7 @@ def mode_edit_user(phase): html.write("</td></tr>") # Notification period - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Notification time period<br><i>Only during this time period the " "user will get notifications about host or service alerts.")) html.write("</td><td class=content>") @@ -6845,7 +6848,7 @@ def mode_edit_user(phase): } } - html.write("<tr><td class=legend>") + html.write("<tr><td class=legend colspan=2>") html.write(_("Notification options<br><i>Here you specify which types of alerts " "will be notified to this contact.</i>")) html.write("</td><td class=content>") @@ -6861,24 +6864,14 @@ 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") + _('<br><i>Configure the default language ' - 'to be used in the multisite GUI.</i>')) - 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>") - + select_language(user.get('language', '')) # 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 # access the data in the account with the need to store # values in the monitoring core. We'll see what future brings. - html.write("<tr><td class=buttons colspan=2>") + html.write("<tr><td class=buttons colspan=3>") html.button("save", _("Save")) html.write("</tr>") @@ -9108,6 +9101,25 @@ def register_rule(group, varname, valuespec = None, title = None, # The user can edit the own profile # +def select_language(user_language): + languages = get_languages() + inactive = user_language != '' + + if languages: + html.write("<tr><td class=legend>") + html.write(_("Language") + _('<br><i>Configure the default language ' + 'to be used in the multisite GUI.</i>')) + html.write("</td><td class=checkbox>") + html.checkbox('_set_lang', inactive, onclick = 'wato_toggle_attribute(this, \'language\')') + html.write("</td><td class=content>") + default_label = _('Default: %s') % (get_language_alias(config.default_language) or _('English')) + html.write('<div class="inherited" id="attr_default_language" style="%s">%s</div>' % + (inactive and "display: none" or "", default_label)) + html.write('<div id="attr_entry_language" style="%s">' % ((not inactive) and "display: none" or "")) + html.select("language", languages, user_language) + html.set_focus("lang") + html.write("</div></td></tr>") + def page_user_profile(): if not config.user_id: raise MKUserError(None, _('Not logged in.')) @@ -9125,7 +9137,9 @@ def page_user_profile(): set_lang = html.var('_set_lang') language = html.var('language') # Set the users language if requested - if set_lang and language and language != config.get_language(): + if set_lang and language != config.get_language(): + if language == '': + language = None # Set custom language users[config.user_id]['language'] = language config.user['language'] = language @@ -9183,23 +9197,7 @@ def page_user_profile(): html.write("</td></tr>") if config.may('edit_profile'): - languages = get_languages() - user_language = config.get_language('') - active = bool(user_language) - - if languages: - html.write("<tr><td class=legend>") - html.write(_("Language")) - html.write("</td><td class=checkbox>") - html.checkbox('_set_lang', active, onclick = 'wato_toggle_attribute(this, \'language\')') - html.write("</td><td class=content>") - default_label = _('Default: %s') % (get_language_alias(config.default_language) or _('English')) - html.write('<div class="inherited" id="attr_default_language" style="%s">%s</div>' % - (active and "display: none" or "", default_label)) - html.write('<div id="attr_entry_language" style="%s">' % ((not active) and "display: none" or "")) - html.select("language", languages, user_language) - html.set_focus("lang") - html.write("</div></td></tr>") + select_language(config.get_language('')) if config.may('change_password'): html.write("<tr><td class=legend colspan=2>")

12 years, 7 months

Check_MK Git: check_mk: Added two missing localization strings in sidebar

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b42ad57ddf5aab27fc17216e53d038cfa0e87e19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b42ad57ddf5aab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 09:10:05 2012 +0100 Added two missing localization strings in sidebar --- web/htdocs/sidebar.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 2f2781a..10f4359 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -126,7 +126,7 @@ def sidebar_foot(): html.write('<div id="side_footer">') html.write('<ul class=buttons>\n') if config.may("configure_sidebar"): - html.write('<li><a target="main" href="sidebar_add_snapin.py">Add snapin</a></li>') + html.write('<li><a target="main" href="sidebar_add_snapin.py">%s</a></li>' % _('Add snapin')) if config.may("edit_profile") or config.may("change_password"): html.write('<li><a class=profile target="main" href="user_profile.py" title="%s"></a></li>' % _('Edit user profile')) if config.may("logout"): @@ -235,8 +235,8 @@ def snapin_exception(e): raise else: html.write("<div class=snapinexception>\n" - "<h2>Error</h2>\n" - "<p>%s</p></div>" % e) + "<h2>%s</h2>\n" + "<p>%s</p></div>" % (_('Error'), e)) def ajax_nagios_restarted(): # Tells the requestor the "since" time or the program start time

12 years, 7 months

Check_MK Git: check_mk: Fixed typo

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4843836f58922fe84eafe07df3909d86a4eee4ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4843836f58922f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 09:06:04 2012 +0100 Fixed typo --- web/htdocs/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index bbf57ee..51d6825 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -211,7 +211,7 @@ declare_permission("painter_options", declare_permission("act", _("Perform commands"), - _("Allows users to perform Nagios commands. If now futher permissions are granted, actions can only be done one objects one is a contact for"), + _("Allows users to perform Nagios commands. If no further permissions are granted, actions can only be done on objects one is a contact for"), [ "admin", "user" ])

12 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits