Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Fixed syntax error in error message

by Mathias Kettner

Module: check_mk Branch: master Commit: d17d0668d11ce0bc62fd6123ed693b05e3ef545e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d17d0668d11ce0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 18 18:13:32 2015 +0100 Fixed syntax error in error message --- web/htdocs/metrics.py | 2 +- web/plugins/metrics/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 2af29a1..3c0b52f 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -209,7 +209,7 @@ def evaluate_rpn(expression, translated_metrics): stack.append(evaluate_literal(operator_name, translated_metrics)) if len(stack) != 1: - raise MKGeneralException("Syntax error in expression '%s': too much operands left" % expression) + raise MKGeneralException("Syntax error in expression '%s': too many operands left" % expression) return stack[0] diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 1e1b033..bc972ac 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -449,7 +449,7 @@ perfometer_info.append(("linear", ( [ "user", "system", "io_wait" ], perfometer_info.append(("linear", ( [ "util", ], 100.0, None))) perfometer_info.append(("linear", ( [ "fs_used(%)" ], 100.0, None))) perfometer_info.append(("linear", ( [ "mem_used", "swap_used", "caches", "mem_free", "swap_free" ], None, -("mem_total,mem_used,swap_used,+,/", "ratio")))) +("mem_total,mem_used,+,swap_used,/", "ratio")))) perfometer_info.append(("linear", ( [ "mem_used" ], "mem_total", None))) perfometer_info.append(("linear", ( [ "mem_used(%)" ], 100.0, None))) perfometer_info.append(("logarithmic", ( "time_offset", 1.0, 10.0)))

9 years, 4 months

Check_MK Git: check_mk: kemp_loadmaster_realserver check now uses ip address as item instead of index

by Lutz Helwing

Module: check_mk Branch: master Commit: fb5d75ce911bc9ad43fcf7ce714a5b375b4c62fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb5d75ce911bc9… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Wed Feb 18 17:07:36 2015 +0100 kemp_loadmaster_realserver check now uses ip address as item instead of index --- checks/kemp_loadmaster_realserver | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/kemp_loadmaster_realserver b/checks/kemp_loadmaster_realserver index 7fad856..ede323b 100644 --- a/checks/kemp_loadmaster_realserver +++ b/checks/kemp_loadmaster_realserver @@ -37,7 +37,7 @@ def inventory_kemp_loadmaster_realserver(info): for line in info: if line[2] != '4': # Skip disabled servers - yield line[1], None + yield line[0], None def check_kemp_loadmaster_realserver(item, _no_params, info): @@ -50,9 +50,9 @@ def check_kemp_loadmaster_realserver(item, _no_params, info): } for ipaddress, server_id, state_id in info: - if item == server_id: + if item == ipaddress: state, state_name = states[state_id] - return state, "State: %s, IP: %s" % (state_name, ipaddress) + return state, "State: %s" % state_name check_info["kemp_loadmaster_realserver"] = {

9 years, 4 months

Check_MK Git: check_mk: #1995 FIX dmidecode: Fix parsing when memory devices are listed before controller

by Mathias Kettner

Module: check_mk Branch: master Commit: f5267e0b4cb78567ee98dbf6c33c8342e41ece44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5267e0b4cb785… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 18 16:42:37 2015 +0100 #1995 FIX dmidecode: Fix parsing when memory devices are listed before controller --- .werks/1995 | 10 ++++++++++ ChangeLog | 1 + inventory/dmidecode | 29 +++++++++++++++++++++-------- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.werks/1995 b/.werks/1995 new file mode 100644 index 0000000..0c8fe31 --- /dev/null +++ b/.werks/1995 @@ -0,0 +1,10 @@ +Title: dmidecode: Fix parsing when memory devices are listed before controller +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424274114 + + diff --git a/ChangeLog b/ChangeLog index cb3cc0f..89715af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -260,6 +260,7 @@ * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating system for ESX servers * 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english locale * 1943 FIX: inventory plugin win_os: no longer detects incorrect i386 architecture... + * 1995 FIX: dmidecode: Fix parsing when memory devices are listed before controller 1.2.6b1: diff --git a/inventory/dmidecode b/inventory/dmidecode index befa861..382875e 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -130,7 +130,7 @@ def inv_dmidecode_parse_system(lines): def inv_dmidecode_parse_chassis(lines): inv_dmidecode_parse_generic("hardware.chassis.", lines, { "Manufacturer" : "manufacturer", - "Type" : "type", + "Type" : "type", }) # Note: This node is also being filled by lnx_cpuinfo @@ -185,10 +185,16 @@ def inv_dmidecode_parse_processor(lines): def inv_dmidecode_parse_physical_mem_array(lines): # We expect several possible arrays node = inv_tree("hardware.memory.arrays:") - array = { - "devices" : [] - } - node.append(array) + + # If we have a dummy entry from previous Memory Devices (see below) + # then we fill that entry rather than creating a new one + if len(node) == 1 and node[0].keys() == [ "devices" ]: + array = node[0] + else: + array = { + "devices" : [] + } + node.append(array) for line in lines: if line[0] == "Location": array["location"] = line[1] @@ -200,10 +206,17 @@ def inv_dmidecode_parse_physical_mem_array(lines): array["maximum_capacity"] = dmidecode_parse_size(line[1]) def inv_dmidecode_parse_mem_device(lines): - # We assume that this devices belongs to an array - # that we've just found + # Do we already have an entry for a memory array? Then + # we assume that this device belongs to the most recently + # read array. Otherwise we create a dummy entry and replace + # that later with actual information node = inv_tree("hardware.memory.arrays:") - array = node[-1] + if node: + array = node[-1] + else: + array = { "devices": []} + node.append(array) + device = {} inv_dmidecode_parse_generic(device, lines, { "Total Width" : "total_width", # 64 bits

9 years, 4 months

Check_MK Git: check_mk: #1994 FIX lparstat: Support new AIX version with two new columns nsp and utctc

by Mathias Kettner

Module: check_mk Branch: master Commit: 4910f6a919df846cbd5fba3c13c85bad3a6f26b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4910f6a919df84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 18 16:23:36 2015 +0100 #1994 FIX lparstat: Support new AIX version with two new columns nsp and utctc --- .werks/1994 | 10 ++++++++++ ChangeLog | 1 + checks/lparstat_aix | 10 +++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/1994 b/.werks/1994 new file mode 100644 index 0000000..6bff394 --- /dev/null +++ b/.werks/1994 @@ -0,0 +1,10 @@ +Title: lparstat: Support new AIX version with two new columns nsp and utctc +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424272988 + + diff --git a/ChangeLog b/ChangeLog index e733719..cb3cc0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -160,6 +160,7 @@ * 1942 FIX: netapp_api_volumes: fixed exception when performance data generation was enabled * 1993 FIX: solaris_multipath: Fix detection of expected number of paths * 1944 FIX: hr_mem: no longer reports incorrect memory values when cached memory values are broken... + * 1994 FIX: lparstat: Support new AIX version with two new columns nsp and utctc Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/lparstat_aix b/checks/lparstat_aix index 30927bb..9bcf6ca 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -56,7 +56,11 @@ def check_lparstat(item, params, info): if len(info) == 1: # Old agent provided only the values in a single line line = info[0] - if len(line) == 10: + if len(line) == 12: + cols = [ 'physc', 'entc', 'lbusy', 'app', 'vcsw', 'phint', 'nsp', 'utcyc' ] + uom = [ '', '%', '', '', '', '', '%', '%' ] + values = line[-8:] + elif len(line) == 10: cols = [ 'physc', 'entc', 'lbusy', 'app', 'vcsw', 'phint' ] uom = [ '', '%', '', '', '', '' ] values = line[-6:] @@ -68,8 +72,8 @@ def check_lparstat(item, params, info): cols = [ 'nsp', 'utcyc' ] uom = [ '%', '%' ] values = line[-2:] - else: - return 3, "Invalid output from agent" + # else: + # Invalid output, let exception happen else: # The new agent provides three lines, the title line, spacer line and the values cols = [ c.replace('%', '') for c in info[-3] ]

9 years, 4 months

Check_MK Git: check_mk: Fixed missing space

by Mathias Kettner

Module: check_mk Branch: master Commit: 484df0d3e69eda1466876f421af4f0dac4436722 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=484df0d3e69eda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 18 15:06:53 2015 +0100 Fixed missing space --- agents/windows/check_mk_agent.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a7c30a6..975d867 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2805,7 +2805,7 @@ bool banned_exec_name(char *name) return false; return true; } - else{ + else { return ( !strcasecmp(extension, ".dir") || !strcasecmp(extension, ".txt")); }

9 years, 4 months

Check_MK Git: check_mk: #1985 FIX PNP graph dashlet handles graphs in distributed setups correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 8df2ce87929e4808ca3c45e335aa988d09049f91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8df2ce87929e48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 18 11:41:08 2015 +0100 #1985 FIX PNP graph dashlet handles graphs in distributed setups correctly The PNP graph dashlet now automatically detects the site a host is located on and shows the PNP graph from this site. --- .werks/1985 | 11 +++++++++++ ChangeLog | 1 + web/plugins/dashboard/dashlets.py | 16 ++++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.werks/1985 b/.werks/1985 new file mode 100644 index 0000000..e346eba --- /dev/null +++ b/.werks/1985 @@ -0,0 +1,11 @@ +Title: PNP graph dashlet handles graphs in distributed setups correctly +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424255974 + +The PNP graph dashlet now automatically detects the site a host is located +on and shows the PNP graph from this site. diff --git a/ChangeLog b/ChangeLog index 1b3c767..e733719 100644 --- a/ChangeLog +++ b/ChangeLog @@ -201,6 +201,7 @@ * 1981 FIX: Not trying to render view in view editor when the view is not valid * 1983 FIX: Fixed special case in language configuration via user profile... * 1984 FIX: Fixed loosing sidebar after switching to/from edit mode in dashboard edior on page reload... + * 1985 FIX: PNP graph dashlet handles graphs in distributed setups correctly... WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 28d0640..62b413e 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -324,17 +324,29 @@ if (has_canvas_support()) { # '----------------------------------------------------------------------' def make_pnp_url(dashlet, what): - if not dashlet['context'].get('host'): + host = dashlet['context'].get('host') + if not host: raise MKUserError('host', _('Missing needed host parameter.')) + service = dashlet['context'].get('service') if not service: service = "_HOST_" - site = html.var('site') + # When the site is available via URL context, use it. Otherwise it is needed + # to check all sites for the requested host + if html.has_var('site'): + site = html.var('site') + else: + html.live.set_prepend_site(True) + query = "GET hosts\nFilter: name = %s\nColumns: name" % lqencode(host) + site = html.live.query_column(query)[0] + html.live.set_prepend_site(False) + if not site: base_url = defaults.url_prefix else: base_url = html.site_status[site]["site"]["url_prefix"] + base_url += "pnp4nagios/index.php/" var_part = "?host=%s&srv=%s&source=%d&view=%s&theme=multisite" % \ (pnp_cleanup(dashlet['context']['host']), pnp_cleanup(service),

9 years, 4 months

Check_MK Git: check_mk: #1984 FIX Fixed loosing sidebar after switching to /from edit mode in dashboard edior on page reload

by Lars Michelsen

Module: check_mk Branch: master Commit: d6492a3a1638b6aac4ea791ced42f9f0f78fd2ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6492a3a1638b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 18 11:30:54 2015 +0100 #1984 FIX Fixed loosing sidebar after switching to/from edit mode in dashboard edior on page reload When switching to/from edit mode in the dashboard editor, the URL was changed from index.py?... to dashboard.py?... which made the sidebar disappear after reloading the page manually. --- .werks/1984 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 6 ++++-- web/htdocs/js/dashboard.js | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/1984 b/.werks/1984 new file mode 100644 index 0000000..2d9ac2f --- /dev/null +++ b/.werks/1984 @@ -0,0 +1,11 @@ +Title: Fixed loosing sidebar after switching to/from edit mode in dashboard edior on page reload +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424255344 + +When switching to/from edit mode in the dashboard editor, the URL was changed from index.py?... +to dashboard.py?... which made the sidebar disappear after reloading the page manually. diff --git a/ChangeLog b/ChangeLog index 9ed39f0..1b3c767 100644 --- a/ChangeLog +++ b/ChangeLog @@ -200,6 +200,7 @@ * 1980 FIX: logwatch: Fixed exception when acknowledging errors of a single logfile on a single host * 1981 FIX: Not trying to render view in view editor when the view is not valid * 1983 FIX: Fixed special case in language configuration via user profile... + * 1984 FIX: Fixed loosing sidebar after switching to/from edit mode in dashboard edior on page reload... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 6df55e0..ff8d68c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -409,8 +409,10 @@ function getUrlParam(name, url) { * - Can add/overwrite parameters * - Removes _* parameters */ -function makeuri(addvars) { - var tmp = window.location.href.split('?'); +function makeuri(addvars, url) { + var url = (typeof(url) === 'undefined') ? window.location.href : url; + + var tmp = url.split('?'); var base = tmp[0]; if(tmp.length > 1) { // Remove maybe existing anchors diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index c18c33f..e697ddc 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -434,7 +434,7 @@ function toggle_dashboard_edit() { // Only a solution for browsers with history.replaceState support. Sadly // we have no F5/reload fix for others... if (window.parent.history.replaceState) { - new_url = makeuri({'edit': g_editing ? '1' : '0'}); + new_url = makeuri({'edit': g_editing ? '1' : '0'}, window.parent.location.href); window.parent.history.replaceState({}, document.title, new_url); }

9 years, 4 months

Check_MK Git: check_mk: fixed two typos

by Lutz Helwing

Module: check_mk Branch: master Commit: cc1cfdd68e0a59ee7ffc3c656fecd4709a57ee39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc1cfdd68e0a59… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Wed Feb 18 11:00:25 2015 +0100 fixed two typos --- checks/mbg_lantime_ng_state | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/mbg_lantime_ng_state b/checks/mbg_lantime_ng_state index d6cd8c1..4c3217d 100644 --- a/checks/mbg_lantime_ng_state +++ b/checks/mbg_lantime_ng_state @@ -24,9 +24,9 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_mbg_lantime_nb_state(_no_item, params, info): +def check_mbg_lantime_ng_state(_no_item, params, info): states = { - '0': (2, 'not aailable'), + '0': (2, 'not available'), '1': (2, 'not synchronized'), '2': (0, 'synchronized'), } @@ -37,7 +37,7 @@ def check_mbg_lantime_nb_state(_no_item, params, info): check_info["mbg_lantime_ng_state"] = { - 'check_function' : check_mbg_lantime_nb_state, + 'check_function' : check_mbg_lantime_ng_state, 'inventory_function' : inventory_mbg_lantime_state_common, 'service_description' : 'LANTIME State', 'has_perfdata' : True,

9 years, 4 months

Check_MK Git: check_mk: Fixed some English texts

by Mathias Kettner

Module: check_mk Branch: master Commit: c814dd4f5e720824e135e139602ee55aeb5af00f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c814dd4f5e7208… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 18 10:30:46 2015 +0100 Fixed some English texts --- web/htdocs/dashboard.py | 2 +- web/htdocs/wato.py | 2 +- web/plugins/views/bi.py | 2 +- web/plugins/wato/check_parameters.py | 99 ++++++++++++++++------------------ 4 files changed, 50 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c814dd4f5e…

9 years, 4 months

Check_MK Git: check_mk: #1983 FIX Fixed special case in language configuration via user profile

by Lars Michelsen

Module: check_mk Branch: master Commit: 8eb8fa95d094e41372a440cec7c4c5fd6a590375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eb8fa95d094e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 18 08:15:39 2015 +0100 #1983 FIX Fixed special case in language configuration via user profile When a user explicitly configured "english" as language in it's user profile, this setting was not saved correctly. Instead the former configured language or the default configured language was selected again after saving. --- .werks/1983 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/forms.py | 4 ++-- web/htdocs/wato.py | 35 ++++++++++++++++------------------- web/plugins/userdb/hook_auth.py | 11 ++++++++--- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/.werks/1983 b/.werks/1983 new file mode 100644 index 0000000..9737070 --- /dev/null +++ b/.werks/1983 @@ -0,0 +1,13 @@ +Title: Fixed special case in language configuration via user profile +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424243612 + +When a user explicitly configured "english" as language in it's user +profile, this setting was not saved correctly. Instead the former +configured language or the default configured language was selected +again after saving. diff --git a/ChangeLog b/ChangeLog index 56da789..9ed39f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -199,6 +199,7 @@ * 1978 FIX: Fixed linking to other views using "joined columns"... * 1980 FIX: logwatch: Fixed exception when acknowledging errors of a single logfile on a single host * 1981 FIX: Not trying to render view in view editor when the view is not valid + * 1983 FIX: Fixed special case in language configuration via user profile... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 7a7c392..28119c6 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -220,8 +220,8 @@ def section(title = None, checkbox = None, id = "", simple=False, hide = False, if type(checkbox) == str: html.write(checkbox) else: - name, inactive, attrname = checkbox - html.checkbox(name, inactive, onclick = 'wato_toggle_attribute(this, \'%s\')' % attrname) + name, active, attrname = checkbox + html.checkbox(name, active, onclick = 'wato_toggle_attribute(this, \'%s\')' % attrname) html.write('</div>') html.write('</td>') html.write('<td class="content%s">' % (simple and " simple" or "")) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1350a49..e750609 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11991,9 +11991,9 @@ def mode_edit_user(phase): roles.keys()) # Language configuration - set_lang = html.var('_set_lang') + set_lang = html.get_checkbox('_set_lang') language = html.var('language') - if set_lang and language != config.default_language: + if set_lang: if language == '': language = None new_user['language'] = language @@ -12272,7 +12272,7 @@ def mode_edit_user(phase): custom_user_attributes('notify') forms.header(_("Personal Settings"), isopen = False) - select_language(user.get('language', '')) + select_language(user) custom_user_attributes('personal') # TODO: Later we could add custom macros here, which @@ -15676,20 +15676,16 @@ def verify_password_policy(password): 'set a password which uses at least %d of them.') % num_groups) -def select_language(user_language): +def select_language(user): languages = [ l for l in get_languages() if not config.hide_language(l[0]) ] - inactive = not not user_language - if languages: - forms.section(_("Language"), - checkbox = ('_set_lang', inactive, 'language')) - # html.checkbox('_set_lang', inactive, onclick = 'wato_toggle_attribute(this, \'language\')') - # html.write(" ") + active = 'language' in user + forms.section(_("Language"), checkbox = ('_set_lang', active, 'language')) 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) + ((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.get('language') or '') html.write("</div>") html.help(_('Configure the default language ' 'to be used by the user in the user interface here. If you do not check ' @@ -15774,16 +15770,16 @@ def page_user_profile(change_pw=False): success = None if html.has_var('_save') and html.check_transaction(): - try: - users = userdb.load_users(lock = True) + users = userdb.load_users(lock = True) + try: # Profile edit (user options like language etc.) if config.may('general.edit_profile'): if not change_pw: - set_lang = html.var('_set_lang') + set_lang = html.get_checkbox('_set_lang') language = html.var('language') # Set the users language if requested - if set_lang and language != config.get_language(): + if set_lang: if language == '': language = None # Set custom language @@ -15863,6 +15859,8 @@ def page_user_profile(change_pw=False): success = True except MKUserError, e: html.add_user_error(e.varname, e.message) + else: + users = userdb.load_users() # When in distributed setup, display the replication dialog instead of the normal # profile edit dialog after changing the password. @@ -15905,7 +15903,6 @@ def page_user_profile(change_pw=False): if html.has_user_errors(): html.show_user_errors() - users = userdb.load_users() user = users.get(config.user_id) if user == None: html.show_warning(_("Sorry, your user account does not exist.")) @@ -15937,7 +15934,7 @@ def page_user_profile(change_pw=False): html.password_input('password2', autocomplete = "off") if not change_pw and config.may('general.edit_profile'): - select_language(config.get_language('')) + select_language(user) # Let the user configure how he wants to be notified if not rulebased_notifications \ diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index fc34447..d57d1c7 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -89,9 +89,12 @@ def format_php(data, lvl = 1): def create_php_file(callee, users, role_permissions, groups, folder_permissions): + # Do not change WATO internal objects + nagvis_users = copy.deepcopy(users) + # Set a language for all users - for username in users: - users[username].setdefault('language', config.default_language) + for user in nagvis_users.values(): + user.setdefault('language', config.default_language) # need an extra lock file, since we move the auth.php.tmp file later # to auth.php. This move is needed for not having loaded incomplete @@ -224,7 +227,9 @@ function permitted_maps($username) { } ?> -''' % (callee, format_php(users), format_php(role_permissions), format_php(groups), format_php(folder_permissions))) +''' % (callee, format_php(nagvis_users), format_php(role_permissions), + format_php(groups), format_php(folder_permissions))) + # Now really replace the file os.rename(tempfile, g_auth_base_dir + '/auth.php')

9 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015