Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: Updated bug entries #0632

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a7f60e5a7c93428625abc5790d5d576963a0c3f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7f60e5a7c9342… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 14 16:25:53 2012 +0100 Updated bug entries #0632 --- .bugs/632 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/632 b/.bugs/632 new file mode 100644 index 0000000..cb8a441 --- /dev/null +++ b/.bugs/632 @@ -0,0 +1,18 @@ +Title: No Multisite-permission but login +Component: multisite +State: open +Date: 2012-02-14 16:24:10 +Targetversion: 1.2.0 +Class: bug + +If you have no role and thus no permission to use Multisite, then +you can login anyways (via Cookie-based login or other). But +then there is just an error message but no way to log out again. +This is especially bad with Cookie based login since closing +the browser does not help. + +Solution: + +1. Do not allow to save a user without any roles +2. (in addition): Add a logout link to the error +message.

12 years, 4 months

Check_MK Git: check_mk: Format fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 744004681ec0fd479463cfa0e267f07dac6b80a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=744004681ec0fd… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Feb 14 15:42:51 2012 +0100 Format fixes --- doc/treasures/livedump | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/treasures/livedump b/doc/treasures/livedump index c9f2ae8..97582dc 100755 --- a/doc/treasures/livedump +++ b/doc/treasures/livedump @@ -137,7 +137,7 @@ def livedump_config(): " use livedump-service\n" " host_name %(host_name)s\n" " description %(description)s\n" - "%(groupstring)s" + " %(groupstring)s\n" " check_command check-livedump\n" " contacts %(contactsstring)s\n" " max_check_attempts %(max_check_attempts)d\n"

12 years, 4 months

Check_MK Git: check_mk: Helper script for filtering livestatus into NSCA

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6feba59a40f94e88bbb45f173a03ab6b2f6163e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6feba59a40f94… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Feb 14 15:58:27 2012 +0100 Helper script for filtering livestatus into NSCA --- doc/treasures/livestatus-to-nsca.sh | 51 +++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/doc/treasures/livestatus-to-nsca.sh b/doc/treasures/livestatus-to-nsca.sh new file mode 100644 index 0000000..e179f4e --- /dev/null +++ b/doc/treasures/livestatus-to-nsca.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +# A helper script that build a bridge between modern livedump +# for state export while still using legacy NSCA as transport. +# if NSCA is not a strict requirement, walk on and try livedump! + +# Advantages: +# - automagic detection of NSCA-enabled devices +# - use one bulk transfer even with NCSA +# - can run every minute + +# Disadvantages: +# - still using NSCA +# - still have to maintain the config on the NSCA receiver. + + +# Edit these parameters and the livestatus path to match your submission config +# or source them from your submit script. +NagiosDir="/usr/local/nagios" +NscaBin="$NagiosDir/libexec/send_nsca" +NscaCfg="$NagiosDir/etc/send_nsca.cfg" +LiveStatusPipe="$NagiosDir/var/rw/livestatus.cmd" +NagiosHost="nagioshost" + +# Add obsess_over_host = 1 to your filter if you wish to supress superfluous hosts. +echo "GET services +Columns: host_name description state plugin_output +Filter: obsess_over_service = 1" | unixcat $LiveStatusPipe | tr \; "\t" | $NscaBin $NagiosHost -c $NscaCfg

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed several problems in OMD apache shared mode

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26f549dfbb063fce0840213e00ea25ac18ddd200 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26f549dfbb063f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 14:54:15 2012 +0100 FIX: Fixed several problems in OMD apache shared mode --- .bugs/651 | 8 ++++++++ ChangeLog | 1 + web/htdocs/lib.py | 19 ++++++++++++++++++- web/htdocs/login.py | 10 +++++++--- web/htdocs/wato.py | 32 ++++++++++++++++---------------- 5 files changed, 50 insertions(+), 20 deletions(-) diff --git a/.bugs/651 b/.bugs/651 new file mode 100644 index 0000000..e640a22 --- /dev/null +++ b/.bugs/651 @@ -0,0 +1,8 @@ +Title: WAT tag management needs input fields for secondary tags +Component: wato +State: open +Date: 2012-02-14 11:22:42 +Targetversion: future +Class: nastiness + +Is an important feature to be able to manage the tags in wATo. diff --git a/ChangeLog b/ChangeLog index cc75d31..de4f913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * Better output in case of inventory error * FIX: fix bug in host_icon rule on non OMD * FIX: do not use isdisjoint() (was in rule editor on Lenny) + * FIX: Fixed several problems in OMD apache shared mode Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 29736ff..0f07142 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import grp, defaults, pprint, os, gettext, __builtin__ +import grp, defaults, pprint, os, errno, gettext, __builtin__ nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN", 4: "DEPENDENT" } nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN", 4: "DEP" } @@ -75,6 +75,23 @@ def make_nagios_directory(path): "<li>Both Nagios and the web server are in the group <tt>%s</tt>.</ul>Reason: %s" % ( path, defaults.www_group, defaults.www_group, e)) +# Same as make_nagios_directory but also creates parent directories +# Logic has been copied from os.makedirs() +def make_nagios_directories(name): + head, tail = os.path.split(name) + if not tail: + head, tail = os.path.split(head) + if head and tail and not os.path.exists(head): + try: + make_nagios_directories(head) + except os.OSError, e: + # be happy if someone already created the path + if e.errno != errno.EEXIST: + raise + if tail == curdir: # xxx/newdir/. exists if xxx/newdir exists + return + make_nagios_directory(name) + def create_user_file(path, mode): f = file(path, mode, 0) gid = grp.getgrnam(defaults.www_group).gr_gid diff --git a/web/htdocs/login.py b/web/htdocs/login.py index a1a3f8c..b6ea86d 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -73,11 +73,15 @@ def load_htpasswd(): # FIXME: Secret auch replizieren def load_secret(): secret_path = '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) - if not os.path.exists(secret_path): + secret = '' + if os.path.exists(secret_path): + secret = file(secret_path).read().strip() + + # Create new secret when this installation has no secret + if secret == '': secret = md5.md5(str(time.time())).hexdigest() file(secret_path, 'w').write(secret) - else: - secret = file(secret_path).read().strip() + return secret # Generates the hash to be added into the cookie value diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 49188f9..ccc8780 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -483,7 +483,7 @@ def reload_folder(folder): # Load the information about all folders - except the hosts def load_all_folders(): if not os.path.exists(root_dir): - os.makedirs(root_dir) + make_nagios_directories(root_dir) global g_root_folder, g_folders g_folders = {} @@ -599,9 +599,9 @@ def save_hosts(folder = None): dirname = root_dir + folder_path filename = dirname + "/hosts.mk" if not os.path.isdir(dirname): - os.makedirs(dirname) + make_nagios_directories(dirname) - out = file(filename, "w") + out = create_user_file(filename, 'w') hosts = folder.get(".hosts", []) if len(hosts) == 0: @@ -4666,7 +4666,7 @@ def save_configuration_settings(vars): save_configuration_vars(per_domain.get("multisite", {}), multisite_dir + "global.mk") def save_configuration_vars(vars, filename): - out = file(filename, "w") + out = create_user_file(filename, 'w') out.write("# Written by WATO\n# encoding: utf-8\n\n") for varname, value in vars.items(): out.write("%s = %r\n" % (varname, value)) @@ -4879,7 +4879,7 @@ def load_group_information(): def save_group_information(groups): make_nagios_directory(root_dir) - out = file(root_dir + "groups.mk", "w") + out = create_user_file(root_dir + "groups.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") for what in [ "host", "service", "contact" ]: if what in groups and len(groups[what]) > 0: @@ -5016,7 +5016,7 @@ def load_timeperiods(): def save_timeperiods(timeperiods): make_nagios_directory(root_dir) - out = file(root_dir + "timeperiods.mk", "w") + out = create_user_file(root_dir + "timeperiods.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("timeperiods.update(%s)\n" % pprint.pformat(timeperiods)) @@ -5851,7 +5851,7 @@ def save_sites(sites): # Important: even write out sites if it's empty. The global 'sites' # variable will otherwise survive in the Python interpreter of the # Apache processes. - out = file(sites_mk, "w") + out = create_user_file(sites_mk, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("sites = \\\n%s\n" % pprint.pformat(sites)) update_distributed_wato_file(sites) @@ -6446,7 +6446,7 @@ def automation_push_snapshot(): return _("Internal automation error: %s") % e def create_distributed_wato_file(siteid, mode): - out = file(defaults.check_mk_configdir + "/distributed_wato.mk", "w") + out = create_user_file(defaults.check_mk_configdir + "/distributed_wato.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("# This file has been created by the master site\n" "# push the configuration to us. It makes sure that\n" @@ -6459,7 +6459,7 @@ def delete_distributed_wato_file(): # we do not need write permissions to the conf.d # directory! if os.path.exists(p): - file(p, "w").write("") + create_user_file(p, "w").write("") #. # .-Users/Contacts-------------------------------------------------------. @@ -7068,14 +7068,14 @@ def save_users(profiles): # Check_MK's monitoring contacts filename = root_dir + "contacts.mk" - out = file(filename, "w") + out = create_user_file(filename, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("contacts.update(\n%s\n)\n" % pprint.pformat(contacts)) # Users with passwords for Multisite make_nagios_directory(multisite_dir) filename = multisite_dir + "users.mk" - out = file(filename, "w") + out = create_user_file(filename, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("multisite_users = \\\n%s\n" % pprint.pformat(users)) @@ -7085,7 +7085,7 @@ def save_users(profiles): # WATO, you should continue to do so or stop doing to for ever... # Locked accounts get a '!' before their password. This disable it. filename = defaults.htpasswd_file - out = file(filename, "w") + out = create_user_file(filename, "w") for id, user in profiles.items(): if user.get("password"): if user.get("locked", False): @@ -7416,7 +7416,7 @@ def load_roles(): try: vars = { "roles" : roles } - execfile(filename, vars, vars) + exec(filename, vars, vars) # Reflect the data in the roles dict kept in the config module Needed # for instant changes in current page while saving modified roles. # Otherwise the hooks would work with old data when using helper @@ -7440,7 +7440,7 @@ def save_roles(roles): make_nagios_directory(multisite_dir) filename = multisite_dir + "roles.mk" - out = file(filename, "w") + out = create_user_file(filename, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("roles.update(\n%s)\n" % pprint.pformat(roles)) @@ -7810,7 +7810,7 @@ def load_hosttags(): def save_hosttags(hosttags): make_nagios_directory(multisite_dir) - out = file(multisite_dir + "hosttags.mk", "w") + out = create_user_file(multisite_dir + "hosttags.mk", "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("wato_host_tags += \\\n%s\n" % pprint.pformat(hosttags)) @@ -9029,7 +9029,7 @@ def mode_edit_rule(phase): def save_rulesets(folder, rulesets): make_nagios_directory(root_dir) path = root_dir + '/' + folder['.path'] + '/' + "rules.mk" - out = file(path, "w") + out = create_user_file(path, "w") out.write("# Written by WATO\n# encoding: utf-8\n\n") for varname, rulespec in g_rulespecs.items():

12 years, 4 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: 45b3abbaaa9311ada9d878065e23d030f133fa43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45b3abbaaa9311… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 15:01:02 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog web/htdocs/login.py ---

12 years, 4 months

Check_MK Git: check_mk: mk_oracle (lnx+win): Fixed TEMP tablespace size calculations

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2e0417f90642eeab54ba92f5aeb0c5d78f767f98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e0417f90642ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 13 13:28:34 2012 +0100 mk_oracle (lnx+win): Fixed TEMP tablespace size calculations --- ChangeLog | 1 + agents/plugins/mk_oracle | 14 +++++++++++--- agents/windows/plugins/mk_oracle.bat | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8548556..cc75d31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ on HP-UX. * if/if64: inventory also picks up type 62 (fastEther). This is needed on Cisco WLC 21xx series (thanks to Ralf Ertzinger) + * mk_oracle (lnx+win): Fixed TEMP tablespace size calculations Multisite: * Added several missing localization stringsw diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index eaeb49c..3f5ecb3 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -101,6 +101,11 @@ for SID in $SIDS; do { # Only execute checks when not filtered + if [ "$EXCLUDE" = "${EXCLUDE/oracle_version/}" ]; then + echo '<<<oracle_sessions>>>' + echo \"select banner from v\\\$version where banner like 'Oracle%';\" | sqlplus \"$SID\" + fi + if [ "$EXCLUDE" = "${EXCLUDE/oracle_sessions/}" ]; then echo '<<<oracle_sessions>>>' echo \"select count(*) from v\\\$session where status = 'ACTIVE';\" | sqlplus \"$SID\" @@ -127,9 +132,12 @@ for SID in $SIDS; do UNION select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', - t.BLOCK_SIZE, t.status, 0 - from dba_temp_files f, dba_tablespaces t - where f.tablespace_name = t.tablespace_name; + t.BLOCK_SIZE, t.status, sum(sh.blocks_free) free_blocks + from dba_temp_files f, dba_tablespaces t, v$temp_space_header sh + WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id + GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, + f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, + 'TEMP', t.block_size, t.status; EOF fi } > $CACHE_FILE.new && mv $CACHE_FILE.new $CACHE_FILE || rm -f $CACHE_FILE* diff --git a/agents/windows/plugins/mk_oracle.bat b/agents/windows/plugins/mk_oracle.bat index 1f3971d..fc80416 100644 --- a/agents/windows/plugins/mk_oracle.bat +++ b/agents/windows/plugins/mk_oracle.bat @@ -9,14 +9,14 @@ REM ; If you like to use a special auth parameter please change the line below SET AUTH=/ as sysdba echo ^<^<^<oracle_version^>^>^> -(echo.|set /p x=%ORACLE_SID%) +(echo.|set /p x=%ORACLE_SID% ) ( echo set cmdsep on echo set cmdsep '"'; --" echo "set pages 0" echo "set feedback off" echo "set head off" -echo "select * from v$version;" +echo "select banner from v$version where banner like 'Oracle%%';" ) | sqlplus -S %AUTH% echo ^<^<^<oracle_sessions^>^>^> @@ -54,5 +54,5 @@ echo "set feedback off" echo "set head off" echo "column instance format a10" echo "column file_name format a100" -echo "select th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from v$thread th, dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION select th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, 0 from v$thread th, dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name;" +echo "select th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from v$thread th, dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION SELECT th.instance, f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, sum(sh.blocks_free) free_blocks FROM v$thread th, dba_temp_files f, dba_tablespaces t, v$temp_space_header sh WHERE f.tablespace_name = t.tablespace_name and f.file_id = sh.file_id GROUP BY th.instance, f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, 'TEMP', t.block_size, t.status;" ) | sqlplus -S %AUTH%

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0650

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f3dfb793efa4ba36062680e276c5bc18c1c53e16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3dfb793efa4ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 13 16:34:54 2012 +0100 Updated bug entries #0650 --- .bugs/650 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/650 b/.bugs/650 new file mode 100644 index 0000000..9915edb --- /dev/null +++ b/.bugs/650 @@ -0,0 +1,8 @@ +Title: OMD shared mode: <site>/etc/auth.secret not writeable +Component: multisite +State: open +Date: 2012-02-13 16:05:37 +Targetversion: future +Class: bug + +The file can not be written by the system wide apache.

12 years, 4 months

Check_MK Git: check_mk: Fix man page for mem.win

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0c37bc0480365299cd4e5dd6f1fec9b3a93ad407 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c37bc04803652… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 14 14:00:10 2012 +0100 Fix man page for mem.win --- checkman/mem.win | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/mem.win b/checkman/mem.win index ccd06e0..8b6081b 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -25,7 +25,7 @@ examples: # Disable memory levels for all hosts with the tag "test" check_parameters += [ - ( { "memory" : ("101.0", "101.0") }, + ( { "memory" : (101.0, 101.0) }, [ "test" ], ALL_HOSTS, [ "Memory and pagefile" ] ), ]

12 years, 4 months

Check_MK Git: check_mk: WATO: allow UTF 8 encoded permission translations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a2531e6a73a853f7c8ea877d43643b695821eab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a2531e6a73a85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 13 17:05:29 2012 +0100 WATO: allow UTF 8 encoded permission translations --- ChangeLog | 1 + web/htdocs/wato.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1df497f..0d28249 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Better output in case of inventory error * FIX: fix bug in host_icon rule on non OMD * FIX: do not use isdisjoint() (was in rule editor on Lenny) + * FIX: allow UTF-8 encoded permission translations Checks & Agents: * hpux_if: fix missing default parameter errors diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 49188f9..10dcdc1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7379,7 +7379,9 @@ def mode_edit_role(phase): pvalue = role["permissions"].get(pname) def_value = base_role_id in perm["defaults"] - html.write("<tr><td class=left>%s %s</td>" % (perm["title"], perm["description"])) + html.write("<tr><td class=left>%s %s</td>" % ( + make_unicode(perm["title"]), make_unicode(perm["description"]))) + html.write("<td class=right>") choices = [ ( "yes", _("yes")), ( "no", _("no")), @@ -7396,6 +7398,12 @@ def mode_edit_role(phase): html.hidden_fields() html.end_form() +def make_unicode(s): + if type(s) != unicode: # assume utf-8 encoded bytestring + return s.decode("utf-8") + else: + return s + def load_roles(): # Fake builtin roles into user roles.

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0631

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cf8659960681adda1b987c24bea7c48c7d399e89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf8659960681ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 13 11:41:20 2012 +0100 Updated bug entries #0631 --- .bugs/631 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/631 b/.bugs/631 new file mode 100644 index 0000000..c9271ba --- /dev/null +++ b/.bugs/631 @@ -0,0 +1,12 @@ +Title: WATO folder view: tags in table take too much space +Component: wato +State: open +Date: 2012-02-13 11:39:57 +Targetversion: 1.2.0 +Class: nastiness + +In the table of hosts when you have defined more than just a few +host tags the table looks nasty since the tags column takes +up to much space. We could either hide the tags or - maybe +this is better - just show the first X characters and put +the complete list into the title= attribute.

12 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012