Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

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, 10 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, 10 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, 10 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, 10 months

Check_MK Git: check_mk: Localization: Fixed detection of gettext template file when using the

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44a760e588200fab6b0a47537fd24e17424ebf70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44a760e588200f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 09:07:08 2012 +0100 Localization: Fixed detection of gettext template file when using the local/ hierarchy in OMD --- ChangeLog | 2 ++ modules/localize.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f88f2d..b7ec9c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,8 @@ it exists after login when it is first needed * Dashboard: link problem views to *unhandled* views (this was inconsistent) + * Localization: Fixed detection of gettext template file when using the + local/ hierarchy in OMD Mobile: * Improved sorting of views in main page diff --git a/modules/localize.py b/modules/localize.py index 43d6014..f5d4d9c 100755 --- a/modules/localize.py +++ b/modules/localize.py @@ -49,7 +49,10 @@ if local_locale_dir: else: locale_base = locale_dir -pot_file = locale_base + '/multisite.pot' +if os.path.exists(local_locale_dir + '/multisite.pot'): + pot_file = local_locale_dir + '/multisite.pot' +else: + pot_file = locale_base + '/multisite.pot' try: os.makedirs(locale_base)

12 years, 10 months

Check_MK Git: check_mk: Added Bugs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4142bb55b8b6e75123426ef9a47a7a5ccbb81a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4142bb55b8b6e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 30 22:23:21 2012 +0100 Added Bugs --- .bugs/609 | 10 ++++++++++ .bugs/610 | 9 +++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/.bugs/609 b/.bugs/609 new file mode 100644 index 0000000..d18b1bf --- /dev/null +++ b/.bugs/609 @@ -0,0 +1,10 @@ +Title: User Migration nach WatoNG +Component: wato +State: open +Date: 2012-01-30 22:18:13 +Targetversion: 1.2.0 +Class: bug + +Die Userverwaltung in WatoNG liest weder bestehende User aus der OMD htpasswd datei aus, noch werden die +bestehenden User aus dieser Datei behalten wenn man einen User in WatoNG anlegt. +Auch wenn das eigentlich Funktionieren sollte, tat es das noch bei keiner Seite die ich migriert habe. diff --git a/.bugs/610 b/.bugs/610 new file mode 100644 index 0000000..1ab852a --- /dev/null +++ b/.bugs/610 @@ -0,0 +1,9 @@ +Title: OMD: Keine command.cfg mehr +Component: core +State: open +Date: 2012-01-30 22:20:50 +Targetversion: 1.2.0 +Class: nastiness + +Zumindest in unseren OMD Versionen findet sich keine commands.cfg mehr, welche die Nagios Command definitionen der Mitgelieferten Checks enthält. +Ist das absicht?

12 years, 10 months

Check_MK Git: check_mk: Missing gettext function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ca292083822eae077025f30738ce9ac13a19488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ca292083822ea… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 30 22:05:30 2012 +0100 Missing gettext function --- web/htdocs/mobile.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index e068943..a4a3c05 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -176,7 +176,7 @@ def page_login(): def page_index(): - title = "Check_MK Mobile" + title = _("Check_MK Mobile") mobile_html_head(title) jqm_page_header(title, right_button=("javascript:document.location.reload();", _("Reload"), "refresh"),id="data") views.load_views()

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0637

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90f33912cb59f47073121c1a62fedc14c53abffd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90f33912cb59f4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 30 19:01:18 2012 +0100 Updated bug entries #0637 --- .bugs/637 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/637 b/.bugs/637 new file mode 100644 index 0000000..c950edf --- /dev/null +++ b/.bugs/637 @@ -0,0 +1,13 @@ +Title: Creating a ruleset for Number of Threads causes cmk -U to fail +Component: wato +State: open +Date: 2012-01-30 18:56:25 +Targetversion: 1.1.13i1 +Class: bug + +1. Create a Ruleset for Number of Threads +2. Try Activate-Changes within wato or cmk -U in command line +3. Observe +Generating Nagios configuration...Configuration Error: ERROR: Duplicate service description 'Number of threads' for host 'klappkiste'! + - 1st occurrance: checktype = cpu.threads, item = None + - 2nd occurrance: checktype = cpu.threads, item = (1, 22)

12 years, 10 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 23bf4e9eefa76076d66f04a809c24520ec68f3f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23bf4e9eefa760… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 30 18:54:52 2012 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index aa10449..8026d9d 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -637 +647

12 years, 10 months

Check_MK Git: check_mk: WATO: improved validate_hosts hooks handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cef48cb231aa21036ee2a420a3d812ae6f84a3db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cef48cb231aa21… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 30 18:38:48 2012 +0100 WATO: improved validate_hosts hooks handling --- web/htdocs/wato.py | 48 ++++++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c06b50..225ff51 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1150,6 +1150,7 @@ def show_hosts(folder): (config.may("wato.edit_hosts") or config.may("wato.manage_hosts")): bulk_actions(at_least_one_imported, top = True) + host_errors = validate_all_hosts(hostnames) # Now loop again over all hosts and display them for hostname in hostnames: if search_text and (search_text.lower() not in hostname.lower()): @@ -1182,7 +1183,7 @@ def show_hosts(folder): # Hostname with link to details page (edit host) html.write('<td>') - errors = validate_host(host) + errors = host_errors.get(hostname,[]) + validate_host(hostname) if errors: msg = _("Warning: This host has an invalid configuration: ") msg += ", ".join(errors) @@ -1736,7 +1737,7 @@ def mode_edithost(phase, new): call_hook_hosts_changed(g_folder) reload_hosts(g_folder) - errors = validate_host(g_folder[".hosts"][hostname]) + errors = validate_all_hosts([hostname]) + validate_host(hostname) if errors: # keep on this page if host does not validate return elif new: @@ -1750,7 +1751,7 @@ def mode_edithost(phase, new): if new: render_folder_path() else: - errors = validate_host(host) + errors = validate_all_hosts([hostname]) + validate_host(hostname) if errors: html.write("<div class=info>") @@ -2670,12 +2671,12 @@ def mode_changelog(phase): html.context_button(_("Site Configuration"), make_link([("mode", "sites")]), "sites") elif phase == "action": - defective_hosts = validate_all_hosts() + defective_hosts = validate_all_hosts([], force_all = True) if defective_hosts: raise MKUserError(None, _("You cannot activate changes while some hosts have " "an invalid configuration: ") + ", ".join( [ '<a href="%s">%s</a>' % (make_link([("mode", "edithost"), ("host", hn)]), hn) - for hn in defective_hosts ])) + for hn in defective_hosts.keys() ])) sitestatus_do_async_replication = False # see below @@ -4184,7 +4185,6 @@ def mode_snapshot(phase): delete_file ) if c: - # FIXME: kein join verwenden os.remove(os.path.join(snapshot_dir, delete_file)) return None, _("Snapshot deleted.") elif c == False: # not yet confirmed @@ -9479,7 +9479,7 @@ def call_hook_roles_saved(roles): call_hooks("roles-saved", roles) # This hook is called in order to determine if a host has a 'valid' -# configuration. It used used for displaying warning symbols in the +# configuration. It used for displaying warning symbols in the # host list and in the host detail view. def validate_host(host): if hook_registered('validate-host'): @@ -9494,22 +9494,30 @@ def validate_host(host): else: return [] -def validate_all_hosts(): - if hook_registered('validate-host'): - hosts = collect_hosts(g_root_folder) - defective_hosts = [] - for hn, eff in hosts.iteritems(): - for hk in g_hooks.get('validate-host', []): +# This hook is called in order to determine the errors of the given +# hostnames. These informations are used for displaying warning +# symbols in the host list and the host detail view +# Returns dictionary { hostname: [errors] } +def validate_all_hosts(hostnames, force_all = False): + if hook_registered('validate-all-hosts') and (len(hostnames) > 0 or force_all): + hosts_errors = {} + all_hosts = collect_hosts(g_root_folder) + + if force_all: + hostnames = all_hosts.keys() + + for name in hostnames: + eff = all_hosts[name] + errors = [] + for hk in g_hooks.get('validate-all-hosts', []): try: - hk(eff) + hk(eff, all_hosts) except MKUserError, e: - defective_hosts.append(hn) - break # reason not interesting here - defective_hosts.sort() - return defective_hosts + errors.append(e.message) + hosts_errors[name] = errors + return hosts_errors else: - return [] - + return {} #. # .-Helpers--------------------------------------------------------------.

12 years, 10 months

← Newer
1
2
3
4
5
6
7
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012