Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: added two helper functions in check_mk/doc/ helpers to create automatically a check and a manpage

by Simon Betz

Module: check_mk Branch: master Commit: 271a7e91b1f7d3f8dc51181bea7df25e9ee3fdb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=271a7e91b1f7d3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 17 10:17:24 2015 +0200 added two helper functions in check_mk/doc/helpers to create automatically a check and a manpage --- doc/helpers/mkcheck | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/helpers/mkman | 45 +++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) diff --git a/doc/helpers/mkcheck b/doc/helpers/mkcheck new file mode 100755 index 0000000..8343a47 --- /dev/null +++ b/doc/helpers/mkcheck @@ -0,0 +1,86 @@ +#!/bin/bash +# usage: +# 'mkcheck NAME' for a standard check +# 'mkcheck NAME snmp' for a snmp check +content_std="#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \\/ | |/ / | +# | | | | '_ \\ / _ \\/ __| |/ / | |\\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \\ | +# | \\____|_| |_|\\___|\\___|_|\\_\\___|_| |_|_|\\_\\ | +# | | +# | Copyright Mathias Kettner YEAR 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: +# + + +factory_settings['CHECKNAME_default_variables' = { + 'LEVELS' : None, +} + + +def inventory_CHECKNAME(info): + print info + return [] + + +def check_CHECKNAME(item, params, info): + return (3, 'Not yet implemented') + + +check_info['CHECKNAME'] = { + 'inventory_function' : inventory_CHECKNAME, + 'check_function' : check_CHECKNAME, + 'service_description' : 'DESCRIPTION %s', + 'has_perfdata' : True, + 'default_level_variable' : 'CHECKNAME_default_variables', + 'includes' : []," +content_snmp=" + 'snmp_info' : INFO, + 'snmp_scan_function' : lambda oid: FUNCTION, +}" +path=`pwd` +filename=$1 +snmp=$2 +path2file=$path"/"$filename +no_name=$path"/no_name" +year=`date +"%Y"` +if [ -z "$filename" ]; then + echo "No name or argument given. Please determine one." +else + content_std=${content_std//CHECKNAME/$filename} + content_std=${content_std//YEAR/$year} + if [ ! -f "$path2file" ]; then + if [ -z $snmp ]; then + content_std=$content_std"\n#\n}" + elif [ $snmp = "snmp" ]; then + content_std=$content_std$content_snmp: + else + echo "Wrong arguments." + exit 0 + fi + echo "New check '$filename' is created and stored in '$path2file'." + echo -e "${content_std}" > $path2file + else + echo "File already exists." + fi +fi diff --git a/doc/helpers/mkman b/doc/helpers/mkman new file mode 100755 index 0000000..acfaa66 --- /dev/null +++ b/doc/helpers/mkman @@ -0,0 +1,45 @@ +#!/bin/bash +# useage: +# 'mkcheck' for a standard check +# 'mkchecksnmp' for a snmp check +content_std="title: +agents: TYPE +catalog: +license: GPL +distribution: check_mk +description: + +item: + +examples: + +perfdata: + +inventory: + +[parameters] + +[configuration]" +path=`pwd` +filename=$1 +snmp=$2 +path2file=$path"/"$filename +if [ -z "$filename" ]; then + echo "No name given. Please determine one." + exit 0 +else + if [ ! -f "$path2file" ]; then + if [ -z $snmp ]; then + content_std=${content_std//" TYPE"/} + elif [ $snmp = "snmp" ]; then + content_std=${content_std//" TYPE"/" snmp"} + else + echo "Wrong arguments." + exit 0 + fi + echo "New check '$filename' created and stored in '$path2file'." + echo -e "${content_std}" > $path2file + else + echo "File already exists." + fi +fi

8 years, 10 months

Check_MK Git: check_mk: #2537 BI Editor: restructured, now show tree structure of aggregations, show unused rules

by Mathias Kettner

Module: check_mk Branch: master Commit: f964ec216116e6a88bd069eaf6934eb0696aedf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f964ec216116e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 14 16:01:22 2015 +0200 #2537 BI Editor: restructured, now show tree structure of aggregations, show unused rules The WATO module for BI aggregations has undergone a slight rework. Aggregations and Rules are now show on separate pages. In the table of aggregations you now can unfold the tree of rules (which is not the same as the final tree of items). A new page shows all rules that are not called by any other aggregation or rule. This helps to cleanup your configuration. --- .werks/2537 | 14 ++ ChangeLog | 1 + web/htdocs/htmllib.py | 10 +- web/htdocs/images/button_bitree_hi.png | Bin 0 -> 1808 bytes web/htdocs/images/button_bitree_lo.png | Bin 0 -> 2672 bytes web/htdocs/images/icon_bilist.png | Bin 0 -> 2372 bytes web/htdocs/images/icon_bitree.png | Bin 0 -> 2672 bytes web/htdocs/images/icon_unusedbirules.png | Bin 0 -> 2978 bytes web/htdocs/wato.css | 55 ++----- web/htdocs/wato.py | 250 ++++++++++++++++++++---------- web/plugins/wato/builtin_modules.py | 2 +- 11 files changed, 207 insertions(+), 125 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f964ec2161…

8 years, 10 months

Check_MK Git: check_mk: #2527 emc_isilon_power, emc_isilon_quota: New checks for power supply and fs quotas on EMC Isilon data storage devices

by Sebastian Herbord

Module: check_mk Branch: master Commit: 42e99e641ad044d160eaa297a2460050b102e495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42e99e641ad044… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Aug 14 15:40:07 2015 +0200 #2527 emc_isilon_power, emc_isilon_quota: New checks for power supply and fs quotas on EMC Isilon data storage devices --- .werks/2527 | 9 ++++ ChangeLog | 1 + checkman/emc_isilon_power | 25 ++++++++++++ checkman/emc_isilon_quota | 13 ++++++ checks/emc_isilon_power | 76 ++++++++++++++++++++++++++++++++++ checks/emc_isilon_quota | 100 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 224 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=42e99e641a…

8 years, 10 months

Check_MK Git: check_mk: #2526 FIX Fixed failing check when performance data contains unicode strings

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9636785b6db27db0e3fb44cbfddd4cc60da4e777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9636785b6db27d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Aug 14 15:28:53 2015 +0200 #2526 FIX Fixed failing check when performance data contains unicode strings --- .werks/2526 | 9 +++++++++ ChangeLog | 1 + modules/check_mk_base.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2526 b/.werks/2526 new file mode 100644 index 0000000..a87b926 --- /dev/null +++ b/.werks/2526 @@ -0,0 +1,9 @@ +Title: Fixed failing check when performance data contains unicode strings +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i3 +Date: 1439558918 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a3238a8..10d94d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 2465 FIX: Fixed broken Check_MK Discovery checks (check reports "(null)") * 2502 FIX: Fixed removing autochecks when a host is configured to be ping only... + * 2526 FIX: Fixed failing check when performance data contains unicode strings Checks & Agents: * 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 1d27735..cd0132e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1809,7 +1809,8 @@ def submit_check_result(host, servicedesc, result, sa, cached_at=None, cache_int p = '' color = { 0: tty_green, 1: tty_yellow, 2: tty_red, 3: tty_magenta }[state] print "%-20s %s%s%-56s%s%s" % (servicedesc.encode('utf-8'), - tty_bold, color, make_utf8(infotext.split('\n')[0]), tty_normal, p) + tty_bold, color, make_utf8(infotext.split('\n')[0]), + tty_normal, make_utf8(p)) def submit_to_core(host, service, state, output, cached_at = None, cache_interval = None):

8 years, 10 months

Check_MK Git: check_mk: #2509 FIX Logwatch: Fixed exception when deleting a specific logfile on multiple hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: dcfc2777881ee564c779ff002ede98f87ac5ad30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcfc2777881ee5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 14:56:22 2015 +0200 #2509 FIX Logwatch: Fixed exception when deleting a specific logfile on multiple hosts --- .werks/2509 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/.werks/2509 b/.werks/2509 new file mode 100644 index 0000000..53c9211 --- /dev/null +++ b/.werks/2509 @@ -0,0 +1,10 @@ +Title: Logwatch: Fixed exception when deleting a specific logfile on multiple hosts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1439556957 + + diff --git a/ChangeLog b/ChangeLog index 320d522..a3238a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -141,6 +141,7 @@ * 2468 FIX: Fixed actions for duplicate host names on different sites... * 2470 FIX: Fixed exception in logwatch log list in rare cases... * 2375 FIX: prediction preview: automatically select valid prediction period + * 2509 FIX: Logwatch: Fixed exception when deleting a specific logfile on multiple hosts WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 80af138..fc9588e 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -249,6 +249,14 @@ def do_log_ack(host, filename): ack_msg = _('the log file %s on host %s') % \ (html.attrencode(filename), html.attrencode(host)) + else: + for this_host, logs in all_logs(): + file_display = form_file_to_ext(filename) + if filename in logs: + todo.append((this_host, filename, file_display)) + ack_msg = _('log file %s on all hosts') % (html.attrencode(filename)) + + html.header(_("Acknowledge %s") % ack_msg, stylesheets = stylesheets) html.begin_context_buttons()

8 years, 10 months

Check_MK Git: check_mk: mysql_slave: Fixed bug when having multiple instances

by Lars Michelsen

Module: check_mk Branch: master Commit: 5cdc3282f3b2ef05d9da4655bd1b5f3cffa04f40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cdc3282f3b2ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 14:45:51 2015 +0200 mysql_slave: Fixed bug when having multiple instances --- checks/mysql_slave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mysql_slave b/checks/mysql_slave index dd3b705..64edea4 100644 --- a/checks/mysql_slave +++ b/checks/mysql_slave @@ -49,7 +49,7 @@ def parse_mysql_slave(info): for line in info: if line[0].startswith("[["): instance = line[0][2:-2] - parsed[instance] = [] + parsed[instance] = {} elif instance: key, value = parse_line(line) if key:

8 years, 10 months

Check_MK Git: check_mk: livedump-mail-fetch: Is now handling responses from servers more generic

by Lars Michelsen

Module: check_mk Branch: master Commit: 932a784fd3596c3fa051287bdcce69ec9c3e24fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=932a784fd3596c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 14:43:05 2015 +0200 livedump-mail-fetch: Is now handling responses from servers more generic --- doc/treasures/livedump/livedump-mail-fetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/livedump/livedump-mail-fetch b/doc/treasures/livedump/livedump-mail-fetch index e88b89f..d681d38 100755 --- a/doc/treasures/livedump/livedump-mail-fetch +++ b/doc/treasures/livedump/livedump-mail-fetch @@ -123,7 +123,7 @@ try: for entry in msglist: msgid, size = entry.split() response = M.dele(msgid) - if response != "+OK": + if not response.startswith('+OK'): raise Exception("Error from POP server: [%s]" % response) break

8 years, 10 months

Check_MK Git: check_mk: Fixed description

by Konstantin Büttner

Module: check_mk Branch: master Commit: 43691e3512e1eb07c4eec70080800198abb86c55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43691e3512e1eb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Aug 14 13:11:59 2015 +0200 Fixed description --- web/plugins/views/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 1d2ba22..9ce1d27 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2263,7 +2263,7 @@ multisite_builtin_views.update({ 'has_performance_data' : { 'is_has_performance_data': '1' }, }, 'datasource': 'services', - 'description': _('A Matrix of performance data values, group by hosts and services'), + 'description': _('A Matrix of performance data values, grouped by hosts and services'), 'group_painters': [('host', 'host', None)], 'hidden': False, 'hidebutton': False,

8 years, 10 months

Check_MK Git: check_mk: inserted spaces, better readability

by Simon Betz

Module: check_mk Branch: master Commit: c995a1118c8f9d57e4ca3e77f1cffdac5fdf0cc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c995a1118c8f9d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 14 13:01:55 2015 +0200 inserted spaces, better readability --- web/plugins/metrics/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 6dd70e8..b2c036f 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2145,7 +2145,7 @@ metric_info["net_data_sent"] = { } for ty, unit in [ ("requests", "1/s"), ("bytes", "bytes/s"), ("secs", "1/s") ]: - metric_info[ty+"_cmk_views"] = { + metric_info[ty + "_cmk_views"] = { "title" : _("Check_MK: Views"), "unit" : unit, "color" : "#ff8080",

8 years, 10 months

Check_MK Git: check_mk: #2508 It is now possible to upload multiple zipped MIB files at once

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e294c890bcefde83ea8fd4b2b21459500ea8db0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e294c890bcefd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 14 09:58:14 2015 +0200 #2508 It is now possible to upload multiple zipped MIB files at once If you have to upload a lot of MIB files to the Event Console, you can now pack them in a zip archive and upload the zip archive. The files need to be located in the root directory of the zip file. Files in subdirectories will not be processed. --- .werks/2508 | 12 +++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 56 ++++++++++++++++++++++++++++----- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/.werks/2508 b/.werks/2508 new file mode 100644 index 0000000..a8e7ad6 --- /dev/null +++ b/.werks/2508 @@ -0,0 +1,12 @@ +Title: It is now possible to upload multiple zipped MIB files at once +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i3 +Date: 1439539012 +Class: feature + +If you have to upload a lot of MIB files to the Event Console, you +can now pack them in a zip archive and upload the zip archive. The +files need to be located in the root directory of the zip file. +Files in subdirectories will not be processed. diff --git a/ChangeLog b/ChangeLog index d2e957e..320d522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -181,6 +181,7 @@ Event Console: * 2411 Check check_mkevents: Now able to look for events matching the host alias... * 2533 Allow inverted match in Event Console rules + * 2508 It is now possible to upload multiple zipped MIB files at once... * 2322 FIX: mkeventd: MIBs are now only loaded if SNMP Traps translation is activated... * 2460 FIX: Slightly more robust SNMP trap translation... * 2534 FIX: Fixed implementation of skipping rule packs diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 5b10368..f2c0e28 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -25,6 +25,8 @@ # Boston, MA 02110-1301 USA. import mkeventd, defaults +import zipfile +import cStringIO mkeventd_enabled = config.mkeventd_enabled @@ -1868,7 +1870,6 @@ def mode_mkeventd_mibs(phase): try: msg = upload_mib(filename, mimetype, content) return None, msg - log_mkeventd("uploaded-mib", _("Uploaded MIB %s: %s") % (filename, msg)) except Exception, e: if config.debug: raise @@ -1878,7 +1879,11 @@ def mode_mkeventd_mibs(phase): return html.write("<h3>" + _("Upload MIB file") + "</h3>") - html.write(_("Allowed are single MIB files - usually with the extension <tt>.mib</tt> or <tt>.txt</tt>.<br><br>")) + html.write(_("Use this form to upload MIB files for translating incoming SNMP traps. " + "You can upload single MIB files with the extension <tt>.mib</tt> or " + "<tt>.txt</tt>, but you can also upload multiple MIB files at once by " + "packing them into a <tt>.zip</tt> file. Only files in the root directory " + "of the zip file will be processed.<br><br>")) html.begin_form("upload_form", method = "POST") forms.header(_("Upload MIB file")) @@ -1986,6 +1991,9 @@ def validate_and_compile_mib(mibname, content): compiler.addSearchers(StubSearcher(*baseMibs)) try: + if not content.strip(): + raise Exception(_("The file is empty")) + results = compiler.compile(mibname, ignoreErrors=True) errors = [] @@ -2011,15 +2019,48 @@ def validate_and_compile_mib(mibname, content): def upload_mib(filename, mimetype, content): + validate_mib_file_name(filename) + + if zipfile.is_zipfile(cStringIO.StringIO(content)): + msg = process_uploaded_zip_file(filename, content) + else: + if mimetype == "application/tar" or filename.lower().endswith(".gz") or filename.lower().endswith(".tgz"): + raise Exception(_("Sorry, uploading TAR/GZ files is not yet implemented.")) + + msg = process_uploaded_mib_file(filename, content) + + return msg + + +def process_uploaded_zip_file(filename, content): + zip_obj = zipfile.ZipFile(cStringIO.StringIO(content)) + messages = [] + for entry in zip_obj.infolist(): + success, fail = 0, 0 + try: + mib_file_name = entry.filename + if mib_file_name[-1] == "/": + continue # silently skip directories + + validate_mib_file_name(mib_file_name) + + mib_obj = zip_obj.open(mib_file_name) + messages.append(process_uploaded_mib_file(mib_file_name, mib_obj.read())) + success += 1 + except Exception, e: + messages.append(_("Skipped %s: %s") % (html.attrencode(mib_file_name), e)) + fail += 1 + + return "<br>\n".join(messages) + \ + "<br><br>\nProcessed %d MIB files, skipped %d MIB files" % (success, fail) + + +def validate_mib_file_name(filename): if filename.startswith(".") or "/" in filename: raise Exception(_("Invalid filename")) - if mimetype == "application/zip" or filename.lower().endswith(".zip"): - raise Exception(_("Sorry, uploading ZIP files is not yet implemented.")) - - if mimetype == "application/tar" or filename.lower().endswith(".gz") or filename.lower().endswith(".tgz"): - raise Exception(_("Sorry, uploading TAR/GZ files is not yet implemented.")) +def process_uploaded_mib_file(filename, content): if '.' in filename: mibname = filename.split('.')[0] else: @@ -2027,6 +2068,7 @@ def upload_mib(filename, mimetype, content): msg = validate_and_compile_mib(mibname.upper(), content) file(mkeventd.mib_upload_dir + "/" + filename, "w").write(content) + log_mkeventd("uploaded-mib", _("MIB %s: %s") % (filename, msg)) return msg

8 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015