Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

Formalizing RegExp (pattern) input a bit more

by Lars Michelsen

Module: check_mk Branch: master Commit: 4522930c0ca7abf283837dbb9d7b5d4b033e84a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4522930c0ca7ab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 8 17:27:54 2016 +0200 Formalizing RegExp (pattern) input a bit more The RegExp/RegExpUnicode valuespecs now have two more attributes: a) mode=[RegExp.infix,RegExp.prefix,RegExp.complete] to control which matching mode is used for this pattern. b) case_sensitive=True/False to formalize the case handling. The regex input fields are now displayed in a different way (fixed font and slightly different styling). Devs: Please always add mode and case_sensitive options from now. These options will be mandatory in near future. --- web/htdocs/check_mk.css | 7 +++ web/htdocs/valuespec.py | 87 ++++++++++++++++++++++++++++-- web/htdocs/wato.py | 52 ++++++++++++++---- web/plugins/wato/active_checks.py | 9 +++- web/plugins/wato/builtin_attributes.py | 5 +- web/plugins/wato/check_mk_configuration.py | 2 + web/plugins/wato/check_parameters.py | 62 +++++++++++++++++---- web/plugins/wato/mkeventd.py | 18 +++++++ 8 files changed, 214 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4522930c0c…

7 years, 11 months

Cleaned up some unused variables

by Lars Michelsen

Module: check_mk Branch: master Commit: 81c5628a407cd6221447e8ae5b91365065ea9887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81c5628a407cd6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 8 17:56:13 2016 +0200 Cleaned up some unused variables --- modules/check_mk.py | 32 ++++++++++++++------------------ modules/check_mk_base.py | 15 +++++++-------- modules/discovery.py | 19 ++++++------------- 3 files changed, 27 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=81c5628a40…

7 years, 11 months

Cleaned up some unused variables

by Lars Michelsen

Module: check_mk Branch: master Commit: 72896d177adb08ccf798931701c205901a9d8666 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72896d177adb08… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 8 18:16:10 2016 +0200 Cleaned up some unused variables --- modules/automation.py | 10 ++++------ modules/discovery.py | 2 +- modules/events.py | 4 ++-- modules/inventory.py | 2 +- modules/nagios.py | 3 +-- modules/notify.py | 10 +++++----- modules/packaging.py | 31 +++++++++++++++---------------- modules/prediction.py | 7 +++---- modules/snmp.py | 4 +--- tests/pylint/pylintrc | 2 +- 10 files changed, 34 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=72896d177a…

7 years, 11 months

Reverted pylintrc change

by Lars Michelsen

Module: check_mk Branch: master Commit: 832cd04e947729af045e774d8cf6f48fc48fb21b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=832cd04e947729… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 8 18:47:54 2016 +0200 Reverted pylintrc change --- tests/pylint/pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index ed6841b..ac5fefd 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -21,7 +21,7 @@ disable=C0111,C0326 disable=unsubscriptable-object,unsupported-membership-test,unpacking-non-sequence,assignment-from-none # W0612: Unused variable # TODO: enable this and prepare code for it! -enable=W0612 +#enable=W0612 [TYPECHECK] # rrdtool

7 years, 11 months

GUI mail notifications: Fixed test text in subject

by Lars Michelsen

Module: check_mk Branch: master Commit: 26a8a9edc990ff641923915434174720d47144b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26a8a9edc990ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 8 18:52:05 2016 +0200 GUI mail notifications: Fixed test text in subject --- web/htdocs/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index c5f2aa0..c9d271a 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -296,7 +296,7 @@ def notify_mail(user_id, msg): # FIXME: Maybe use the configured mail command for Check_MK-Notify one day # TODO: mail does not accept umlauts: "contains invalid character '\303'" in mail # addresses. handle this correctly. - command = ["mail", "-s", "asdasd".encode("utf-8"), user['email'].encode("utf-8")] + command = ["mail", "-s", subject.encode("utf-8"), user['email'].encode("utf-8")] # Make sure that mail(x) is using UTF-8. Otherwise we cannot send notifications # with non-ASCII characters. Unfortunately we do not know whether C.UTF-8 is

7 years, 11 months

Small fix in man page parsing error output

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f1c58655c1a8c86332171afbd821a8a308b0e63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f1c58655c1a8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 10 09:21:01 2016 +0200 Small fix in man page parsing error output --- lib/man_pages.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/man_pages.py b/lib/man_pages.py index ad0a5f7..a013983 100644 --- a/lib/man_pages.py +++ b/lib/man_pages.py @@ -478,14 +478,14 @@ def load_man_page(name): if line[0] == '[' and line[-1] == ']': section_header = line[1:-1] - current_section = [] + current_section, current_variable = [], None man_page[section_header] = current_section else: current_variable, restofline = line.split(':', 1) current_section.append((current_variable, restofline.lstrip())) except Exception, e: - raise MKGeneralException("Syntax error in %s line %d (%s).\n" % (path, lineno, e)) + raise MKGeneralException("Syntax error in %s line %d (%s).\n" % (path, lineno+1, e)) header = {} for key, value in man_page['header']:

7 years, 11 months

3954 postfix_mailq_status: new check which monitors the status of postfix mail instances

by Simon Betz

Module: check_mk Branch: master Commit: faca93075fda5d40bc51ba3b86a72d2845a93c65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faca93075fda5d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 10 09:15:32 2016 +0200 3954 postfix_mailq_status: new check which monitors the status of postfix mail instances --- .werks/3954 | 9 +++++ ChangeLog | 1 + agents/check_mk_agent.linux | 5 +++ checkman/postfix_mailq_status | 15 +++++++++ checks/postfix_mailq_status | 77 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+) diff --git a/.werks/3954 b/.werks/3954 new file mode 100644 index 0000000..1ad9120 --- /dev/null +++ b/.werks/3954 @@ -0,0 +1,9 @@ +Title: postfix_mailq_status: new check which monitors the status of postfix mail instances +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476083683 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 399c932..bfd956e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 3911 if.include: each operational state can now be mapped to a check state * 3912 elphase.include: now device states can be mapped to monitoring states * 3913 gude_relayport, gude_temp, gude_humidity: new checks and relayport check now monitors electricity + * 3954 postfix_mailq_status: new check which monitors the status of postfix mail instances * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c7dfcf8..c44f860 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -667,6 +667,11 @@ elif [ -x /usr/sbin/ssmtp ] ; then fi +if type postmulti >/dev/null ; then + echo "<<<postfix_mailq_status:sep(58)>>>" + postmulti -p status +fi + # Check status of qmail mailqueue if type qmail-qstat >/dev/null diff --git a/checkman/postfix_mailq_status b/checkman/postfix_mailq_status new file mode 100644 index 0000000..323cfce --- /dev/null +++ b/checkman/postfix_mailq_status @@ -0,0 +1,15 @@ +title: Status of postfix mail instances +agents: linux +catalog: app/postfix +license: GPL +distribution: check_mk +description: + This check monitors the status of postfix mail instances on linux hosts. + + The status is OK if the mail instance is running, otherwise CRIT. + +item: + The instance name if multi instance is configured. + +inventory: + One service per instance is created. diff --git a/checks/postfix_mailq_status b/checks/postfix_mailq_status new file mode 100644 index 0000000..c8cc56b --- /dev/null +++ b/checks/postfix_mailq_status @@ -0,0 +1,77 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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- +# tails. 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. + + +# single +# <<<postfix_mailq_status:sep(58)>>> +# postfix/postfix-script: the Postfix mail system is running: PID: 2839 + +# multi instances +# <<<postfix_mailq_status:sep(58)>>> +# postfix/postfix-script: the Postfix mail system is running: PID: 12910 +# postfix-external/postfix-script: the Postfix mail system is running: PID: 12982 +# postfix-internal/postfix-script: the Postfix mail system is running: PID: 13051 +# postfix-uat-cdi/postfix-script: the Postfix mail system is not running + + +def parse_postfix_mailq_status(info): + parsed = {} + for line in info: + stripped_line = map(lambda x: x.strip(), line) + queuename = stripped_line[0].split("/")[0] + if queuename == "postfix": + queuename = "" + parsed.setdefault(queuename, { "state" : stripped_line[1] }) + if len(line) > 2: + parsed[queuename]["pid"] = stripped_line[-1] + + return parsed + + +def inventory_postfix_mailq_status(parsed): + return [ (queuename, None) for queuename in parsed ] + + +def check_postfix_mailq_status(item, params, parsed): + if item in parsed: + state_readable = parsed[item]["state"] + pid = parsed[item].get("pid", "") + if state_readable.endswith("is running"): + state = 0 + else: + state = 2 + yield state, 'Status: %s' % state_readable + + if pid: + yield 0, 'PID: %s' % pid + + +check_info['postfix_mailq_status'] = { + 'parse_function' : parse_postfix_mailq_status, + 'inventory_function' : inventory_postfix_mailq_status, + 'check_function' : check_postfix_mailq_status, + 'service_description' : 'Postfix status %s', +}

7 years, 11 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 7452fe0b14f6c7385cec59844407887556ab5714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7452fe0b14f6c7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 10 09:14:36 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ee57fac..44e1099 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3954 +3964

7 years, 11 months

3935 FIX FIX avaya_45xx_cpu: check got UNKNOWN using Nagios core

by Marcel Schulte

Module: check_mk Branch: master Commit: cd72dfdbe3d885da5eb8abff377464566e921f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd72dfdbe3d885… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Oct 10 07:27:19 2016 +0200 3935 FIX FIX avaya_45xx_cpu: check got UNKNOWN using Nagios core --- .werks/3935 | 10 ++++++++++ ChangeLog | 1 + checks/avaya_45xx_cpu | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3935 b/.werks/3935 new file mode 100644 index 0000000..e1465fe --- /dev/null +++ b/.werks/3935 @@ -0,0 +1,10 @@ +Title: FIX avaya_45xx_cpu: check got UNKNOWN using Nagios core +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476077164 + + diff --git a/ChangeLog b/ChangeLog index c3a0a64..399c932 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... * 3909 FIX: postfix_mailq: fixed readout postfix config * 3748 FIX: vertias_vcs: Fix empty agent section for standard xinetd configuration... + * 3935 FIX: FIX avaya_45xx_cpu: check got UNKNOWN using Nagios core WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/checks/avaya_45xx_cpu b/checks/avaya_45xx_cpu index 46770ab..d12e01a 100644 --- a/checks/avaya_45xx_cpu +++ b/checks/avaya_45xx_cpu @@ -49,4 +49,5 @@ check_info["avaya_45xx_cpu"] = { # S5-CHASSIS-MIB "snmp_info": ( ".1.3.6.1.4.1.45.1.6.3.8.1.1.5", [ 3 ] ), # CPU "snmp_scan_function": lambda oid: ".1.3.6.1.4.1.45.3" in oid(".1.3.6.1.2.1.1.2.0"), + "includes": ["cpu_util.include"], }

7 years, 11 months

fixed params

by Simon Betz

Module: check_mk Branch: master Commit: 6321f60c717bdfb13060d7fa0c359fe951e33e7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6321f60c717bdf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 7 14:38:30 2016 +0200 fixed params --- checks/humidity.include | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/humidity.include b/checks/humidity.include index b3e7834..2c38ebf 100644 --- a/checks/humidity.include +++ b/checks/humidity.include @@ -27,16 +27,16 @@ # old params = (crit_low , warn_low, warn, crit) def check_humidity(humidity, params): - if params and type(params) in [ list, tuple ]: - params = { - "levels_lower" : (params[0], params[1]), - "levels" : (params[2], params[3]), - } - else: + if params is None: params = { "levels_lower" : (-1, -1), "levels" : (101, 101), } + elif type(params) in [ list, tuple ]: + params = { + "levels_lower" : (params[0], params[1]), + "levels" : (params[2], params[3]), + } crit_lower, warn_lower = params["levels_lower"] warn_upper, crit_upper = params["levels"]

7 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016