Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

Check_MK Git: check_mk: ibm_svc_nodestats.diskio: new check for disk troughput per node on IBM SVC / V7000 devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 4a545a51e399287c29d3dab88d01d0740367e715 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a545a51e39928… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Mar 28 14:05:06 2014 +0100 ibm_svc_nodestats.diskio: new check for disk troughput per node on IBM SVC / V7000 devices --- .werks/774 | 8 ++ ChangeLog | 3 + checkman/ibm_svc_nodestats.diskio | 19 +++ checks/ibm_svc_nodestats | 135 ++++++++++++++++++++ .../check_mk-ibm_svc_nodestats.diskio.php | 1 + web/plugins/perfometer/check_mk.py | 1 + web/plugins/wato/datasource_programs.py | 4 +- 7 files changed, 169 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4a545a51e3…

10 years, 3 months

Check_MK Git: check_mk: ibm_svc_system: new check for System Info of IBM SVC / V7000 devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f444e5291713463fb7da4fb96b2f7ef5583be44f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f444e529171346… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Mar 28 11:31:31 2014 +0100 ibm_svc_system: new check for System Info of IBM SVC / V7000 devices --- .werks/773 | 8 +++ ChangeLog | 1 + checkman/ibm_svc_system | 12 ++++ checks/ibm_svc_system | 116 +++++++++++++++++++++++++++++++ web/plugins/wato/datasource_programs.py | 5 +- 5 files changed, 140 insertions(+), 2 deletions(-) diff --git a/.werks/773 b/.werks/773 new file mode 100644 index 0000000..583c2a7 --- /dev/null +++ b/.werks/773 @@ -0,0 +1,8 @@ +Title: ibm_svc_system: new check for System Info of IBM SVC / V7000 devices +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1396002652 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7aada6d..2f3460a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,7 @@ * 0770 innovaphone_licenses: New check to monitor licenses on innovaphone devices" * 0771 juniper_trpz_aps: Show the number of connected access points on juniper wlan controllers * 0772 added special agent for IBM SVC / V7000 storage systems... + * 0773 ibm_svc_system: new check for System Info of IBM SVC / V7000 devices * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/ibm_svc_system b/checkman/ibm_svc_system new file mode 100644 index 0000000..7b6d62b --- /dev/null +++ b/checkman/ibm_svc_system @@ -0,0 +1,12 @@ +title: IBM SVC / V7000: System Info +agents: ibm_svc +catalog: hw/storagehw/ibm +license: GPL +distribution: check_mk +description: + Reports name, location, code_level and email_contact_location of an + IBM SVC / V7000 device. The check always returns {OK}. + +inventory: + Creates exactly one check for every IBM SVC / V7000 named + IBM SVC Info. diff --git a/checks/ibm_svc_system b/checks/ibm_svc_system new file mode 100644 index 0000000..506225b --- /dev/null +++ b/checks/ibm_svc_system @@ -0,0 +1,116 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Example output from agent: +# <<<ibm_svc_system:sep(58)>>> +# id:0000020060C16104 +# name:BLUBB_NAME +# location:local +# partnership: +# bandwidth: +# total_mdisk_capacity:192.9TB +# space_in_mdisk_grps:192.9TB +# space_allocated_to_vdisks:147.48TB +# total_free_space:45.5TB +# total_vdiskcopy_capacity:149.54TB +# total_used_capacity:147.44TB +# total_overallocation:77 +# total_vdisk_capacity:74.77TB +# total_allocated_extent_capacity:147.49TB +# statistics_status:on +# statistics_frequency:5 +# cluster_locale:en_US +# time_zone:384 Europe/Paris +# code_level:6.4.1.4 (build 75.3.1303080000) +# console_IP:x.x.x.x:443 +# id_alias:0000020060C16104 +# gm_link_tolerance:300 +# gm_inter_cluster_delay_simulation:0 +# gm_intra_cluster_delay_simulation:0 +# gm_max_host_delay:5 +# email_reply:master@desaster +# email_contact:Wichtiger Admin +# email_contact_primary:+49 30 555555555 +# email_contact_alternate: +# email_contact_location:blubb +# email_contact2: +# email_contact2_primary: +# email_contact2_alternate: +# email_state:running +# inventory_mail_interval:7 +# cluster_ntp_IP_address:x.x.x.x +# cluster_isns_IP_address: +# iscsi_auth_method:none +# iscsi_chap_secret: +# auth_service_configured:no +# auth_service_enabled:no +# auth_service_url: +# auth_service_user_name: +# auth_service_pwd_set:no +# auth_service_cert_set:no +# auth_service_type:tip +# relationship_bandwidth_limit:25 +# tier:generic_ssd +# tier_capacity:0.00MB +# tier_free_capacity:0.00MB +# tier:generic_hdd +# tier_capacity:192.94TB +# tier_free_capacity:45.46TB +# has_nas_key:no +# layer:replication +# rc_buffer_size:48 +# compression_active:no +# compression_virtual_capacity:0.00MB +# compression_compressed_capacity:0.00MB +# compression_uncompressed_capacity:0.00MB +# cache_prefetch:on +# email_organization:Acme Inc +# email_machine_address: +# email_machine_city:Berlin +# email_machine_state:XX +# email_machine_zip: +# email_machine_country:DE +# total_drive_raw_capacity:0 + +def inventory_ibm_svc_system(info): + return [(None, None)] + +def check_ibm_svc_system(item, _no_params, info): + message = "" + for line in info: + if line[0] in ("name", "location", "code_level", "email_contact_location"): + if message != "": + message += ", " + message += "%s: %s" % (line[0], line[1]) + return 0, message + +check_info["ibm_svc_system"] = { + "check_function" : check_ibm_svc_system, + "inventory_function" : inventory_ibm_svc_system, + "service_description" : "IBM SVC Info", + "has_perfdata" : False, +} + diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index e5dfc59..2c59442 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -271,12 +271,13 @@ register_rule(group, ( "lsmdiskgrp", _("MDisksGrps") ), ( "lsnode", _("IO Groups") ), # ( "lsnodestats", _("Node Stats") ), -# ( "lssystem", _("System") ), + ( "lssystem", _("System Info") ), # ( "lssystemstats", _("System Stats") ), ], # default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", # "lsnodestats", "lssystem", "lssystemstats", ], - default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", ], + default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", + "lssystem", ], allow_empty = False, ), title = _("Retrieve information about..."),

10 years, 3 months

Check_MK Git: check_mk: manually resolving merge conflicts in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c7efc4ddc907b8d99b90c14a9e318581fe5e9039 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7efc4ddc907b8… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Mar 28 11:32:49 2014 +0100 manually resolving merge conflicts in ChangeLog ---

10 years, 3 months

Check_MK Git: check_mk: enterasys_fans: New Check to monitor fans of enterasys swichtes

by Bastian Kuhn

Module: check_mk Branch: master Commit: a888c1608e3bf8ca0bd3bb5fcf4bbd76cb8779f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a888c1608e3bf8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 28 11:18:11 2014 +0100 enterasys_fans: New Check to monitor fans of enterasys swichtes --- .werks/147 | 8 +++++++ ChangeLog | 1 + checkman/enterasys_fans | 16 ++++++++++++++ checks/enterasys_fans | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) diff --git a/.werks/147 b/.werks/147 new file mode 100644 index 0000000..e270cab --- /dev/null +++ b/.werks/147 @@ -0,0 +1,8 @@ +Title: enterasys_fans: New Check to monitor fans of enterasys swichtes +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1396001864 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4d39944..26a2291 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 0770 innovaphone_licenses: New check to monitor licenses on innovaphone devices" * 0771 juniper_trpz_aps: Show the number of connected access points on juniper wlan controllers * 0772 added special agent for IBM SVC / V7000 storage systems... + * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/enterasys_fans b/checkman/enterasys_fans new file mode 100644 index 0000000..70f44c5 --- /dev/null +++ b/checkman/enterasys_fans @@ -0,0 +1,16 @@ +title: Enterasys: Fans +agents: snmp +catalog: hw/network/enterasys +license: GPL +distribution: check_mk +description: + This check monitors the health of the Fans. It will return an {UKN} state if the status changes + to "infoNotAvailable" or "notInstalled", and to {CRIT} if the state changes to "installedAndNotOperating". + No configuration is necessary. + +item: + The id of the FAN like reported in the output of the SNMP agent. + +inventory: + One check is created for each Fan. + diff --git a/checks/enterasys_fans b/checks/enterasys_fans new file mode 100644 index 0000000..aaf5f2c --- /dev/null +++ b/checks/enterasys_fans @@ -0,0 +1,54 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +def inventory_enterasys_fans(info): + return [ (x[0], None) for x in info if x[1] != '2' ] + +def check_enterasys_fans(item, _no_params, info): + fan_states = { + "1" : "info not available", + "2" : "not installed", + "3" : "installed and operating", + "4" : "installed and not operating", + } + for num, state in info: + if num == item: + message = "FAN State: %s" % ( fan_states[state] ) + if state in [ "1", "2" ]: + return 3, message + if state == "4": + return 2, message + return 0, message + + +check_info["enterasys_fans"] = { + "check_function" : check_enterasys_fans, + "inventory_function" : inventory_enterasys_fans, + "service_description" : "FAN %s", + "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.3.1.1", [ OID_END, 2 ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"), +} +

10 years, 3 months

Check_MK Git: check_mk: FIX Availablity: Prevent crash if the notification period is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: c5d0d1d6588725f7549595451258f7ef0fc55aa8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d0d1d6588725… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 28 10:36:10 2014 +0100 FIX Availablity: Prevent crash if the notification period is missing There are some setup where the notification period of a nagios object was set to NULL. --- .werks/739 | 8 ++++++++ ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/.werks/739 b/.werks/739 new file mode 100644 index 0000000..599abd9 --- /dev/null +++ b/.werks/739 @@ -0,0 +1,8 @@ +Title: Availablity: Prevent crash if the notification period is missing +Level: 1 +Component: core +Version: 1.2.5i1 +Date: 1395999230 +Class: fix + +There are some setup where the notification period of a nagios object was set to NULL. diff --git a/ChangeLog b/ChangeLog index 7064a84..7aada6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 0282 FIX: TIMEPERIOD TRANSITION messages no longer cut at 64 bytes... * 0730 FIX: cmc: fixed bug displaying logentries after a logfile rotation... * 0140 FIX: Fixed unwanted handling of hostname as regex... + * 0739 FIX: Availablity: Prevent crash if the notification period is missing... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index a399e9e..ee1f8c6 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -527,6 +527,11 @@ void TableStateHistory::answerQuery(Query *query) else state->_notification_period = (char *)""; + // If for some reason the notification period is missing set a default + if (state->_notification_period == NULL) { + state->_notification_period = (char *)""; + } + // Same for service period. For Nagios this is a bit different, since this // is no native field but just a custom variable if (state->_service != 0)

10 years, 3 months

Check_MK Git: check_mk: FIX hpux_if: Fixed exception during parsing of provided data on some systems

by Lars Michelsen

Module: check_mk Branch: master Commit: 1452e74fbf397812b8b884f6dbf97d3208f57bc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1452e74fbf3978… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 28 10:23:59 2014 +0100 FIX hpux_if: Fixed exception during parsing of provided data on some systems Some systems provide float values instead of ints. Parsing failed in this case with a ValueError exception. --- .werks/763 | 10 ++++++++++ ChangeLog | 1 + checks/hpux_if | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/763 b/.werks/763 new file mode 100644 index 0000000..8542aaf --- /dev/null +++ b/.werks/763 @@ -0,0 +1,10 @@ +Title: hpux_if: Fixed exception during parsing of provided data on some systems +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1395998553 + +Some systems provide float values instead of ints. Parsing failed in this case +with a ValueError exception. diff --git a/ChangeLog b/ChangeLog index e900da7..503949c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -237,6 +237,7 @@ * 0758 FIX: check_sql: Fixed monitoring of stored procedures with oracle * 0599 FIX: esx_vsphere_datastores: provisioning levels in WATO are no longer limited to 101% * 0737 FIX: megaraid_ldisks: now able to handle "No Virtual Drive Configured" states... + * 0763 FIX: hpux_if: Fixed exception during parsing of provided data on some systems... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/hpux_if b/checks/hpux_if index 9dba74a..4cad7d3 100644 --- a/checks/hpux_if +++ b/checks/hpux_if @@ -116,7 +116,7 @@ def hpux_parse_speed(speed): mult = 1000 * 1000 * 1000 else: mult = 1000 * 1000 - return int(parts[0]) * mult + return float(parts[0]) * mult def hpux_parse_operstatus(txt): if txt.lower() == "up":

10 years, 3 months

Check_MK Git: check_mk: added special agent for IBM SVC / V7000 storage systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e84865946a8b359ffce1969036402dbdfa79a91f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e84865946a8b35… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Mar 28 10:16:44 2014 +0100 added special agent for IBM SVC / V7000 storage systems Added a special agent for IBM SVC / V7000 storage systems and a WATO rule for configuring it. This way you do not need any longer give the very long SSH command manually as a datasource program. --- .werks/772 | 8 +- ChangeLog | 2 +- agents/special/agent_ibmsvc | 184 +++++++++++++++++++++++++++++++ checks/agent_ibmsvc | 37 +++++++ web/plugins/wato/datasource_programs.py | 62 +++++++++++ 5 files changed, 289 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e84865946a…

10 years, 3 months

Check_MK Git: check_mk: Updated bug entries #2097, #1090

by Lars Michelsen

Module: check_mk Branch: master Commit: e6e707289b17ca1fe841568bda91080b19e10464 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6e707289b17ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 28 10:12:15 2014 +0100 Updated bug entries #2097, #1090 --- .bugs/1090 | 7 +++++-- .bugs/2097 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/1090 b/.bugs/1090 index bb25412..8dcb7d5 100644 --- a/.bugs/1090 +++ b/.bugs/1090 @@ -1,8 +1,11 @@ Title: IE8: availability options do not work Component: multisite -State: open +Class: bug +State: done Date: 2014-02-12 09:23:30 Targetversion: 1.2.5i1 -Class: bug The availability options cannot be opened on IE8. Happens in version 1.2.4. + +2014-03-28 10:12:12: changed state open -> done +This did not happen in IE8 for me, but in IE7. Fixed it. diff --git a/.bugs/2097 b/.bugs/2097 index cb7e72f..948434a 100644 --- a/.bugs/2097 +++ b/.bugs/2097 @@ -1,9 +1,9 @@ Title: Livestatus is not compatible to Nagios 4 Component: livestatus -State: open +Class: feature +State: done Date: 2013-12-16 14:00:17 Targetversion: future -Class: feature Configuration @@ -43,3 +43,6 @@ lized ------------------------------------- Livestatus needs to know for which nagios core to compile and use different headers. + +2014-03-28 10:11:29: changed state open -> done +Has already been implemented via configure flag.

10 years, 3 months

Check_MK Git: check_mk: FIX Fixed availability filters not opening in IE7

by Lars Michelsen

Module: check_mk Branch: master Commit: c8e2df934d32fcde51abbbeaa36c7680dbe2695e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8e2df934d32fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 28 10:10:44 2014 +0100 FIX Fixed availability filters not opening in IE7 --- .werks/762 | 9 +++++++++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/.werks/762 b/.werks/762 new file mode 100644 index 0000000..2fdbfd2 --- /dev/null +++ b/.werks/762 @@ -0,0 +1,9 @@ +Title: Fixed availability filters not opening in IE7 +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1395997821 + + diff --git a/ChangeLog b/ChangeLog index 7e22dec..e900da7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -286,6 +286,7 @@ * 0558 FIX: availability: fixed exception on specific filter settings... * 0712 FIX: Fix multiple groups with same tag when grouping hosts after a tag... * 0738 FIX: csv_export: now able to handle umlauts in download filenames... + * 0762 FIX: Fixed availability filters not opening in IE7 WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7011f9f..a3c17a9 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -106,6 +106,28 @@ if (!document.getElementsByClassName) { } } +// Again, some IE 7 fun: The IE7 mixes up name and id attributes of objects. +// When using getElementById() where we really only want to match objects by +// their id, the clever IE7 also searches objects by their names, wow. crap. +if (navigator.appVersion.indexOf("MSIE 7.") != -1) +{ + document._getElementById = document.getElementById; + document.getElementById = function(id) { + var e = document._getElementById(id); + if (e) { + if (e.attributes['id'].value == id) + return e; + else { + for (var i = 1; i < document.all[id].length; i++) { + if(document.all[id][i].attributes['id'].value == id) + return document.all[id][i]; + } + } + } + return null; + }; +} + function getTarget(event) { return event.target ? event.target : event.srcElement; }

10 years, 3 months

Check_MK Git: check_mk: FIX csv_export: now able to handle umlauts in download filenames

by Andreas Boesl

Module: check_mk Branch: master Commit: 49b5ce3152a5e1da6f9ccb331c393bc5c495d5fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49b5ce3152a5e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 27 17:07:00 2014 +0100 FIX csv_export: now able to handle umlauts in download filenames The csv export function raised an exception when the type of the filename was set to unicode. This happened when the filename text contained umlauts. Filenames are now converted to utf-8 in this case. --- .werks/738 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 2 ++ web/plugins/views/webservice.py | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/.werks/738 b/.werks/738 new file mode 100644 index 0000000..4c3ee4a --- /dev/null +++ b/.werks/738 @@ -0,0 +1,11 @@ +Title: csv_export: now able to handle umlauts in download filenames +Level: 1 +Component: multisite +Version: 1.2.5i1 +Date: 1395936272 +Class: fix + +The csv export function raised an exception when the +type of the filename was set to unicode. This happened when +the filename text contained umlauts. +Filenames are now converted to utf-8 in this case. diff --git a/ChangeLog b/ChangeLog index ea5f2fb..7e22dec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -285,6 +285,7 @@ * 0671 FIX: LDAP: Disable logging of password changes received from LDAP * 0558 FIX: availability: fixed exception on specific filter settings... * 0712 FIX: Fix multiple groups with same tag when grouping hosts after a tag... + * 0738 FIX: csv_export: now able to handle umlauts in download filenames... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 907a460..435f4f6 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -62,6 +62,8 @@ def render_availability(view, datasource, filterheaders, display_options, do_csv = True html.req.content_type = "text/csv; charset=UTF-8" filename = '%s-%s.csv' % (title, time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) + if type(filename) == unicode: + filename = filename.encode("utf-8") html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename else: do_csv = False diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index cbc9a1d..c32e88b 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -67,6 +67,8 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox if export: html.req.content_type = "appliation/json; charset=UTF-8" filename = '%s-%s.json' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) + if type(filename) == unicode: + filename = filename.encode("utf-8") html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename html.write("[\n") @@ -124,6 +126,8 @@ def render_csv(rows, view, group_painters, painters, num_columns, show_checkboxe if export: html.req.content_type = "text/csv; charset=UTF-8" filename = '%s-%s.csv' % (view['name'], time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))) + if type(filename) == unicode: + filename = filename.encode("utf-8") html.req.headers_out['Content-Disposition'] = 'Attachment; filename=%s' % filename csv_separator = html.var("csv_separator", ";")

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014