Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1461 msexch_dag.copyqueue: added a WATO rule for this check

by Goetz Golla

Module: check_mk Branch: master Commit: 6cd432c479b34450a05f5d132a5cb187045a5601 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cd432c479b344… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Dec 22 15:45:33 2014 +0100 #1461 msexch_dag.copyqueue: added a WATO rule for this check --- .werks/1461 | 9 +++++++++ ChangeLog | 1 + checks/msexch_dag | 1 + web/plugins/wato/check_parameters.py | 21 +++++++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/.werks/1461 b/.werks/1461 new file mode 100644 index 0000000..5536970 --- /dev/null +++ b/.werks/1461 @@ -0,0 +1,9 @@ +Title: msexch_dag.copyqueue: added a WATO rule for this check +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1419259490 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1e14875..f990db4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ WATO: * 1760 Added search form to manual checks page * 1785 Upload SNMP MIBs via WATO... + * 1461 msexch_dag.copyqueue: added a WATO rule for this check * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/checks/msexch_dag b/checks/msexch_dag index 522b34d..e70b2cf 100644 --- a/checks/msexch_dag +++ b/checks/msexch_dag @@ -245,4 +245,5 @@ check_info['msexch_dag.copyqueue'] = { "check_function" : check_msexch_dag_copyqueue, "service_description" : "Exchange DAG CopyQueue of %s", "has_perfdata" : True, + "group" : "msexch_copyqueue", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4835919..a294929 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1985,6 +1985,27 @@ register_check_parameters( "first" ) +register_check_parameters( + subgroup_applications, + "msexch_copyqueue", + _("MS Exchange DAG CopyQueue"), + Tuple( + title = _("Upper Levels for CopyQueue Length"), + help = _("This rule sets upper levels to the number of transaction logs waiting to be copied " + "and inspected on your Exchange Mailbox Servers in a Database Availability Group " + "(DAG). This is also known as the CopyQueue length."), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")) + ], + ), + TextAscii( + title = _("Database Name"), + help = _("The database name on the Mailbox Server."), + ), + "first" +) + def get_free_used_dynamic_valuespec(what, name, default_value = (80.0, 90.0)): if what == "used": title = _("used space")

9 years, 8 months

Check_MK Git: check_mk: WATO inventory rule description of winperf_msx_queues check now consistent with rule description

by Goetz Golla

Module: check_mk Branch: master Commit: 41b635c19b3a45d8d244f2a363529b8217fb6042 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41b635c19b3a45… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Dec 22 14:01:14 2014 +0100 WATO inventory rule description of winperf_msx_queues check now consistent with rule description --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e4cf3ba..4835919 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4479,7 +4479,7 @@ register_rule(group + '/' + subgroup_networking, register_rule(group + '/' + subgroup_inventory, varname = "winperf_msx_queues_inventory", - title = _('Microsoft Exchange Queues Inventory'), + title = _('MS Exchange Message Queues Inventory'), help = _('Per default all Counters a preconfigured in the check. ' 'It needed it is possible to overwrite that with this rule. ' 'To do that, knowledge about the Agent Output is needed. '),

9 years, 8 months

Check_MK Git: check_mk: #1460 df_netscaler: new check to monitor filesystem usage on Citrix Netscaler devices

by Goetz Golla

Module: check_mk Branch: master Commit: 120af204bc0e40a48739cb233a98f87e1e057ab5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=120af204bc0e40… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Dec 22 12:31:27 2014 +0100 #1460 df_netscaler: new check to monitor filesystem usage on Citrix Netscaler devices --- .werks/1460 | 9 +++++++ ChangeLog | 3 ++- checkman/df_netscaler | 26 +++++++++++++++++++ checks/df_netscaler | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 1 deletion(-) diff --git a/.werks/1460 b/.werks/1460 new file mode 100644 index 0000000..779ebfb --- /dev/null +++ b/.werks/1460 @@ -0,0 +1,9 @@ +Title: df_netscaler: new check to monitor filesystem usage on Citrix Netscaler devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1419247854 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d68dd15..8c0ae11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,13 +10,14 @@ * 1207 services: Check can now be configured with additional names for matching... * 1786 casa_cpu_mem, casa_cpu_temp, casa_cpu_util, casa_fan, casa_power: support more devices, also C100G * 1787 docsis_channels_upstream, docsis_channels_downstream: now also support CASA 100G - * 1459 netscaler_cpu: new check to monitor the CPUs of Citrix Netscaler Appliances * 1519 etherbox.temp: Now supports lower levels, output configurable to Celsius, Fahrenheit or Kelvin... NOTE: Please refer to the migration notes! * 1520 hwg_temp: Now uses new temperature ruleset, allows lower levels and alternate output units.... NOTE: Please refer to the migration notes! * 1521 carel_sensors: Now uses new Temperature WATO-Rule... NOTE: Please refer to the migration notes! + * 1459 netscaler_cpu: new check to monitor the CPUs of Citrix Netscaler Appliances + * 1460 df_netscaler: new check to monitor filesystem usage on Citrix Netscaler devices * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/df_netscaler b/checkman/df_netscaler new file mode 100644 index 0000000..7925d2e --- /dev/null +++ b/checkman/df_netscaler @@ -0,0 +1,26 @@ +title: Citrix Netscaler: Used Space in Filesystems +agents: snmp +catalog: app/netscaler +license: GPL +distribution: check_mk +description: + This check monitors the filesystem usage on Citrix Netscaler appliances. + It uses the {NS-ROOT-MIB} to access the filesystem data. + + The check makes use of the general check framework of the {df} check. Please + refer to the man page of the {df} check for the detailed description of + the check and its numerous features. + +inventory: + All filesystems found will be inventorized except mount points listed + in {inventory_df_exclude_mountpoints} and filesystems with zero size. + +item: + The mount point of the filesystem on the netscaler device. + +perfdata: + See the man page of the {df} check + +[parameters] +parameters (dict): See the man page of the {df} check + diff --git a/checks/df_netscaler b/checks/df_netscaler new file mode 100644 index 0000000..14b3d5b --- /dev/null +++ b/checks/df_netscaler @@ -0,0 +1,67 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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: +# .1.3.6.1.4.1.5951.4.1.1.41.8.1.1.4.47.118.97.114 "/var" +# .1.3.6.1.4.1.5951.4.1.1.41.8.1.1.6.47.102.108.97.115.104 "/flash" +# .1.3.6.1.4.1.5951.4.1.1.41.8.1.2.4.47.118.97.114 96133 +# .1.3.6.1.4.1.5951.4.1.1.41.8.1.2.6.47.102.108.97.115.104 7976 +# .1.3.6.1.4.1.5951.4.1.1.41.8.1.3.4.47.118.97.114 87418 +# .1.3.6.1.4.1.5951.4.1.1.41.8.1.3.6.47.102.108.97.115.104 7256 + +factory_settings["filesystem_default_levels"] = { + "levels" : (90.0, 95.0) +} + +def inventory_df_netscaler(info): + mplist = [] + for mp, size_mb, avail_mb in info: + if int(size_mb) > 0 and mp not in inventory_df_exclude_mountpoints: + mplist.append(mp) + return df_inventory(mplist) + +def check_df_netscaler(item, params, info): + fslist = [] + for mp, size_mb, avail_mb in info: + if "patterns" in params or item == mp: + fslist.append((mp, int(size_mb), int(avail_mb))) + return df_check_filesystem_list(item, params, fslist) + +check_info["df_netscaler"] = { + "check_function" : check_df_netscaler, + "inventory_function" : inventory_df_netscaler, + "default_levels_variable" : "filesystem_default_levels", + "service_description" : "Filesystem %s", + "has_perfdata" : True, + "group" : "filesystem", + "includes" : [ "df.include" ], + "snmp_info" : (".1.3.6.1.4.1.5951.4.1.1.41.8.1", [ + 1, # sysHealthDiskName + 2, # sysHealthDiskSize + 3, # sysHealthDiskAvail + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), +}

9 years, 8 months

Check_MK Git: check_mk: etherbox.temp, hwg_temp: Updated Manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7ed82163bfe99ee0ee9fc9e22ab0075b89b17516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ed82163bfe99e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 22 11:38:39 2014 +0100 etherbox.temp, hwg_temp: Updated Manpage --- checkman/etherbox.temp | 16 ++++++++++++---- checkman/hwg_temp | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/checkman/etherbox.temp b/checkman/etherbox.temp index e8e47a5..0657738 100644 --- a/checkman/etherbox.temp +++ b/checkman/etherbox.temp @@ -18,9 +18,17 @@ inventory: The inventory creates a service for each temperature sensor found [parameters] -warning (int): temperature in degrees at which the check goes warning -critical (int): level for critical temperature +This checks parameters are a dictionary with the +following (optional) keys: - Please note that the sensor can be configured in Degree, Fahrenheit - and Kelvin. + {"levels"}: A tuple (warn, crit) containing the upper levels. No defaults. + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. + + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the +specified unit. If this is not set, output is in degrees Celsius. + + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value +according to the unit sent by the device. This key allows to override that. Tread +lightly, as this may lead to a misinterpreted temperature. Should only be used if +the device reports its unit incorrectly. diff --git a/checkman/hwg_temp b/checkman/hwg_temp index 3ae1bb1..baccf9a 100644 --- a/checkman/hwg_temp +++ b/checkman/hwg_temp @@ -17,6 +17,17 @@ inventory: All available temperature sensors are automatically inventorized. [parameters] -warn(int): Warning level for the temperature. -crit(int): Critical level for the temperature. +This checks parameters are a dictionary with the +following (optional) keys: + {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (30, 35) + + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. + + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the +specified unit. If this is not set, output is in degrees Celsius. + + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value +according to the unit sent by the device. This key allows to override that. Tread +lightly, as this may lead to a misinterpreted temperature. Should only be used if +the device reports its unit incorrectly.

9 years, 8 months

Check_MK Git: check_mk: #1800 FIX Fixed umlauts and HTML tags in exception texts

by Lars Michelsen

Module: check_mk Branch: master Commit: f9e55fcec883767a0766133bc814c285f1934d9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9e55fcec88376… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 19 15:20:30 2014 +0100 #1800 FIX Fixed umlauts and HTML tags in exception texts Previous versions allowed HTML codes to be used in texts of exceptions to give the error messages some kind of markup. This was removed to prevent XSS attacks. Now we changed the code to only allow special markup tags like <tt>, <b>, <i>, <br>. So if you saw these tags in error messages in previous version, they should be fixed now. Additionally, when you used the Web GUI localized, for example in German language, you might have had problems with umlauts in error messages. This has been fixed and cleaned up. --- .werks/1800 | 20 ++++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 6 ++- web/htdocs/htmllib.py | 59 ++++++++++++++-------------- web/htdocs/index.py | 85 ++++++++++++++--------------------------- web/htdocs/lib.py | 40 ++++++++++++------- 6 files changed, 108 insertions(+), 103 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f9e55fcec8…

9 years, 8 months

Check_MK Git: check_mk: Removed unused files

by Bastian Kuhn

Module: check_mk Branch: master Commit: 82e2b98536eb80b7732d7e9e06b1d27e596dadef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82e2b98536eb80… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 19 14:43:27 2014 +0100 Removed unused files --- checkman/esx_vsphere_objects_count | 12 ---------- checks/esx_vsphere_objects_count | 44 ------------------------------------ 2 files changed, 56 deletions(-) diff --git a/checkman/esx_vsphere_objects_count b/checkman/esx_vsphere_objects_count deleted file mode 100644 index af90935..0000000 --- a/checkman/esx_vsphere_objects_count +++ /dev/null @@ -1,12 +0,0 @@ -title: VMWare ESX: Count of VMs on a Host or a vCenter -agents: vsphere -catalog: os/misc -license: GPL -distribution: check_mk -description: - This Check only Output the number of monitored VMs on a Hostsystem or a vCenter. - (Dependig if the special Agents run against a vCenter or a Hostsystem) - -inventory: - One service will be created - diff --git a/checks/esx_vsphere_objects_count b/checks/esx_vsphere_objects_count deleted file mode 100644 index 49cfb38..0000000 --- a/checks/esx_vsphere_objects_count +++ /dev/null @@ -1,44 +0,0 @@ -#!/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: -# <<<esx_vsphere_objects_count>>> -# Virtualmachines 254 - -def inventory_esx_vsphere_objects_count(info): - return [(None, None)] - -def check_esx_vsphere_objects_count(item, _no_params, info): - perfdata = [ ("vms", int(info[0][1]) ) ] - return 0, "%s Virtual Machines on this device" % info[0][1], perfdata - -check_info["esx_vsphere_objects_count"] = { - "check_function" : check_esx_vsphere_objects_count, - "inventory_function" : inventory_esx_vsphere_objects_count, - "service_description" : "Objects Count", - "has_perfdata" : True, -} -

9 years, 8 months

Check_MK Git: check_mk: #1794 FIX Fix exception in WATO service list in case of vanished checks

by Mathias Kettner

Module: check_mk Branch: master Commit: ca9d27910a1f55c844ca05e467a17474fe6ce1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca9d27910a1f55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 19 13:53:23 2014 +0100 #1794 FIX Fix exception in WATO service list in case of vanished checks --- .werks/1794 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1794 b/.werks/1794 new file mode 100644 index 0000000..a941afd --- /dev/null +++ b/.werks/1794 @@ -0,0 +1,10 @@ +Title: Fix exception in WATO service list in case of vanished checks +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418993584 + + diff --git a/ChangeLog b/ChangeLog index 59fc696..2bb4103 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services * 1790 FIX: Fix WATO parameters page for passive checks... + * 1794 FIX: Fix exception in WATO service list in case of vanished checks Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/modules/automation.py b/modules/automation.py index 3e8da31..354708e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -297,8 +297,8 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False, with_snmp_scan=F # Check if already in autochecks (but not found anymore) for ct, item, params in read_autochecks_of(hostname): - if hn == hostname and (ct, item) not in found: - found[(ct, item)] = ( 'vanished', repr(params) ) # This is not the real paramstring! + if (ct, item) not in found: + found[(ct, item)] = ('vanished', repr(params) ) # This is not the real paramstring! # Find manual checks existing = get_check_table(hostname)

9 years, 8 months

Check_MK Git: check_mk: #1793 FIX fritz: avoid Exception in inventory function of fritz checks if agent output is empty

by Mathias Kettner

Module: check_mk Branch: master Commit: 20ce3a8295109f3d191cf716591d145ba7bc4157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20ce3a8295109f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 19 13:52:10 2014 +0100 #1793 FIX fritz: avoid Exception in inventory function of fritz checks if agent output is empty --- .werks/1793 | 10 ++++++++++ ChangeLog | 1 + checks/fritz | 10 ++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/1793 b/.werks/1793 new file mode 100644 index 0000000..c8a6fc4 --- /dev/null +++ b/.werks/1793 @@ -0,0 +1,10 @@ +Title: fritz: avoid Exception in inventory function of fritz checks if agent output is empty +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418993501 + + diff --git a/ChangeLog b/ChangeLog index dc3aaff..59fc696 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 1771 FIX: domino_mailqueues: Fixed exception during inventory when no data usable data available * 1208 FIX: cifsmounts: Detects now unreachable CIFS mounts * 1772 FIX: lparstat_aix: Check handles already working agent output again + * 1793 FIX: fritz: avoid Exception in inventory function of fritz checks if agent output is empty Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/fritz b/checks/fritz index 62dc40e..751cb62 100644 --- a/checks/fritz +++ b/checks/fritz @@ -122,7 +122,9 @@ check_info['fritz.config'] = { # def fritz_wan_if_to_if64(data): - if data['NewLinkStatus'] == 'Up': + if 'NewLinkStatus' not in data: + oper_status = None + elif data['NewLinkStatus'] == 'Up': oper_status = '1' else: oper_status = '2' @@ -131,9 +133,9 @@ def fritz_wan_if_to_if64(data): # ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, # inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, outucast, # outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias, ifPhysAddress - ('0', 'WAN', '6', data['NewLayer1DownstreamMaxBitRate'], oper_status, - data['NewTotalBytesReceived'], '0', '0', '0', '0', '0', - data['NewTotalBytesSent'], '0', '0', '0', '0', '0', '0', + ('0', 'WAN', '6', data.get('NewLayer1DownstreamMaxBitRate'), oper_status, + data.get('NewTotalBytesReceived'), '0', '0', '0', '0', '0', + data.get('NewTotalBytesSent'), '0', '0', '0', '0', '0', '0', 'WAN', '') ]

9 years, 8 months

Check_MK Git: check_mk: #1792 FIX Fix path to special agents in case of manual installation

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ecb92a9faaf90cff02eac06bfb00cfb7d66f2f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ecb92a9faaf90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 19 13:49:41 2014 +0100 #1792 FIX Fix path to special agents in case of manual installation --- .werks/1792 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 5 +++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/1792 b/.werks/1792 new file mode 100644 index 0000000..0f59f1d --- /dev/null +++ b/.werks/1792 @@ -0,0 +1,10 @@ +Title: Fix path to special agents in case of manual installation +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418993367 + + diff --git a/ChangeLog b/ChangeLog index b0130c2..dc3aaff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 1759 Packed RPM and DEB agent packages are now shipped with normal Check_MK package... * 1791 FIX: Fix problem where many bogus RRD files for Check_MK service would be created... + * 1792 FIX: Fix path to special agents in case of manual installation Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index dcb10d3..045a7d3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -109,7 +109,6 @@ checks_dir = '/usr/share/check_mk/checks' notifications_dir = '/usr/share/check_mk/notifications' inventory_dir = '/usr/share/check_mk/inventory' agents_dir = '/usr/share/check_mk/agents' -special_agent_dir = agents_dir + "/special" check_manpages_dir = '/usr/share/doc/check_mk/checks' modules_dir = '/usr/share/check_mk/modules' var_dir = '/var/lib/check_mk' @@ -1089,6 +1088,8 @@ def get_sorted_check_table(hostname, remove_duplicates=False, world="config"): # be None in most cases -> to TCP connect on port 6556 def get_datasource_program(hostname, ipaddress): + special_agents_dir = agents_dir + "/special" + # First check WATO-style special_agent rules for agentname, ruleset in special_agents.items(): params = host_extra_conf(hostname, ruleset) @@ -1099,7 +1100,7 @@ def get_datasource_program(hostname, ipaddress): os.path.exists(local_special_agents_dir + "/agent_" + agentname): path = local_special_agents_dir + "/agent_" + agentname else: - path = special_agent_dir + "/agent_" + agentname + path = special_agents_dir + "/agent_" + agentname return path + " " + cmd_arguments programs = host_extra_conf(hostname, datasource_programs)

9 years, 8 months

Check_MK Git: check_mk: Fix internal UTF-8 problem in html.attrencode

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e2e93bbc17f73a802291d0ef1ff7214df168e69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e2e93bbc17f73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 19 12:11:09 2014 +0100 Fix internal UTF-8 problem in html.attrencode --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/htmllib.py | 9 +++++---- web/htdocs/index.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 1d9dc24..99bc8bd 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -145,7 +145,7 @@ class html_mod_python(htmllib.html): def log(self, msg): if type(msg) != str: msg = repr(msg) - self.req.log_error(msg, apache.APLOG_WARNING) + self.req.log_error(msg, apache.APLOG_ERR) def http_redirect(self, url): self.set_http_header('Location', url) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 61bb742..36e6cec 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1275,15 +1275,16 @@ class html: # From here: Former not class functions - # This function returns a str object, never unicode! # Encode HTML attributes: replace " with ", also replace - # < and >. This code is slow. + # < and >. This code is slow. Works on str and unicode without + # changing the type. Also works on things that can be converted + # with %s. def attrencode(self, value): ty = type(value) if ty == int: return str(value) - elif ty not in [str, unicode]: - value = str(value) + elif ty not in [str, unicode]: # also possible: type Exception! + value = "%s" % value # Note: this allows Unicode. value might not have type str now return value.replace('"', """).replace("<", "<").replace(">", ">") diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 3dd259a..8150be5 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -272,7 +272,7 @@ def handler(req, fields = None, profiling = True): html.header(_("Configuration Error")) html.show_error(unicode(html.attrencode(e))) html.footer() - apache.log_error(_("Configuration error: %s") % (e,), apache.APLOG_ERR) + html.log(_("Configuration error: %s") % (e,)) except MKGeneralException, e: if plain_error: @@ -281,7 +281,7 @@ def handler(req, fields = None, profiling = True): html.header(_("Error")) html.show_error(unicode(html.attrencode(e))) html.footer() - apache.log_error(_("Error: %s") % (e,), apache.APLOG_ERR) + html.log(_("Error: %s") % (e,)) except livestatus.MKLivestatusNotFoundError, e: if plain_error:

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014