Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: removed print statement

by Bastian Kuhn

Module: check_mk Branch: master Commit: e6594dcae5c63d0159385f8f4282511e9d745dc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6594dcae5c63d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 5 11:53:31 2014 +0100 removed print statement --- checks/cisco_cpu | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index ac79034..03e41d5 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -30,7 +30,6 @@ cisco_cpu_default_levels = (80.0, 90.0) def inventory_cisco_cpu(info): - print info if info: return [( None, 'cisco_cpu_default_levels') ]

9 years, 7 months

Check_MK Git: check_mk: cisco_cpu: improved scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7ca532c65fa3d862049e56824f02265e3a239b3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ca532c65fa3d8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 5 11:53:01 2014 +0100 cisco_cpu: improved scan function --- checks/cisco_cpu | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index 43cc85f..ac79034 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -29,6 +29,11 @@ cisco_cpu_default_levels = (80.0, 90.0) +def inventory_cisco_cpu(info): + print info + if info: + return [( None, 'cisco_cpu_default_levels') ] + def check_cisco_cpu(item, params, info): if info[0][1]: util = float(info[0][1]) @@ -46,12 +51,12 @@ def check_cisco_cpu(item, params, info): check_info["cisco_cpu"] = { "check_function" : check_cisco_cpu, - "inventory_function" : lambda info: [(None, "cisco_cpu_default_levels")], + "inventory_function" : inventory_cisco_cpu, "service_description" : "CPU utilization", "has_perfdata" : True, "group" : "cpu_utilization", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.8.1") \ - or oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.5.1"), + "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1", [ 5, 8 ]), }

9 years, 7 months

Check_MK Git: check_mk: DualListChoice now deals totally correct with multiple selected elements

by Lars Michelsen

Module: check_mk Branch: master Commit: 7edbc603f9dcd889045e05bd291969eda509ce50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7edbc603f9dcd8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 11:33:05 2014 +0100 DualListChoice now deals totally correct with multiple selected elements --- web/htdocs/js/checkmk.js | 58 +++++++++++++++++++++++++++------------------- web/htdocs/valuespec.py | 2 ++ 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 5e9d4b9..2b0fcfb 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1746,35 +1746,45 @@ function vs_duallist_switch(field_suffix, varprefix, keeporder) { if (!helper) return; - // Move the selected option to the other select field - var selected = field.options[field.selectedIndex]; - if (typeof selected === 'undefined') - return; // when add/remove clicked, but none selected - field.removeChild(selected); - - // Determine the correct child to insert. If keeporder is being set, - // then new elements will aways be appended. That way the user can - // create an order of his choice. This is being used if DualListChoice - // has the option custom_order = True - var sibling = false; - - if (!keeporder) { - sibling = other_field.firstChild; - while (sibling != null) { - if (sibling.nodeType == 1 && sibling.label.toLowerCase() > selected.label.toLowerCase()) - break; - sibling = sibling.nextSibling + // Move the selected options to the other select field + var selected = []; + for (var i = 0; i < field.options.length; i++) { + if (field.options[i].selected) { + selected.push(field.options[i]); } } + if (selected.length == 0) + return; // when add/remove clicked, but none selected - if (sibling) - other_field.insertBefore(selected, sibling); - else - other_field.appendChild(selected); + // Now loop over all selected elements and add them to the other field + for (var i = 0; i < selected.length; i++) { + // remove option from origin + field.removeChild(selected[i]); + + // Determine the correct child to insert. If keeporder is being set, + // then new elements will aways be appended. That way the user can + // create an order of his choice. This is being used if DualListChoice + // has the option custom_order = True + var sibling = false; + + if (!keeporder) { + sibling = other_field.firstChild; + while (sibling != null) { + if (sibling.nodeType == 1 && sibling.label.toLowerCase() > selected[i].label.toLowerCase()) + break; + sibling = sibling.nextSibling + } + } + + if (sibling) + other_field.insertBefore(selected[i], sibling); + else + other_field.appendChild(selected[i]); - selected.selected = false; + selected[i].selected = false; + } - // add remove from internal helper field + // Update internal helper field which contains a list of all selected keys if (positive) var pos_field = other_field; else diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index dc72c4d..10088d8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1597,6 +1597,7 @@ class DualListChoice(ListChoice): html.sorted_select(varprefix + '_unselected', unselected, attrs = { 'size' : 5, + 'multiple' : 'multiple', 'style' : self._autoheight and 'height:auto' or '', 'ondblclick' : not self._instant_add and select_func or '', }, @@ -1606,6 +1607,7 @@ class DualListChoice(ListChoice): func(varprefix + '_selected', selected, attrs = { 'size' : 5, + 'multiple' : 'multiple', 'style' : self._autoheight and 'height:auto' or '', 'ondblclick' : not self._instant_add and unselect_func or '', },

9 years, 7 months

Check_MK Git: check_mk: #1444 f5_bigip_chassis_temp, f5_bigip_cpu_temp: Two new checks to replace the old f5_bigip_temp

by Konstantin Büttner

Module: check_mk Branch: master Commit: e6f6e13787ad28798cc357b7f4b69c90845abc9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6f6e13787ad28… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 5 10:32:31 2014 +0100 #1444 f5_bigip_chassis_temp, f5_bigip_cpu_temp: Two new checks to replace the old f5_bigip_temp The check <tt>f5_bigip_temp</tt> has been removed and replaced by <tt>f5_bigip_chassis_temp</tt> and <tt>f5_bigip_cpu_temp</tt>. Reinventorization (<tt>cmk -II</tt>) is required to deploy the new checks and prevent the Check_MK service from warning due to the missing old check. --- .werks/1444 | 11 +++ ChangeLog | 2 + checkman/f5_bigip_chassis_temp | 22 +++++ checkman/f5_bigip_cpu_temp | 22 +++++ checkman/f5_bigip_temp | 18 ---- checks/f5_bigip_chassis_temp | 52 ++++++++++ .../f5_bigip_cpu_temp | 40 +++++--- checks/f5_bigip_temp | 101 -------------------- pnp-templates/check_mk-f5_bigip_chassis_temp.php | 1 + pnp-templates/check_mk-f5_bigip_cpu_temp.php | 1 + web/plugins/perfometer/check_mk.py | 3 +- 11 files changed, 141 insertions(+), 132 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e6f6e13787…

9 years, 7 months

Check_MK Git: check_mk: Cleanup in cisco Checks

by Bastian Kuhn

Module: check_mk Branch: master Commit: 94e039be947b57e9fdf5ef5ce0c6910d6d3acc5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94e039be947b57… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 5 10:13:27 2014 +0100 Cleanup in cisco Checks --- checks/cisco_fan | 11 +++++----- checks/cisco_fantray | 4 +++- checks/cisco_power | 8 +++---- checks/cisco_sensor_item.include | 45 ++++++++++++++++++++++++++++++++++++++ checks/cisco_temp_perf | 20 +++++++++-------- 5 files changed, 68 insertions(+), 20 deletions(-) diff --git a/checks/cisco_fan b/checks/cisco_fan index 3f19223..6aec2a7 100644 --- a/checks/cisco_fan +++ b/checks/cisco_fan @@ -28,12 +28,12 @@ cisco_fan_states = ('', 'normal', 'warning', 'critical', 'shutdown', 'notPresent', 'notFunctioning') def inventory_cisco_fan(info): - return [ (line[0], None) for line in info if line[1] != '5' ] + return [ (cisco_sensor_item(line[0],line[-1]), None) for line in info if line[1] != '5' ] def check_cisco_fan(item, params, info): - for line in info: - if line[0] == item: - state = saveint(line[1]) + for statustext, state, oid_end in info: + if cisco_sensor_item(statustext, oid_end) == item: + state = int(state) if state == 1: return (0, "State is: %s (%d)" % (cisco_fan_states[state], state)) elif state == 2: @@ -47,7 +47,8 @@ check_info["cisco_fan"] = { 'check_function': check_cisco_fan, 'inventory_function': inventory_cisco_fan, 'service_description': 'FAN %s', - 'snmp_info': ('.1.3.6.1.4.1.9.9.13.1.4.1', ['2', '3']), + 'snmp_info': ('.1.3.6.1.4.1.9.9.13.1.4.1', ['2', '3', OID_END]), 'snmp_scan_function': \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "includes" : ['cisco_sensor_item.include'], } diff --git a/checks/cisco_fantray b/checks/cisco_fantray index e973cc5..8c3a7cd 100644 --- a/checks/cisco_fantray +++ b/checks/cisco_fantray @@ -54,5 +54,7 @@ check_info["cisco_fantray"] = { 'inventory_function' : inventory_cisco_fantray, 'service_description' : 'FAN %s', 'snmp_info' : ('.1.3.6.1.4.1.9.9.117.1.4.1.1.1', [ OID_END, '' ]), - 'snmp_scan_function' : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), + 'snmp_scan_function' : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + # Exclude cisco_fan check: + and not oid(".1.3.6.1.4.1.9.9.13.1.4.1.2.*"), } diff --git a/checks/cisco_power b/checks/cisco_power index de8280b..c48e4e6 100644 --- a/checks/cisco_power +++ b/checks/cisco_power @@ -39,16 +39,13 @@ def inventory_cisco_power(info): for line in info: # 5 in line[1] means cisco_power_states = notPresent if 'RPS NotExist' not in line[1] and line[2] != '5': - # There are many types of cisco devices supported by this check - # but they all have difrent behaviors. So we have to use OID_END as - # item to find a way to match them all. - yield line[0], None + yield cisco_sensor_item(line[1], line[0]), None def check_cisco_power(item, no_params, info): for sid, textinfo, state, source in info: state = int(state) source = int(source) - if sid == item: + if cisco_sensor_item(textinfo, sid) == item: output = '%s, State: %s, Source: %s' % \ (textinfo, cisco_power_states[state], cisco_power_source[source]) if state == 1: @@ -67,4 +64,5 @@ check_info["cisco_power"] = { 'snmp_info': ('.1.3.6.1.4.1.9.9.13.1.5.1', [OID_END, 2, 3, 4]), 'snmp_scan_function': \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "includes" : ['cisco_sensor_item.include'], } diff --git a/checks/cisco_sensor_item.include b/checks/cisco_sensor_item.include new file mode 100644 index 0000000..717feb8 --- /dev/null +++ b/checks/cisco_sensor_item.include @@ -0,0 +1,45 @@ +#!/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. + +def cisco_sensor_item(trial_string, fall_back): + # trial_string can be: + # Empty + # A single string + # A string seperated by commas with status information + # -> Depends on the device model + try: + splited = trial_string.split(',') + if len(splited) == 1: + return trial_string + # Try to handle all cases found in mkzeug/walks + if '#' in splited[-1] or 'Power' in splited[-1]: + return " ".join([ x.strip() for x in splited]).replace('#',' ') + if splited[-2].startswith(" Status"): + return " ".join([ x.strip() for x in splited[:-2]]).replace('#',' ') + return " ".join([ x.strip() for x in splited[:-1]]).replace('#',' ') + except: + return fall_back + diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index fa619bb..de9cff2 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -58,21 +58,22 @@ cisco_temp_perf_envmon_states = { def inventory_cisco_temp_perf(info): inventory = [] for line in info: - inventory.append((line[4], None)) - return inventory + yield cisco_sensor_item(line[0], line[4]), None def check_cisco_temp_perf(item, _no_params, info): - for line in info: - if line[4] == item: - temp = saveint(line[1]) + for statustext, temp, max_temp, state, oid_end in info: + if cisco_sensor_item(statustext, oid_end) == item: + #FIXE saveint needed here? (See if condition) + temp = saveint(temp) if temp != 0: - perfdata = [("temp", temp, None, saveint(line[2]) )] - temptext = ", %d degrees (%s) (critical at %d)" % (temp, line[0], saveint(line[2])) + max_temp = int(max_temp) + perfdata = [("temp", temp, None, max_temp )] + temptext = ", %d degrees (critical at %d)" % (temp, max_temp) else: perfdata = [] temptext = "" - state = int(line[3]) + state = int(state) statename = cisco_temp_perf_envmon_states.get(state, "(invalid)") if state == 1: return (0, "state is normal%s" % temptext, perfdata) @@ -96,5 +97,6 @@ check_info['cisco_temp_perf'] = { oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None, "snmp_info" : ( ".1.3.6.1.4.1.9.9.13.1.3.1", [2, 3, 4, 6, OID_END ] ), # CISCO-SMI - "group" : "temperature_auto" + "group" : "temperature_auto", + "includes" : ['cisco_sensor_item.include'], }

9 years, 7 months

Check_MK Git: check_mk: #1487 FIX Fixed exception in Web GUI "

by Lars Michelsen

Internal error:: name 'Filter' is not defined" in manual setups ( using setup.py) Message-ID: <5459dda2.PPKAxdWDOVOqgWQU%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 4efef2e6bd0cbaa268e4716a3dc43ad25776ce1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4efef2e6bd0cba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 09:19:29 2014 +0100 #1487 FIX Fixed exception in Web GUI "Internal error:: name 'Filter' is not defined" in manual setups (using setup.py) Previous versions shipped the file web/plugins/views/filters.py. This file is deprecated now, but manual setups of Check_MK (the ones using setup.py to install Check_MK) have the file left after an update. To workaround this issue, we ship an empty dummy file now to replace the original one. If you like to fix this problem manually without applying this update, just remove the file web/plugins/views/filters.py from your installation. --- .werks/1487 | 15 +++++++++++++++ ChangeLog | 1 + web/plugins/views/filters.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/.werks/1487 b/.werks/1487 new file mode 100644 index 0000000..9313017 --- /dev/null +++ b/.werks/1487 @@ -0,0 +1,15 @@ +Title: Fixed exception in Web GUI "Internal error:: name 'Filter' is not defined" in manual setups (using setup.py) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415175416 + +Previous versions shipped the file web/plugins/views/filters.py. This file is deprecated now, but manual +setups of Check_MK (the ones using setup.py to install Check_MK) have the file left after an update. To +workaround this issue, we ship an empty dummy file now to replace the original one. + +If you like to fix this problem manually without applying this update, just remove the file +web/plugins/views/filters.py from your installation. diff --git a/ChangeLog b/ChangeLog index 34bcc09..5851996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters * 1482 FIX: Fix exception when editing a visual of type single host group... + * 1487 FIX: Fixed exception in Web GUI "Internal error:: name 'Filter' is not defined" in manual setups (using setup.py)... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py new file mode 100644 index 0000000..b392955 --- /dev/null +++ b/web/plugins/views/filters.py @@ -0,0 +1,30 @@ +#!/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. + +# This file was shipped with Check_MK previous to 1.2.5i6. To prevent +# problems during updaate, this dummy file is shipped. It overwrites +# the outdated existing file and invalidates it. This can be removed +# in later versions.

9 years, 7 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 79a3195878fce72d73ce54ff2fe7bc4aa066cd27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79a3195878fce7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 09:16:38 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 84abd85..a222952 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1487 +1507

9 years, 7 months

Check_MK Git: check_mk: Fixed minor problems within new check

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e61dbfaba5b8e8ad5ddc6b0ff4680fc987d2712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e61dbfaba5b8e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 4 17:30:18 2014 +0100 Fixed minor problems within new check --- checks/check_mail_loop | 2 ++ doc/treasures/active_checks/check_mail_loop | 35 +++++++++++++++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/checks/check_mail_loop b/checks/check_mail_loop index f8c00cf..2e9edbc 100644 --- a/checks/check_mail_loop +++ b/checks/check_mail_loop @@ -68,6 +68,8 @@ def check_mail_loop_arguments(params): if 'delete_messages' in params: args += ' --delete-messages' + args += ' --status-suffix=%s' % quote_shell_string(g_hostname + '-' + params['item']) + return args diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index 8755c6e..47a8010 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -65,10 +65,12 @@ OPTIONS: in a CRITICAL state. Defaults to 1 hour --connect-timeout Timeout in seconds for network connects (defaults to 10) - --status-file PATH This plugin needs a file to store information about + --status-dir PATH This plugin needs a file to store information about sent, received and expected mails. Defaults to either - /tmp/check_mail_loop or /omd/sites/<sitename>/var/tmp/check_mail_loop - when executed from within an OMD site + /tmp/ or /omd/sites/<sitename>/var/tmp when executed + from within an OMD site + --status-suffix SUFFIX Concantenated with "check_mail_loop.SUFFIX.status" to + generate the name of the status file. Empty by default --delete-messages Delete all messages identified as being related to this check plugin. This is disabled by default, which might make your mailbox grow when you not clean it up @@ -84,7 +86,7 @@ short_options = 'dh' long_options = ['smtp-server=', 'smtp-port=', 'smtp-username=', 'smtp-password=', 'smtp-tls', 'fetch-protocol=', 'fetch-server=', 'fetch-port=', 'fetch-username=', 'fetch-password=', 'fetch-ssl', 'mail-from=', 'mail-to=', 'warning=', 'critical=', - 'connect-timeout=', 'delete-messages', 'help'] + 'connect-timeout=', 'delete-messages', 'help', 'status-dir=', 'status-suffix='] required_params = [ 'smtp-server', 'fetch-server', 'fetch-username', 'fetch-password', @@ -115,6 +117,8 @@ warning = None critical = 3600 conn_timeout = 10 delete_messages = False +status_dir = None +status_suffix = None for o,a in opts: if o in [ '-h', '--help' ]: @@ -155,6 +159,10 @@ for o,a in opts: conn_timeout = int(a) elif o == '--delete-messages': delete_messages = True + elif o == '--status-dir': + status_dir = a + elif o == '--status-suffix': + status_suffix = a param_names = dict(opts).keys() for p in required_params: @@ -170,10 +178,16 @@ if fetch_port == None: else: fetch_port = fetch_ssl and 993 or 143 -path_prefix = os.environ.get('OMD_ROOT') -if not path_prefix: - path_prefix = '/tmp' -status_path = '%s/var/tmp/check_mail_loop.status' % path_prefix +if not status_dir: + status_dir = os.environ.get('OMD_ROOT') + if status_dir: + status_dir += '/var/tmp' + else: + status_dir = '/tmp' +if status_suffix: + status_path = '%s/check_mail_loop.%s.status' % (status_dir, status_suffix) +else: + status_path = '%s/check_mail_loop.status' % (status_dir) socket.setdefaulttimeout(conn_timeout) @@ -333,6 +347,9 @@ def check_mails(): return state, output, perfdata def cleanup_mailbox(): + if not g_M: + return # do not deal with mailbox when none sent yet + try: # Do not delete all messages in the inbox. Only the ones which were # processed before! In the meantime there might be occured new ones. @@ -353,6 +370,8 @@ def cleanup_mailbox(): bail_out(2, 'Failed to delete mail: %s' % e) def close_mailbox(): + if not g_M: + return # do not deal with mailbox when none sent yet if fetch_proto == 'POP3': g_M.quit() else:

9 years, 7 months

Check_MK Git: check_mk: #1431 FIX windows_agent: fixed error on parsing unicode formatted logfiles

by Andreas Boesl

Module: check_mk Branch: master Commit: a525fb334c68f189ada0638781fdeea631d2089b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a525fb334c68f1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 4 16:42:57 2014 +0100 #1431 FIX windows_agent: fixed error on parsing unicode formatted logfiles If the unicode logfile grew more than 8kB since the last query there was a chance that the last logline of this 8kB Block got cut in half and only the last part was reported. --- .werks/1431 | 12 ++++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 178176 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 178176 bytes agents/windows/install_agent-64.exe | Bin 160295 -> 160296 bytes agents/windows/install_agent.exe | Bin 157234 -> 157225 bytes 10 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1431 b/.werks/1431 new file mode 100644 index 0000000..efd1a27 --- /dev/null +++ b/.werks/1431 @@ -0,0 +1,12 @@ +Title: windows_agent: fixed error on parsing unicode formatted logfiles +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1415115591 +Class: fix + +If the unicode logfile grew more than 8kB since the last query there was a +chance that the last logline of this 8kB Block got cut in half and only +the last part was reported. + diff --git a/ChangeLog b/ChangeLog index 13f68ef..8cd1dad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.5i7: Core & Setup: * 1483 FIX: Savely replace illegal vertical bars in check plugin output... + * 1431 FIX: windows_agent: fixed error on parsing unicode formatted logfiles... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices diff --git a/agents/windows/build_version b/agents/windows/build_version index 6529ff8..29d6383 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -98 +100 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index fe6c789..94d70b2 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 04010e3..9bd5916 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index fa711e4..33b9d89 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2122,7 +2122,7 @@ void cleanup_logwatch() #define UNICODE_BUFFER_SIZE 8192 int fill_unicode_bytebuffer(FILE *file, char* buffer, int offset) { int bytes_to_read = UNICODE_BUFFER_SIZE - offset; - int read_bytes = fread(buffer, 1, bytes_to_read, file); + int read_bytes = fread(buffer + offset, 1, bytes_to_read, file); return read_bytes + offset; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index faafe28..249ae5d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 1705833..f7106bc 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 7cbbcea..92e0de1 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6be4b19..d73ad04 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 7 months

Check_MK Git: check_mk: #1171 Added new check for monitoring mail delivery (SMTP -> IMAP/ POP3 mailbox)

by Lars Michelsen

Module: check_mk Branch: master Commit: 461c9ffa323ee38a6813dad866cc88a891dfb9e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=461c9ffa323ee3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 4 16:24:36 2014 +0100 #1171 Added new check for monitoring mail delivery (SMTP -> IMAP/POP3 mailbox) A new check has been added which can be used to monitor your whole email delivery process. This check sends mails out to a SMTP server of your choice and tries to receive these sent mails by querying a POP3 or IMAP mailbox of your choice. You can either send the mail directly to this mailbox or use some echo services available on the internet, like for example echo(a)tu-berlin.de. Just set this as destination mail address and they will send you a response to your SMTP mail shortly. --- .werks/1171 | 17 ++ ChangeLog | 1 + checks/check_mail_loop | 80 ++++++ doc/treasures/active_checks/check_mail_loop | 387 +++++++++++++++++++++++++++ doc/treasures/check_mail_loop | 170 ------------ pnp-templates/check_mk_active-mail_loop.php | 33 +++ web/plugins/wato/active_checks.py | 171 ++++++++++++ 7 files changed, 689 insertions(+), 170 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=461c9ffa32…

9 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014