Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2711 janitza_umg: added support for umg508

by Sebastian Herbord

Module: check_mk Branch: master Commit: 87c2659c78a40f1565a7ab0d4320fe924daf0449 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87c2659c78a40f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Nov 17 10:15:52 2015 +0100 #2711 janitza_umg: added support for umg508 The umg508 uses the identical mib to umg604 so no functional changes were necessary. In the same process the device identification was improved. --- .werks/2711 | 10 ++++++++++ ChangeLog | 1 + checkman/janitza_umg | 4 ++-- checks/janitza_umg | 30 +++++++++++++++++++----------- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.werks/2711 b/.werks/2711 new file mode 100644 index 0000000..bdb3b2b --- /dev/null +++ b/.werks/2711 @@ -0,0 +1,10 @@ +Title: janitza_umg: added support for umg508 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447751629 +Class: feature + +The umg508 uses the identical mib to umg604 so no functional changes were necessary. +In the same process the device identification was improved. diff --git a/ChangeLog b/ChangeLog index 0150070..a458e7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 2833 isc_dhcpd, win_dhcp_pools: lower levels for used dhcp leases are now configurable... * 2789 netapp_api_snapvault: No longer monitors uninitialized volumes... * 2710 arbor_peakflow_sp, arbor_peakflow_sp.cpu_load, arbor_peakflow_sp.disk_usage, arbor_peakflow_sp.flows, arbor_peakflow_tms, arbor_peakflow_tms.cpu_load, arbor_peakflow_tms.disk_usage, arbor_peakflow_tms.host_fault, arbor_peakflow_tms.updates, arbor_pravail, arbor_pravail.cpu_load, arbor_pravail.disk_usage, arbor_pravail.host_fault: new checks for various arbor devices + * 2711 janitza_umg: added support for umg508... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checkman/janitza_umg b/checkman/janitza_umg index 8588f58..bceebdf 100644 --- a/checkman/janitza_umg +++ b/checkman/janitza_umg @@ -5,8 +5,8 @@ license: GPL distribution: check_mk description: Monitors voltage, current, power, apparent power and energy on Janitza Power - Analyzers. This currently supports the devices UMG 604 and UMG 96 though others - from the same line may be very similar. + Analyzers. This currently supports the devices UMG 604, UMG 508 and UMG 96 + though others from the same line may be very similar. item: The identifier of the phase ({"Phase 1"}, {"Phase 2"}, {"Phase 3"}). diff --git a/checks/janitza_umg b/checks/janitza_umg index 2830bdf..8faaedf 100644 --- a/checks/janitza_umg +++ b/checks/janitza_umg @@ -25,19 +25,26 @@ # Boston, MA 02110-1301 USA. +# 508 and 604 have the same mib +janitza_umg_device_map = { + ".1.3.6.1.4.1.34278.8.6" : "96", + ".1.3.6.1.4.1.34278.10.1" : "604", + ".1.3.6.1.4.1.34278.10.4" : "508", +} + + def parse_janitza_umg_inphase(info): def flatten(line): return [x[0] for x in line] - if "604" in info[0][0][0]: - dev_type = "604" - elif "96" in info[0][0][0]: - dev_type = "96" - else: - # unrecognized device - return {} + dev_type = janitza_umg_device_map[info[0][0][0]] info_offsets = { + "508" : { + "energy": 4, + "sumenergy": 5, + "misc": 8, + }, "604" : { "energy": 4, "sumenergy": 5, @@ -55,7 +62,7 @@ def parse_janitza_umg_inphase(info): energy = flatten(info[info_offsets["energy"]]) sumenergy = flatten(info[info_offsets["sumenergy"]]) - if dev_type == "604": + if dev_type in ["508", "604"]: num_phases = 4 num_currents = 4 elif dev_type == "96": @@ -98,6 +105,7 @@ def parse_janitza_umg_inphase(info): misc = flatten(info[info_offsets["misc"]]) result["Frequency"] = int(misc[0]) + # temperature not present in UMG508 and UMG604 if len(misc) > 1: result["Temperature"] = map(int, misc[1:]) else: @@ -121,7 +129,7 @@ check_info['janitza_umg'] = { 'includes' : [ "elphase.include", ], 'group' : 'el_inphase', 'snmp_info' : [ - (".1.3.6.1.2.1.1", [ "5" ]), # device id + (".1.3.6.1.2.1.1.2", [ "0" ]), # device id (".1.3.6.1.4.1.34278", [ "1" ]), # rmsPhase (".1.3.6.1.4.1.34278", [ "2" ]), # rmsSum (".1.3.6.1.4.1.34278", [ "3" ]), # device dependent @@ -131,8 +139,8 @@ check_info['janitza_umg'] = { (".1.3.6.1.4.1.34278", [ "7" ]), # " (".1.3.6.1.4.1.34278", [ "8" ]), # " ], - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.34278.8.6", - ".1.3.6.1.4.1.34278.10.1"] + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in + janitza_umg_device_map.keys() }

8 years, 7 months

#1302 Added new WATO permission to deactivate the function rename of hosts

by Bastian Kuhn

Module: check_mk Branch: master Commit: b5fb884d4670e612cc44b83480b38ea2c7c2f6cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5fb884d4670e6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 17 14:31:16 2015 +0100 #1302 Added new WATO permission to deactivate the function rename of hosts Whit this new role permission it's no possible to control who can or not can rename hosts. --- .werks/1302 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 18 ++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.werks/1302 b/.werks/1302 new file mode 100644 index 0000000..a782629 --- /dev/null +++ b/.werks/1302 @@ -0,0 +1,10 @@ +Title: Added new WATO permission to deactivate the function rename of hosts +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1447767011 +Class: feature + +Whit this new role permission it's no possible to control who can or not can rename hosts. + diff --git a/ChangeLog b/ChangeLog index d9530f7..6aeab0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... * 2785 WATO Web-API: i18n of error messages and intitial validation of incoming request... + * 1302 Added new WATO permission to deactivate the function rename of hosts... * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 54d336c..07a6af8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -875,7 +875,8 @@ def mode_folder(phase): if config.may("wato.services"): html.context_button(_("Bulk Discovery"), make_link([("mode", "bulkinventory"), ("all", "1")]), "inventory") - html.context_button(_("Bulk Renaming"), make_link([("mode", "bulk_rename_host")]), "rename_host") + if config.may("wato.rename_hosts"): + html.context_button(_("Bulk Renaming"), make_link([("mode", "bulk_rename_host")]), "rename_host") if not g_folder.get(".lock_hosts") and config.may("wato.parentscan") and auth_write: html.context_button(_("Parent scan"), make_link([("mode", "parentscan"), ("all", "1")]), "parentscan") @@ -2063,7 +2064,7 @@ def mode_edithost(phase, new, cluster): if config.may('wato.rulesets'): html.context_button(_("Parameters"), make_link([("mode", "object_parameters"), ("host", hostname)]), "rulesets") - if not g_folder.get(".lock_hosts"): + if config.may("wato.rename_hosts") and not g_folder.get(".lock_hosts"): html.context_button(_("Rename %s") % (cluster and _("Cluster") or _("Host")), make_link([("mode", "rename_host"), ("host", hostname)]), "rename_host") if not cluster: @@ -2280,6 +2281,10 @@ def check_edit_host_permissions(folder, host, hostname): # '----------------------------------------------------------------------' def mode_bulk_rename_host(phase): + + if not config.may("wato.rename_hosts"): + raise MKGeneralException(_("You don't have the right to rename hosts")) + if phase == "title": return _("Bulk renaming of hosts") @@ -2513,6 +2518,9 @@ def mode_rename_host(phase): if hostname not in g_folder[".hosts"]: raise MKGeneralException(_("You called this page with an invalid host name.")) + if not config.may("wato.rename_hosts"): + raise MKGeneralException(_("You don't have the right to rename hosts")) + check_host_permissions(hostname) host = g_folder[".hosts"][hostname] @@ -20500,6 +20508,12 @@ def load_plugins(): "<i>Modify existing hosts</i>."), [ "admin", "user" ]) + config.declare_permission("wato.rename_hosts", + _("Rename existing hosts"), + _("Rename existing hosts. Please also add the permission " + "<i>Modify existing hosts</i>."), + [ "admin" ]) + config.declare_permission("wato.manage_hosts", _("Add & remove hosts"), _("Add hosts to the monitoring and remove hosts "

8 years, 7 months

#2794 FIX The encoding parameter set in the agent sections was not working

by Andreas Boesl

Module: check_mk Branch: master Commit: cdc6abeea8f88a9acadca8baa15c9a238c563117 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdc6abeea8f88a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 17 13:58:52 2015 +0100 #2794 FIX The encoding parameter set in the agent sections was not working You can configure the encoding of agent sections with the additional section parameter <i>encoding(cp437)</i>, e.g. "<<<mycheck:sep(9):encoding(cp437)>>>. This feature was broken, due to some code restructuring a few months ago. --- .werks/2794 | 11 +++++++++++ ChangeLog | 3 ++- modules/check_mk_base.py | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2794 b/.werks/2794 new file mode 100644 index 0000000..63ff5a6 --- /dev/null +++ b/.werks/2794 @@ -0,0 +1,11 @@ +Title: The encoding parameter set in the agent sections was not working +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447764921 +Class: fix + +You can configure the encoding of agent sections with the additional section parameter +<i>encoding(cp437)</i>, e.g. "<<<mycheck:sep(9):encoding(cp437)>>>. +This feature was broken, due to some code restructuring a few months ago. diff --git a/ChangeLog b/ChangeLog index 9e6912a..dcec0cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 2836 FIX: pandacom_psu: fixed handling of not available power supplies * 2766 FIX: juniper_fru: Don't discover devices reported as "empty"... * 2790 FIX: check_dns: now able to configure milliseconds as expected response time... + * 2794 FIX: The encoding parameter set in the agent sections was not working... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... @@ -120,7 +121,7 @@ * 2760 FIX: Fixed case where "activate changes" was not commiting the pending changes entries correctly... * 2767 FIX: Fixed broken user list when non unicode mail addresses are loaded * 2791 FIX: Service parameter overview: Fixed problem displaying incorrect rule for classical checks... - * 2793 FIX: Prevent python unicode warnings for services with umlauts... + * 2793 FIX: Parameter Overview: Prevent python unicode warnings for services with umlauts... Notifications: * 2728 FIX: Removed debug notification script (was not executable)... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3951089..1a5286e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -944,7 +944,7 @@ def parse_info(lines, hostname): def decode_incoming_string(s, encoding="utf-8"): try: - return s.decode('utf-8') + return s.decode(encoding) except: return s.decode(fallback_agent_output_encoding)

8 years, 7 months

Made default css/js inclusion more dynamically

by Lars Michelsen

Module: check_mk Branch: master Commit: 341bbeb4bec746da2b8227f235847071fde37329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=341bbeb4bec746… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 17 13:43:02 2015 +0100 Made default css/js inclusion more dynamically --- web/htdocs/htmllib.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e65651d..dedb631 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -115,6 +115,8 @@ class html: self.current_transid = None self.page_context = {} self.body_classes = ['main'] + self._default_javascripts = [ "checkmk", "graphs" ] + self._default_stylesheets = [ "check_mk", "graphs" ] # Time measurement self.times = {} @@ -809,7 +811,7 @@ class html: self.write('<base target="%s">\n' % self.attrencode(self.link_target)) # Load all specified style sheets and all user style sheets in htdocs/css - for css in [ "check_mk", "graphs" ] + stylesheets + [ 'ie' ]: + for css in self._default_stylesheets + stylesheets + [ 'ie' ]: if defaults.omd_root: rel_path = "/share/check_mk/web/htdocs/" + css + ".css" if os.path.exists(defaults.omd_root + rel_path) or \ @@ -828,7 +830,7 @@ class html: self.add_custom_style_sheet() - for js in [ "checkmk", "graphs" ] + javascripts: + for js in self._default_javascripts + javascripts: filename_for_browser = self.javascript_filename_for_browser(js) if filename_for_browser: self.javascript_file(filename_for_browser)

8 years, 7 months

Generalized i18n code a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 885c24ca0c8cc5973f3a4e22fba966d18c02e1be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=885c24ca0c8cc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 17 13:34:13 2015 +0100 Generalized i18n code a bit --- web/htdocs/i18n.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index 8b8fcb6..a83a356 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -113,13 +113,13 @@ def unlocalize(): __builtin__.current_language = None -def localize(lang): +def localize(lang, **kwargs): if lang: # FIXME: Clean this up. Make the other code access the current language through a # function of this module. __builtin__.current_language = lang - translation = translations.get(lang, init_language(lang)) + translation = translations.get(lang, init_language(lang, **kwargs)) if translation: translation.install(unicode = True) else:

8 years, 7 months

Generalized i18n code a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: f1f999a0c1c1b5da11022b2ba6bc88ac6b675ef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1f999a0c1c1b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 17 13:29:16 2015 +0100 Generalized i18n code a bit --- web/htdocs/i18n.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index cef85e8..8b8fcb6 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -78,8 +78,8 @@ def get_languages(): return list(languages) -def init_language(lang): - locale_base = defaults.locale_dir +def get_cmk_locale_path(lang): + locale_path = defaults.locale_dir # OMD users can put their localization into a local path into the site if defaults.omd_root: @@ -87,10 +87,17 @@ def init_language(lang): po_path = '/%s/LC_MESSAGES/multisite.mo' % lang # Use file in OMD local strucuture when existing if os.path.exists(local_locale_path + po_path): - locale_base = local_locale_path + locale_path = local_locale_path + + return locale_path + + +def init_language(lang, domain="multisite", locale_path=None): + if locale_path == None: + locale_path = get_cmk_locale_path(lang) try: - translation = gettext.translation('multisite', locale_base, + translation = gettext.translation(domain, locale_path, languages = [ lang ], codeset = 'UTF-8') except IOError, e: translation = None

8 years, 7 months

update #2793: fixed another python unicode warning ( automation active-check)

by Andreas Boesl

Module: check_mk Branch: master Commit: f049e8f575e8004a909c5c0600cfe6b899f4c7b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f049e8f575e800… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 17 13:26:43 2015 +0100 update #2793: fixed another python unicode warning (automation active-check) --- modules/automation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/automation.py b/modules/automation.py index 578fd4a..c28d905 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1151,6 +1151,7 @@ def automation_get_bulks(args): def automation_active_check(args): hostname, plugin, item = args + item = item.decode("utf-8") actchecks = [] needed_commands = []

8 years, 7 months

Added missing favicon to login page

by Lars Michelsen

Module: check_mk Branch: master Commit: 92ba8102cca640511061e594bf156716f2d03e54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92ba8102cca640… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 17 11:22:47 2015 +0100 Added missing favicon to login page --- web/htdocs/htmllib.py | 15 ++++++++++----- web/htdocs/main.py | 10 ++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0a961c3..e65651d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -786,16 +786,21 @@ class html: self.write("</x>") self.form_vars.append(varname) + + def default_html_headers(self): + self.write('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n') + self.write('<meta http-equiv="X-UA-Compatible" content="IE=edge" />\n') + self.write('<link rel="shortcut icon" href="images/favicon.ico" type="image/ico">\n') + + def html_head(self, title, javascripts = [], stylesheets = ["pages"], force=False): if not self.header_sent or force: - self.write( - u'''<!DOCTYPE HTML> -<html><head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n''') + self.write('<!DOCTYPE HTML>\n' + '<html><head>\n') + self.default_html_headers() self.write('<title>') self.write(self.attrencode(title)) self.write('</title>\n') - self.write('<meta http-equiv="X-UA-Compatible" content="IE=edge" />') # If the variable _link_target is set, then all links in this page # should be targetted to the HTML frame named by _link_target. This diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 8133673..80416ba 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -44,12 +44,10 @@ def page_index(): else: heading = config.page_heading - html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> -<html> -<head> - <title>%s</title> - <meta http-equiv="X-UA-Compatible" content="IE=edge" /> - <link rel="shortcut icon" href="images/favicon.ico" type="image/ico"> + html.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">\n' + '<html><head>\n') + html.default_html_headers() + html.write("""<title>%s</title> </head> <frameset cols="280,*" frameborder="0" framespacing="0" border="0"> <frame src="side.py" name="side" noresize scrolling="no">

8 years, 7 months

Added new Check_MK logo to page headers and mobile login page

by Lars Michelsen

Module: check_mk Branch: master Commit: d0cc30edbfa9ad5af64211e67f949f472783fadc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0cc30edbfa9ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 17 11:12:10 2015 +0100 Added new Check_MK logo to page headers and mobile login page --- web/htdocs/dashboard.css | 2 +- web/htdocs/htmllib.py | 3 ++- web/htdocs/images/favicon.ico | Bin 1406 -> 3262 bytes web/htdocs/images/logo_cmk_small.png | Bin 0 -> 3674 bytes web/htdocs/images/logo_mk_small.png | Bin 1198 -> 0 bytes web/htdocs/mobile.css | 4 +++- web/htdocs/mobile.py | 7 ++++--- web/htdocs/pages.css | 29 ++++++++++++++++------------- 8 files changed, 26 insertions(+), 19 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 8bbdb4b..6c8e7c5 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -33,7 +33,7 @@ body.main { } body.main table.header { - padding: 5px 5px 10px 5px; + padding: 10px; } div#dashboard { diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 65502fb..0a961c3 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -914,7 +914,8 @@ class html: onclick="toggle_help()", style="display:none", ty="icon", cssclass=cssclass) self.write("%s</td></tr></table>" % - _("<a href=\"http://mathias-kettner.de\"><img src=\"images/logo_mk_small.png\"/></a>")) + _("<a class=head_logo href=\"http://mathias-kettner.de\">" + "<img src=\"images/logo_cmk_small.png\"/></a>")) self.write("<hr class=header>\n") if self.enable_debug: self.dump_get_vars() diff --git a/web/htdocs/images/favicon.ico b/web/htdocs/images/favicon.ico index 2e8c4ea..ef3036f 100644 Binary files a/web/htdocs/images/favicon.ico and b/web/htdocs/images/favicon.ico differ diff --git a/web/htdocs/images/logo_cmk_small.png b/web/htdocs/images/logo_cmk_small.png new file mode 100644 index 0000000..f7cd0d6 Binary files /dev/null and b/web/htdocs/images/logo_cmk_small.png differ diff --git a/web/htdocs/images/logo_mk_small.png b/web/htdocs/images/logo_mk_small.png deleted file mode 100644 index 24f5560..0000000 Binary files a/web/htdocs/images/logo_mk_small.png and /dev/null differ diff --git a/web/htdocs/mobile.css b/web/htdocs/mobile.css index 2979b42..aaf8f7d 100644 --- a/web/htdocs/mobile.css +++ b/web/htdocs/mobile.css @@ -216,7 +216,9 @@ body.mobile table.dataset tr.data td.state { margin-top: 1em; } img.logomk { - width: 20%; + width: 25px; + height: 25px; + margin-bottom: 10px; } diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index bae0784..1b476a6 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -154,7 +154,7 @@ def page_login(): mobile_html_head(title) jqm_page_header(title, id="login") html.write('<div id="loginhead">%s</div>' % - _("Welcome to Check_MK Multisite Mobile. Please Login.")) + _("Welcome to Check_MK Mobile.")) html.begin_form("login", method = 'POST', add_transid = False) # Keep information about original target URL @@ -170,8 +170,9 @@ def page_login(): html.set_focus("_username") html.end_form() html.write('<div id="loginfoot">') - html.write('<img class="logomk" src="images/logo_mk.png">') - html.write('<div class="copyright">%s</div>' % _("Copyright Mathias Kettner 2012")) + html.write('<img class="logomk" src="images/logo_cmk_small.png">') + html.write('<div class="copyright">%s</div>' % + _("© <a target=\"_blank\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) html.write('</div>') jqm_page_footer() mobile_html_foot() diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 3105eb6..4d981d7 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -128,8 +128,20 @@ body.main table.header td.right { body.main table.header td.right img { - position: relative; - top: 5px; + width: 19px; + height: 19px; + vertical-align: bottom; +} + +body.main table.header td.right a.head_logo img { + width: 23px; + height: 23px; + margin: 0 0 1px 5px; +} + +body.main table.header td.right a.head_logo img:hover { + opacity: 0.5; + filter: alpha(opacity=50); } body.main hr.header { @@ -510,13 +522,9 @@ input[type=text], input[type=password] { } select { height: 24px; - /* border-style: solid none; - border-width: 2px; - border-color: red; */ box-shadow: 0.1px 1.2px 1.8px 0 #888 inset; vertical-align: middle; padding-top: 4px; - /* padding: 1px 3px; */ } @@ -890,13 +898,8 @@ div.togglebutton.checkbox.off { opacity: 0.5; filter: alpha(opacity=50); } | | '-------------------------------------------------------------------------*/ -a#helpbutton { - width: 19px; - height: 19px; - margin: 0 5px; - position: relative; - top: -8px; - left: -2px; +body.main table.header td.right a#helpbutton img { + margin: 1px 5px; } a#helpbutton.passive {

8 years, 7 months

#2793 FIX Prevent python unicode warnings for services with umlauts

by Andreas Boesl

Module: check_mk Branch: master Commit: 86568aaf90e8565ab09a74262f4ebdf214a38d9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86568aaf90e856… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 17 10:47:33 2015 +0100 #2793 FIX Prevent python unicode warnings for services with umlauts The parameter overview page for a service failed when there were umlauts in the service description. This bug was introduced a few months ago during some internal code restructuring concerning unicode strings. --- .werks/2793 | 11 +++++++++++ ChangeLog | 1 + modules/automation.py | 2 +- modules/check_mk.py | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2793 b/.werks/2793 new file mode 100644 index 0000000..64ecdec --- /dev/null +++ b/.werks/2793 @@ -0,0 +1,11 @@ +Title: Parameter Overview: Prevent python unicode warnings for services with umlauts +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1447753328 +Class: fix + +The parameter overview page for a service failed when there were umlauts +in the service description. This bug was introduced a few months ago during +some internal code restructuring concerning unicode strings. diff --git a/ChangeLog b/ChangeLog index f50e247..9e6912a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ * 2760 FIX: Fixed case where "activate changes" was not commiting the pending changes entries correctly... * 2767 FIX: Fixed broken user list when non unicode mail addresses are loaded * 2791 FIX: Service parameter overview: Fixed problem displaying incorrect rule for classical checks... + * 2793 FIX: Prevent python unicode warnings for services with umlauts... Notifications: * 2728 FIX: Removed debug notification script (was not executable)... diff --git a/modules/automation.py b/modules/automation.py index f303302..578fd4a 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -240,7 +240,7 @@ def schedule_inventory_check(hostname): def automation_analyse_service(args): global g_hostname hostname = args[0] - servicedesc = args[1] + servicedesc = args[1].decode("utf-8") g_hostname = hostname # To be sure for all subfunctions # We just consider types of checks that are managed via WATO. diff --git a/modules/check_mk.py b/modules/check_mk.py index f654be4..9d3639b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2249,6 +2249,9 @@ def service_description(check_type, item): else: descr_format = check_info[check_type]["service_description"] + if type(descr_format) == str: + descr_format = descr_format.decode("utf-8") + # Note: we strip the service description (remove spaces). # One check defines "Pages %s" as a description, but the item # can by empty in some cases. Nagios silently drops leading

8 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015