Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: Added manpage for jolokia_metrics.threads

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2603ab93998702ebc5db1dfd4fd55de5dd47923e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2603ab93998702… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Sep 14 14:12:56 2012 +0200 Added manpage for jolokia_metrics.threads --- checkman/jolokia_metrics.threads | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/checkman/jolokia_metrics.threads b/checkman/jolokia_metrics.threads new file mode 100644 index 0000000..5697958 --- /dev/null +++ b/checkman/jolokia_metrics.threads @@ -0,0 +1,38 @@ +title: Number of JVM threads +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check works on the number of threads running in a JVM. + It can alert if a configured number of threads is exceeded, and + it will also calculate the rate (per second) at which new threads + are launched, independent of the total number of threads at the + time. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + + +item: + The name of the application server instance as configured by the agent. + +perfdata: + The following values are returned in the perfdata: + Rate of thread creations, + Count of Threads currently running, + Count of Daemon Threads currently serving other threads, + Maximum number of Threads started at any given time during the JVM lifetime, + Number of Threads started since starting the JVM. + +inventory: + One check is created per JVM sent by the Jolokia agent. + + +[parameters] +warn (int): a WARN state is triggered is this many threads are running + a WARNING state is triggered +crit (int): a CRITICAL state is triggered is this many threads are running + +[configuration] +jolokia_metrics_threads_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: 9d15ddf6d07245619fa74149bc36e070e2af8f61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d15ddf6d07245… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 14:08:53 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: Added new check apache_status ( analog to check_apachestatus nagios check but with automatic apache process scanning in agent script )

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9734317a13128d6ab38e3a52c581b5c33e292837 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9734317a13128d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 14:08:23 2012 +0200 Added new check apache_status (analog to check_apachestatus nagios check but with automatic apache process scanning in agent script) --- ChangeLog | 2 + agents/plugins/apache_status | 89 +++++++++++++++++++ checks/apache_status | 138 ++++++++++++++++++++++++++++++ pnp-templates/check_mk-apache_status.php | 121 ++++++++++++++++++++++++++ 4 files changed, 350 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9734317a13…

12 years

Check_MK Git: check_mk: Slight layout fix in narrow text inputs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d052ff7153d490dadf0964ab9777817bbfe6b36d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d052ff7153d490… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 14 13:53:15 2012 +0200 Slight layout fix in narrow text inputs --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a5b6cd6..cc5a93a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -484,7 +484,7 @@ class html: if "size" in args and args["size"]: addprops += " size=%d" % (args["size"] + 1) if "width:" not in args.get("style", "") and not self.mobile: - add_style = "width: %d.5ex; " % args["size"] + add_style = "width: %d.8ex; " % args["size"] if "type" in args: mytype = args["type"]

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: 9261e154cb6438231fa381a3577ef4e5abfc3f7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9261e154cb6438… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 14 13:53:38 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: ValueSpec AbosluteDate: allow output format specification

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6118edd34d4bd3adf1eaf3f060eb91b8aaf7d3d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6118edd34d4bd3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 14 13:53:33 2012 +0200 ValueSpec AbosluteDate: allow output format specification --- web/htdocs/valuespec.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index afff6b0..d21f0e2 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1250,6 +1250,7 @@ class AbsoluteDate(ValueSpec): self._default_value = today() self._show_titles = kwargs.get("show_titles", True) self._label = kwargs.get("label") + self._format = kwargs.get("format", "%F") def canonical_value(self): return self._default_value @@ -1279,7 +1280,7 @@ class AbsoluteDate(ValueSpec): html.set_focus(varprefix + "_year") def value_to_text(self, value): - return time.strftime("%F", time.localtime(value)) + return time.strftime(self._format, time.localtime(value)) def from_html_vars(self, varprefix): parts = []

12 years

Check_MK Git: check_mk: WATO: Improved visualization of list/

by git＠mathias-kettner.de

dict valuespecs, encoding regexp chars correctly when displaying User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 0d16d572ea0d76cdbb911284b6fca398c9804f0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d16d572ea0d76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 09:48:11 2012 +0200 WATO: Improved visualization of list/dict valuespecs, encoding regexp chars correctly when displaying --- ChangeLog | 2 ++ web/htdocs/valuespec.py | 30 ++++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 3 ++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01b9b1a..f061fdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,8 @@ unreachable gateways. * User managament: Added fields for editing host/service notification commands * Added new active check configuration for check_smtp + * Improved visualization of ruleset lists/dictionaries + * Encoding special chars in RegExp valuespec (e.g. logwatch patterns) * 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/htdocs/valuespec.py b/web/htdocs/valuespec.py index afff6b0..b78cb32 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -26,12 +26,14 @@ import math, os, time, re, sre_constants, urlparse, forms from lib import * +from htmllib import attrencode # Abstract base class of all value declaration classes. class ValueSpec: def __init__(self, **kwargs): self._title = kwargs.get("title") self._help = kwargs.get("help") + self._attrencode = kwargs.get("attrencode", False) if "default_value" in kwargs: self._default_value = kwargs.get("default_value") @@ -74,6 +76,10 @@ class ValueSpec: # used in tables and other contextes. It is to be read # by the user and need not to be parsable. # The function may assume that the type of the value is valid. + # + # In the current implementation this function is only used to + # render the object for html code. So it is allowed to add + # html code for better layout in the GUI. def value_to_text(self, value): return repr(value) @@ -303,7 +309,10 @@ class TextAscii(ValueSpec): if value == None: return _("none") else: - return value + if self._attrencode: + return attrencode(value) + else: + return value def from_html_vars(self, varprefix): value = html.var(varprefix, "") @@ -340,7 +349,7 @@ class ID(TextAscii): class RegExp(TextAscii): def __init__(self, **kwargs): - TextAscii.__init__(self, **kwargs) + TextAscii.__init__(self, attrencode = True, **kwargs) def validate_value(self, value, varprefix): TextAscii.validate_value(self, value, varprefix) @@ -535,7 +544,10 @@ class ListOfStrings(ValueSpec): return [] def value_to_text(self, value): - return ", ".join([self._valuespec.value_to_text(v) for v in value]) + s = '<table>' + for v in value: + s += '<tr><td>%s</td></tr>' % self._valuespec.value_to_text(v) + return s + '</table>' def from_html_vars(self, vp): value = [] @@ -647,8 +659,10 @@ class ListOf(ValueSpec): else: return self._totext else: - return ", ".join([ - self._valuespec.value_to_text(v) for v in value]) + s = '<table>' + for v in value: + s += '<tr><td>%s</td></tr>' % self._valuespec.value_to_text(v) + return s + '</table>' def from_html_vars(self, varprefix): n = 1 @@ -1814,11 +1828,11 @@ class Dictionary(ValueSpec): if not value: return self._empty_text - parts = [] + s = '<table>' for param, vs in self._elements: if param in value: - parts.append("%s: %s" % (vs.title(), vs.value_to_text(value[param]))) - return ", ".join(parts) + s += "<tr><td>%s</td><td>%s</td></tr>" % (vs.title(), vs.value_to_text(value[param])) + return s + '</table>' def from_html_vars(self, varprefix): value = {} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 812fca0..328239c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -111,10 +111,11 @@ register_rule(group + '/' + subgroup_applications, ), RegExp( title = _("Pattern (Regex)"), - size = 20, + size = 40, ), TextAscii( title = _("Comment"), + size = 40, ), ] ),

12 years

Check_MK Git: check_mk: Added check_interval and retry_interval rules for host checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 25c2e1620004a25cf97a46f5a78e5951f2450632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25c2e1620004a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 14 10:14:06 2012 +0200 Added check_interval and retry_interval rules for host checks --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 64 ++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index f061fdc..6a31b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * Added new active check configuration for check_smtp * 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 * 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_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 46ec1b7..848e25f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -591,14 +591,7 @@ register_rule(group, register_rulegroup("monconf", _("Monitoring Configuration"), _("Intervals for checking, retries, clustering, configuration for inventory and similar")) -group = "monconf/Checking" - -register_rule(group, - "extra_host_conf:max_check_attempts", - Integer(title = _("Maximum number of check attempts for host"), - help = _("The maximum number of failed host checks until the host will be considered " - "in a hard down state"), - minvalue = 1)) +group = "monconf/Service Checks" register_rule(group, "extra_service_conf:max_check_attempts", @@ -635,15 +628,6 @@ register_rule(group, itemtype = "service") register_rule(group, - "extra_host_conf:check_period", - TimeperiodSelection( - title = _("Check period for hosts"), - help = _("If you specify a check period for a host then active checks of that " - "host will only take place within that period. In the rest of the time " - "the state of the host will stay at its last status.")), - ) - -register_rule(group, "extra_service_conf:check_period", TimeperiodSelection( title = _("Check period for services"), @@ -667,7 +651,7 @@ register_rule(group, register_rule(group, "extra_service_conf:passive_checks_enabled", DropdownChoice( - title = _("Enable/disable proccessing of passiv check results for services"), + title = _("Enable/disable passive checks for services"), help = _("This setting allows you to disable the processing of passiv check results for a " "service."), choices = [ ("1", _("Enable processing of passiv check results")), @@ -686,6 +670,50 @@ register_rule(group, ), itemtype = "service") +group = "monconf/Host Checks" + +register_rule(group, + "extra_host_conf:max_check_attempts", + Integer(title = _("Maximum number of check attempts for host"), + help = _("The maximum number of failed host checks until the host will be considered " + "in a hard down state"), + minvalue = 1)) + +register_rule(group, + "extra_host_conf:check_interval", + Integer( + title = _("Normal check interval for host checks"), + help = _("The default interval is set to one minute. Here you can specify a larger " + "interval. The host is contacted in this interval on a regular base. The host " + "check is also being executed when a problematic service state is detected to check " + "wether or not the service problem is resulting from a host problem."), + minvalue = 1, + label = _("minutes") + ) +) + +register_rule(group, + "extra_host_conf:retry_interval", + Integer(title = _("Retry check interval for host checks"), + help = _("This setting is relevant if you have set the maximum number of check " + "attempts to a number greater than one. In case a host check is not UP " + "and the maximum number of check attempts is not yet reached, it will be " + "rescheduled with this interval. The retry interval is usually set to a smaller " + "value than the normal interval."), + minvalue = 1, + label = _("minutes") + ) +) + +register_rule(group, + "extra_host_conf:check_period", + TimeperiodSelection( + title = _("Check period for hosts"), + help = _("If you specify a check period for a host then active checks of that " + "host will only take place within that period. In the rest of the time " + "the state of the host will stay at its last status.")), + ) + group = "monconf/Notifications" register_rule(group, "extra_host_conf:notifications_enabled",

12 years

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

← Newer
1
...
12
13
14
15
16
17
18
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012