Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64361 discussions

Check_MK Git: check_mk: WATO: HTML encoding the datasource program value

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2023106e1533dd10ab29b779b00701d663fcc269 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2023106e1533dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 09:56:30 2012 +0200 WATO: HTML encoding the datasource program value --- web/htdocs/wato.py | 3 ++- web/plugins/wato/check_mk_configuration.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d059a8b..949aaa6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9342,6 +9342,7 @@ vs_rule_options = Dictionary( help = _("An optional comment that helps you documenting the purpose of " "this rule"), size = 80, + attrencode = True, ) ), ( "docu_url", @@ -9844,7 +9845,7 @@ def mode_edit_ruleset(phase): url = rule_options.get("docu_url") if url: html.icon_button(url, _("Context information about this rule"), "url", target="_blank") - html.write(rule_options.get("comment", "")) + html.write(htmllib.attrencode(rule_options.get("comment", ""))) html.write('</td>') diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 951d479..46ec1b7 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1102,5 +1102,6 @@ register_rule(group, "via SSH. The command line may contain the placeholders <tt><IP></tt> and " "<tt><HOST></tt>."), label = _("Command line to execute"), - size = 80)) + size = 80, + attrencode = True))

12 years

Check_MK Git: check_mk: Removed wmic_process rule from "inventory services" as the check does not support inventory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 074bb3f6b72ea1c532b7c1d5418d2bea874f98e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=074bb3f6b72ea1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 10:25:24 2012 +0200 Removed wmic_process rule from "inventory services" as the check does not support inventory --- .bugs/704 | 13 ++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 54 +++++++++++++++------------------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/.bugs/704 b/.bugs/704 new file mode 100644 index 0000000..5d858d9 --- /dev/null +++ b/.bugs/704 @@ -0,0 +1,13 @@ +Title: Better check API validation +Component: core +State: open +Date: 2012-09-14 10:18:45 +Targetversion: future +Class: cleanup + +The returned inventory data is validated if it is a list. But not further. It would be good +to also validate if the items in the list are tuples of 2 or 3 items while the first item +is a single value of none or a string and the second is a string or also none. + +Same for the data returned by the check data. + diff --git a/ChangeLog b/ChangeLog index 6a31b8a..9155cae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * Improved visualization of ruleset lists/dictionaries * Encoding special chars in RegExp valuespec (e.g. logwatch patterns) * Added check_interval and retry_interval rules for host checks + * Removed wmic_process rule from "inventory services" as the check does not support inventory * FIX: Removed double collect_hosts() call in activate changes hook * FIX: Fixed double hook execution when using localized multisite * FIX: User list shows names of contactgroups when no alias given diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 328239c..c14ec5a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1667,36 +1667,6 @@ checkgroups.append(( help = _("The identificator of the themal sensor.")), "first")) - - -checkgroups.append(( - subgroup_applications, - "wmic_process", - _("Memory and CPU of processes on Windows"), - Tuple( - elements = [ - TextAscii( - title = _("Name of the process"), - allow_empty = False, - ), - Integer(title = _("Memory waring at"), unit = "MB"), - Integer(title = _("Memory critical at"), unit = "MB"), - Integer(title = _("Pagefile warning at"), unit = "MB"), - Integer(title = _("Pagefile critical at"), unit = "MB"), - Percentage(title = _("CPU usage warning at")), - Percentage(title = _("CPU usage critical at")), - ], - ), - TextAscii( - title = _("Process name for usage in the Nagios service description"), - allow_empty = False), - "first")) - - - - - - # Create rules for check parameters of inventorized checks for subgroup, checkgroup, title, valuespec, itemspec, matchtype in checkgroups: if not valuespec: @@ -1739,6 +1709,30 @@ register_rulegroup("static", _("Manual Checks"), _("Statically configured Check_MK checks that do not rely on the inventory")) group = "static" +# wmic_process does not support inventory at the moment +checkgroups.append(( + subgroup_applications, + "wmic_process", + _("Memory and CPU of processes on Windows"), + Tuple( + elements = [ + TextAscii( + title = _("Name of the process"), + allow_empty = False, + ), + Integer(title = _("Memory waring at"), unit = "MB"), + Integer(title = _("Memory critical at"), unit = "MB"), + Integer(title = _("Pagefile warning at"), unit = "MB"), + Integer(title = _("Pagefile critical at"), unit = "MB"), + Percentage(title = _("CPU usage warning at")), + Percentage(title = _("CPU usage critical at")), + ], + ), + TextAscii( + title = _("Process name for usage in the Nagios service description"), + allow_empty = False), + "first")) + # Add checks that have parameters but are only configured as manual checks checkgroups.append(( subgroup_applications,

12 years

Check_MK Git: check_mk: Add manpages for Jolokia checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c3c4427a054f0cf1c1bd0158e486d8fc6684f7ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3c4427a054f0c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Sep 13 18:55:57 2012 +0200 Add manpages for Jolokia checks --- checkman/jolokia_info | 17 ++++++++++++++++ checkman/jolokia_metrics.app_sess | 39 +++++++++++++++++++++++++++++++++++++ checkman/jolokia_metrics.mem | 35 +++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 0 deletions(-) diff --git a/checkman/jolokia_info b/checkman/jolokia_info new file mode 100644 index 0000000..12481c0 --- /dev/null +++ b/checkman/jolokia_info @@ -0,0 +1,17 @@ +title: Report type and version of Java application servers +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + monitor the uptime of a Java application server like + Tomcat or JBoss. + +item: + The name of the application server instance as configured by the agent. + +perfdata: + No perfdata is generated by this check. + +inventory: + One check is created for each Jolokia instance sent by the agent. diff --git a/checkman/jolokia_metrics.app_sess b/checkman/jolokia_metrics.app_sess new file mode 100644 index 0000000..c6b260b --- /dev/null +++ b/checkman/jolokia_metrics.app_sess @@ -0,0 +1,39 @@ +title: Number of JVM sessions +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check allows to monitor the number of current connections to + a JVM application (i.e. /host-manager or /my-web-app) + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + + The check can alert if the {WARN}/{CRIT} thresholds for a configurable total + is exceeded. + +item: + The name of the application server instance as configured by the agent + followed by the name of the application. I.e. tomcat7 /examples + +perfdata: + The number of sessions along with the upper (high) alert levels. + +inventory: + One check is created for each application running inside an Jolokia + instance sent by the agent. + + +[parameters] +low_crit (int): If the number of sessions falls to this level, + a CRITICAL state is triggered +low_warn (int): If the number of sessions falls to this level, + a WARNING state is triggered +high_warn (int): If the number of sessions climbs to this level, + a WARNING state is triggered +high_crit (int): If the number of sessions climbs to this level, + a CRITICAL state is triggered + +[configuration] +jolokia_metrics_app_sess_default_levels (int, int, int, int): Default levels warning and critical diff --git a/checkman/jolokia_metrics.mem b/checkman/jolokia_metrics.mem new file mode 100644 index 0000000..44989e2 --- /dev/null +++ b/checkman/jolokia_metrics.mem @@ -0,0 +1,35 @@ +title: Memory usage of a JVM +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check allows to monitor the usage of heap and non-heap memory area + usage on web application servers. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + It will then fetch the memory usage from the JMX status info of the remote + Java Virtual Machine. + + The check can alert if the {WARN}/{CRIT} thresholds for a configurable total + is exceeded. + +item: + The name of the application server instance as configured by the agent. + +perfdata: + The heap and non-heap usage information and levels in Megabytes. + +inventory: + One check is created for each Jolokia instance sent by the agent. + + +[parameters] +warning (int): The total memory consumption that triggers + a WARNING state +critical (int): The total memory consumption that triggers + a CRITICAL state + +[configuration] +jolokia_metrics_mem_default_levels (int, int): Default levels warning and critical

12 years

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bdce99a71a92cb7b4387145d07ba4a9b1f8da4f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdce99a71a92cb… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Sep 13 18:56:32 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d717221b69340490b41267ce13d7bda86b30b49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d717221b69340… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 17:46:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Updated bug entries #0789

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5f50dbe2775506425f3a0e565d47801b0e1741d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f50dbe2775506… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 17:46:04 2012 +0200 Updated bug entries #0789 --- .bugs/789 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/.bugs/789 b/.bugs/789 new file mode 100644 index 0000000..1576c10 --- /dev/null +++ b/.bugs/789 @@ -0,0 +1,15 @@ +Title: Settings in multisite.mk without default values persist in browser cache +Component: multisite +State: open +Date: 2012-09-13 17:42:33 +Targetversion: future +Class: bug + +If you write an extension (like mkeventd) that wants to put a +settings into multisite.mk then it cannot put a default +value into config.py (it must not modify files of the main +distribution). If it once sets a value in multisite.mk and +that is later removed (factory settings) then the positive +settings survives in the browser cache. We need to find +a method how extension modules can define or declare default +values for settings in multisite.mk

12 years

Check_MK Git: check_mk: FIX: Reflecting alternative mode of check_http ( check ssl certificate age) in WATO rule editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56e013378f45032d7f1eb43ab697582491dbf49b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56e013378f4503… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 09:40:32 2012 +0200 FIX: Reflecting alternative mode of check_http (check ssl certificate age) in WATO rule editor --- ChangeLog | 2 + web/plugins/wato/active_checks.py | 440 +++++++++++++++++++------------------ 2 files changed, 229 insertions(+), 213 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=56e013378f…

12 years

Check_MK Git: check_mk: Added new active check configuration for check_smtp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff6bc592a59364dde553cb903671f91e4524d40c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff6bc592a59364… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 11:13:53 2012 +0200 Added new active check configuration for check_smtp --- ChangeLog | 1 + checks/check_smtp | 84 ++++++++++++++++++++++ web/plugins/wato/active_checks.py | 138 ++++++++++++++++++++++++++++++++++++- 3 files changed, 222 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87cfc5c..79654a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * parent scan: new option "ping probes", that allows skipping unreachable gateways. * User managament: Added fields for editing host/service notification commands + * Added new active check configuration for check_smtp * FIX: Removed double collect_hosts() call in activate changes hook * FIX: Fixed double hook execution when using localized multisite * FIX: User list shows names of contactgroups when no alias given diff --git a/checks/check_smtp b/checks/check_smtp new file mode 100644 index 0000000..50cc3be --- /dev/null +++ b/checks/check_smtp @@ -0,0 +1,84 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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 check_smtp_arguments(params): + description, settings = params + args = '' + + if "expect" in settings: + args += ' -e %s' % quote_shell_string(settings["expect"]) + + if "port" in settings: + args += ' -p %s' % quote_shell_string(settings["port"]) + + if "ip_version" in settings: + if settings['ip_version'] == 'ipv4': + args += ' -4' + else: + args += ' -6' + + for s in settings.get("commands", []): + args += ' -C %s' % quote_shell_string(s) + + for s in settings.get("command_responses", []): + args += ' -R %s' % quote_shell_string(s) + + if settings.get('from'): + args += ' -f %s' % quote_shell_string(settings["from"]) + + if "response_time" in settings: + args += ' -w %d -c %d' % ( + settings["response_time"][0], + settings["response_time"][1]) + + if "timeout" in settings: + args += ' -t %d' % settings["timeout"] + + if "auth" in settings: + auth = settings["auth"] + args += ' -A LOGIN -U %s -P %s' % (quote_shell_string(auth[0]), quote_shell_string(auth[1])) + + if settings.get('starttls', False): + args += ' -S' + + if 'fqdn' in settings: + args += ' -F %s' % quote_shell_string(settings['fqdn']) + + if 'cert_days' in settings: + args += ' -D %d' % settings['cert_days'] + + print args + + return args + + +active_check_info['smtp'] = { + "command_line" : '$USER1$/check_smtp $ARG1$', + "argument_function" : check_smtp_arguments, + "service_description" : lambda params: "SMTP %s" % params[0], + "has_perfdata" : True, +} + diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 6fc5619..f3259f8 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -578,7 +578,143 @@ register_rule(group, match = 'all' ) - +register_rule(group, + "active_checks:smtp", + Tuple( + title = _("Check access to SMTP services"), + help = _("This check uses <tt>check_smtp</tt> from the standard " + "Nagios plugins in order to try the response of an SMTP " + "server."), + elements = [ + TextUnicode( + title = _("Name"), + help = _("The service description will be <b>SMTP</b> plus this name"), + allow_empty = False), + Dictionary( + title = _("Optional parameters"), + elements = [ + ( "port", + TextAscii( + title = _("TCP Port to connect to"), + help = _("The TCP Port the SMTP server is listening on. " + "The default is <tt>25</tt>."), + size = 5, + allow_empty = False, + default_value = "25", + ) + ), + ( "ip_version", + Alternative( + title = _("IP-Version"), + elements = [ + FixedValue( + "ipv4", + totext = "", + title = _("IPv4") + ), + FixedValue( + "ipv6", + totext = "", + title = _("IPv6") + ), + ], + ), + ), + ( "expect", + TextAscii( + title = _("Expected String"), + help = _("String to expect in first line of server response. " + "The default is <tt>220</tt>."), + size = 8, + allow_empty = False, + default_value = "220", + ) + ), + ('commands', + ListOfStrings( + title = _("SMTP Commands"), + help = _("SMTP commands to execute."), + ) + ), + ('command_responses', + ListOfStrings( + title = _("SMTP Responses"), + help = _("Expected responses to the given SMTP commands."), + ) + ), + ("from", + TextAscii( + title = _("FROM-Address"), + help = _("FROM-address to include in MAIL command, required by Exchange 2000"), + size = 20, + allow_empty = True, + default_value = "", + ) + ), + ("fqdn", + TextAscii( + title = _("FQDN"), + help = _("FQDN used for HELO"), + size = 20, + allow_empty = True, + default_value = "", + ) + ), + ("cert_days", + Integer( + title = _("Minimum Certificate Age"), + help = _("Minimum number of days a certificate has to be valid."), + unit = _("days"), + ) + ), + ("starttls", + FixedValue( + True, + totext = "STARTTLS enabled.", + title = _("Use STARTTLS for the connection.") + ) + ), + ( "auth", + Tuple( + title = _("Enable SMTP AUTH (LOGIN)"), + help = _("SMTP AUTH type to check (default none, only LOGIN supported)"), + elements = [ + TextAscii( + title = _("Username"), + size = 12, + allow_empty = False), + TextAscii( + title = _("Password"), + size = 12, + allow_empty = False), + ] + ) + ), + ("response_time", + Tuple( + title = _("Expected response time"), + elements = [ + Integer( + title = _("Warning at"), + unit = "sec" + ), + Integer( + title = _("Critical at"), + unit = "sec" + ), + ]) + ), + ( "timeout", + Integer( + title = _("Seconds before connection times out"), + unit = _("sec"), + default_value = 10, + ) + ), + ]) + ]), + match = 'all' +) register_rule(group, "custom_checks",

12 years

Check_MK Git: check_mk: FIX: Dont crash on requests without User-Agent HTTP header

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ec79e278de1ffe50112a299a5490d0e03eb5d64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ec79e278de1ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 15:23:04 2012 +0200 FIX: Dont crash on requests without User-Agent HTTP header --- web/htdocs/index.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index c5e5377..05912ec 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -237,7 +237,7 @@ def handler(req, profiling = True): if html.has_var("mobile"): html.mobile = not not html.var("mobile") else: - user_agent = html.req.headers_in['User-Agent'] + user_agent = html.req.headers_in.get('User-Agent', '') html.mobile = mobile.is_mobile(user_agent) # Redirect to mobile GUI if we are a mobile device and

12 years

Check_MK Git: check_mk: Updated bug entries #0777, #0797

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91bd2fe9027971f4defd96f750f183fc8c9de5f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91bd2fe9027971… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 11:36:47 2012 +0200 Updated bug entries #0777, #0797 --- .bugs/777 | 7 +++++-- .bugs/797 | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/777 b/.bugs/777 index c1fb8d0..3f1ec01 100644 --- a/.bugs/777 +++ b/.bugs/777 @@ -1,9 +1,9 @@ Title: Role-Editor Permission view: WATO chapter duplicate Component: wato -State: open +Class: bug +State: done Date: 2012-06-21 10:49:06 Targetversion: 1.2.0 -Class: bug In the role editor the section with the WATO permissions is displayed twice. @@ -12,3 +12,6 @@ LM: This does only happen when one defines a permission for a section, e.g. wato.*, which has already been followed by another section. I have a fix for this but this is too big for a fix release. + +2012-09-07 11:33:14: changed state open -> done +Has already been fixed. diff --git a/.bugs/797 b/.bugs/797 index 3e7099e..b74b5bd 100644 --- a/.bugs/797 +++ b/.bugs/797 @@ -9,3 +9,5 @@ If you make a area selection on a pnp graphs displayed in multisite you end up at a different position in the graph than you expected If you try to view the right-most position, it will not be possible because you always get something else. + +LM: Where can PNP graphs be zoomed while being displayed in multisite?

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits