Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: WATO: new checkgroup msx_queues. used in winperf_msx_queues

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44a1e8c72e8797766c7e7dbc6a38e1d960f1db75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44a1e8c72e8797… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 30 18:40:39 2012 +0100 WATO: new checkgroup msx_queues. used in winperf_msx_queues --- checks/winperf_msx_queues | 1 + web/plugins/wato/check_parameters.py | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index df3dc27..f63a1a8 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -83,3 +83,4 @@ def check_winperf_msx_queues(item, params, info): check_info['winperf_msx_queues'] = (check_winperf_msx_queues, "Queue %s", 1, inventory_winperf_msx_queues) check_config_variables.append("winperf_msx_queues") +checkgroup_of["winperf_msx_queues"] = "msx_queues" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8c1ff89..abddd1b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -419,6 +419,32 @@ checkgroups.append(( )) checkgroups.append(( + "msx_queues", + _("MS Exchange message queues"), + Tuple( + help = _("The length of the queues"), + elements = [ + Integer(title = _("Warning at queue length")), + Integer(title = _("Critical at queue length")) + ]), + OptionalDropdownChoice( + title = _("Explicit Queue Names"), + help = _("You can enter a number of explicit queues names that " + "rule should or should not apply here. Builtin queues: " + "Active Remote Delivery Active Mailbox Delivery " + "Retry Remote Delivery Poison Queue Length "), + choices = [ + ( "Active Remote Delivery", "Active Remote Delivery" ), + ( "Retry Remote Delivery", "Retry Remote Delivery" ), + ( "Active Mailbox Delivery", "Active Mailbox Delivery" ), + ( "Poison Queue Length", "Poison Queue Length" ), + ], + otherlabel = _("specify manually ->"), + explicit = TextAscii(allow_empty = False)), + "first") +) + +checkgroups.append(( "filesystem", _("Filesystems (used space and growth)"), Dictionary(

12 years, 5 months

Check_MK Git: check_mk: resolved merge conflict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f33bdd9bfd4b05c6d2928121da323721549a91c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f33bdd9bfd4b05… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 30 18:53:35 2012 +0100 resolved merge conflict ---

12 years, 5 months

Check_MK Git: check_mk: Minor code cleanup in checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 324f15dc3edb248d140b5e7ab69e59544e4710fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324f15dc3edb24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 30 11:36:09 2012 +0100 Minor code cleanup in checks --- checks/cisco_temp | 2 +- checks/cisco_temp_perf | 2 +- checks/cpu | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/checks/cisco_temp b/checks/cisco_temp index 072d2ba..3398eaf 100644 --- a/checks/cisco_temp +++ b/checks/cisco_temp @@ -54,7 +54,7 @@ def inventory_cisco_temp(checktyp, info): # Skip sensors with state 5 (not present) return [ (name, None) for (name, state) in info if state != '5' ] -def check_cisco_temp(item, params, info): +def check_cisco_temp(item, _no_params, info): for name, state in info: if name == item: if state == '1': diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index 6b0d494..f13f18c 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -64,7 +64,7 @@ def inventory_cisco_temp_perf(info): inventory.append((name, None)) return inventory -def check_cisco_temp_perf(item, params, info): +def check_cisco_temp_perf(item, _no_params, info): for line in info: if line[0] == item or line[4] == item: temp = saveint(line[1]) diff --git a/checks/cpu b/checks/cpu index 48d61e8..811b33b 100644 --- a/checks/cpu +++ b/checks/cpu @@ -24,25 +24,25 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Output is taken from /proc/loadavg plus the number of cores: +# 0.26 0.47 0.52 2/459 19531 4 + cpuload_default_levels = (5, 10) threads_default_levels = (2000.0, 4000.0) def inventory_cpu_load(info): if len(info) == 1 and len(info[0]) >= 5: - return [(None, "", "cpuload_default_levels")] + return [(None, "cpuload_default_levels")] def check_cpu_load(item, params, info): - try: - load = [] - for i in [ 0, 1, 2 ]: - load.append(float(info[0][i])) - if len(info[0]) >= 6: - num_cpus = int(info[0][5]) - else: - num_cpus = 1 - except: - return (3, "Unknown - invalid or incomplete output from plugin") + load = [] + for i in [ 0, 1, 2 ]: + load.append(float(info[0][i])) + if len(info[0]) >= 6: + num_cpus = int(info[0][5]) + else: + num_cpus = 1 warn, crit = params # apply on 15min average, relative to number of CPUs warn = warn * num_cpus

12 years, 5 months

Check_MK Git: check_mk: Cleanup in Check parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ff623b5c62babf0f4ecf99aa81979e4ae0c12b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ff623b5c62bab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 30 16:10:38 2012 +0100 Cleanup in Check parameters --- checks/ucd_cpu_util | 2 +- web/plugins/wato/check_parameters.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index 3f6dc20..9e68c3c 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -92,4 +92,4 @@ snmp_info['ucd_cpu_util'] = ( ".1.3.6.1.4.1.2021.11", [ 50, 51, 52, 53, 54, 55, snmp_scan_functions['ucd_cpu_util'] = \ lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") -checkgroup_of['ucd_cpu_util'] = "2xthresholdPercent" +checkgroup_of['ucd_cpu_util'] = "cpu_utilization" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7506f56..eb463e4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -614,7 +614,7 @@ checkgroups.append(( checkgroups.append(( "cpu_utilization", - _("CPU utilization"), + _("CPU utilization (disk wait)"), Optional( Tuple( elements = [

12 years, 5 months

Check_MK Git: check_mk: mounts: ignore change in commit= option

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb886e22d7d678507acdb7084c615adcb806e1ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb886e22d7d678… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 29 22:30:11 2012 +0100 mounts: ignore change in commit= option --- .bugs/476 | 13 ++++++++++--- ChangeLog | 2 ++ checkman/mounts | 20 ++++++++++++-------- checks/mounts | 33 +++++++++++++++++++++++++++------ 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/.bugs/476 b/.bugs/476 index 1e88e12..22cbf79 100644 --- a/.bugs/476 +++ b/.bugs/476 @@ -1,13 +1,20 @@ -Title: mounts Checks should only check ro flag +Title: mounts check should only check ro flag Component: checks +State: done +Class: bug Benefit: 1 -State: open Cost: 1 Date: 2011-12-06 08:52:27 Targetversion: 1.2.0 -Class: bug Currently on my laptop the mounts check is flapping around because the kernel seems to add a mount option with "commit" and change it all the time. Basically we'd need to just monitor the ro status. + +Another idea is to consolidate the check into one single +check. This is difficult - however - because we need to +safe one per-filesystem parameter: the expected options. + +2012-01-29 22:29:13: changed state open -> done +commit is now excluded. diff --git a/ChangeLog b/ChangeLog index 2f96498..9f88f2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,8 @@ link speed (fixes speed of 10GBit/s and 20GBit/s ports, thanks Marco Poet) * cmctc.temp: serivce has been renamed from "CMC Temperature %s" to just "Temperature %s", in order to be consistent with the other checks. + * mounts: exclude changes of the commit option (might change on laptops), + make only switch to ro critical, other changes warning. Multisite: * Improve transaction handling and reload detection: user can have diff --git a/checkman/mounts b/checkman/mounts index 59da5e4..1030bf5 100644 --- a/checkman/mounts +++ b/checkman/mounts @@ -6,13 +6,16 @@ distribution: check_mk description: This check monitors the options with which a filesystem is mounted by using the output of {/proc/mounts}. In normal operation mount options - should never change. If they do a severe problem can be the case: In - case of an I/O error while writing to disk, most filesystems (e.g. - {ext3}) will switch to read-only per default in order to avoid further - filesystem corruption. This check makes sure that you get to know - if this happens. + should never change. In recent versions of Linux (e.g. UBUNTU oneiric), + the mount option {commit=} may change automatically depending + on the current battery state, so this option is being excluded from + the monitoring. + + This check goes critical if the mount option {ro} appears. This + might indicate IO errors are even a filesystem corruption! + + Any other change of mount options will trigger a warning state. - Any change in the mount options results in a {CRITICAL} state. If the filesystem is not being found mounted, the check returns an {UNKNOWN} state. @@ -27,5 +30,6 @@ inventory: by the agent. [parameters] -target_options (list of strings): The list of expected mount options. Any change - in that list will result in a critical state. Example: {['data=ordered', 'rw']} +target_options (list of strings): The list of expected mount options. During + inventory this list is being put into the check's parameter. + Example: {['data=ordered', 'rw']} diff --git a/checks/mounts b/checks/mounts index c82dab7..5764cbe 100644 --- a/checks/mounts +++ b/checks/mounts @@ -36,13 +36,34 @@ def inventory_mounts(info): def check_mounts(item, targetopts, info): for dev, mp, fstype, options, dump, fsck in info: if item == mp: - targetopts.sort() opts = options.split(",") - opts.sort() - if opts != targetopts: - return (2, "CRIT - mount options are %s, expected are %s" % (",".join(opts), ",".join(targetopts))) - else: - return (0, "OK - mount options are %s" % (",".join(opts))) + # Now compute the exact difference. + exceeding = [] + missing = [] + for o in opts: + if o not in targetopts and not o.startswith("commit="): + exceeding.append(o) + for o in targetopts and not o.startswith("commit="): + if o not in opts: + missing.append(o) + + if not missing and not exceeding: + return (0, "OK - mount options exactly as expected") + + infos = [] + if missing: + infos.append("missing: %s" % ",".join(missing)) + if exceeding: + infos.append("exceeding: %s" % ",".join(exceeding)) + infotext = ", ".join(infos) + + if "ro" in exceeding: + return (2, "CRIT - filesystem has switched to read-only " + "and is probably corrupted(!!), " + infotext) + + # Just warn in other cases + return (1, "OK - " + infotext) + return (3, "UNKNOWN - filesystem not mounted")

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0412

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 607df1d1d598d653e906a539fa801d4a493cc30e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=607df1d1d598d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jan 29 17:01:21 2012 +0100 Updated bug entries #0412 --- .bugs/412 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/412 b/.bugs/412 index 1dfc6c2..c1c0e39 100644 --- a/.bugs/412 +++ b/.bugs/412 @@ -1,10 +1,14 @@ Title: Documentation for dashboards is missing Component: docu +State: done +Class: todo Benefit: 3 -State: open Cost: 3 Date: 2011-10-14 12:30:36 -Class: todo +Targetversion: future A common question will be how to customize the dashboard. Create basic docs for the dashboard format and how to create custom dashlets and dashboards + +2012-01-29 17:01:19: changed state open -> done +Documentation is finally written. Phuey.

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0594

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 540d799d9809a877741c8b3213021a744a25c735 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=540d799d9809a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 28 14:27:59 2012 +0100 Updated bug entries #0594 --- .bugs/594 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/594 b/.bugs/594 index 9096822..fef2c04 100644 --- a/.bugs/594 +++ b/.bugs/594 @@ -1,9 +1,13 @@ -Title: CPU Load immer auf 100% bei -nv (Windows) +Title: CPU Utilization immer auf 100% bei -nv (Windows) Component: core State: open Date: 2012-01-10 17:58:52 Targetversion: 1.2.0 Class: nastiness -Windows Hosts zeigen bei einem cmk -nv immer einen CPU Load von 100% an. +Windows Hosts zeigen bei einem cmk -nv immer eine CPU Utilization von 100% an. Der Normale Check funktioniert. Tritt hier bei 1.1.13i2 auf. + +Grund: der Check arbeitet mit Countern. Sollte aber trotzdem machbar sein, +dass er funktioniert, wenn schon von früher Werte da sind. Bei erstenmal +sollte der Check pending sein (analog zu disk IO).

12 years, 5 months

Check_MK Git: check_mk: Dashboard: link problem views to *unhandled* views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 476420548ea4b03835e18f67dc4c270a49609df4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=476420548ea4b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 28 14:19:59 2012 +0100 Dashboard: link problem views to *unhandled* views --- ChangeLog | 2 ++ web/plugins/dashboard/builtin.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b994f4e..2f96498 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,8 @@ * FIX: Fix problem with Umlaut in contact alias * FIX: Creating auth.php file on first login dialog based login to ensure it exists after login when it is first needed + * Dashboard: link problem views to *unhandled* views (this was + inconsistent) Mobile: * Improved sorting of views in main page diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index c3eed28..caa7591 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -53,15 +53,15 @@ builtin_dashboards["main"] = { "refresh" : 60, }, { - "title" : _("Host Problems"), - "title_url" : "view.py?view_name=hostproblems", + "title" : _("Host Problems (unhandled)"), + "title_url" : "view.py?view_name=hostproblems&is_host_acknowledged=0", "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (-1, 1), "size" : (GROW, 6), }, { - "title" : _("Service Problems"), - "title_url" : "view.py?view_name=svcproblems", + "title" : _("Service Problems (unhandled)"), + "title_url" : "view.py?view_name=svcproblems&is_service_acknowledged=0", "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", "position" : (1, 7), "size" : (GROW, MAX),

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0608, #0607

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e738a59146d307e2581292763e30f15af4616d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e738a59146d30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jan 28 13:10:53 2012 +0100 Updated bug entries #0608, #0607 --- .bugs/607 | 8 ++++++-- .bugs/608 | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.bugs/607 b/.bugs/607 index b16128f..26c6db7 100644 --- a/.bugs/607 +++ b/.bugs/607 @@ -5,5 +5,9 @@ Date: 2012-01-27 14:46:10 Targetversion: 1.2.0 Class: nastiness -Das ändern der Einstellung: wato_activation_method über Wato erforder einen Apache restart damit -es funktioniert. Wato führt diesen jedoch nicht aus. +Das Ändern der Einstellung: wato_activation_method über Wato erforder einen +Apache restart damit es funktioniert. Wato führt diesen jedoch nicht aus. + +Mathias: Das kann eigentlich nicht so sein. Änderungen in multisite.mk brauchen +nie einen Neustart. WATO kann auch keinen Neustart von Apache machen. Der +Fehler muss wo anders liegen. diff --git a/.bugs/608 b/.bugs/608 index b60b14e..ebd2214 100644 --- a/.bugs/608 +++ b/.bugs/608 @@ -5,6 +5,10 @@ Date: 2012-01-27 16:09:02 Targetversion: 1.2.0 Class: nastiness -Wird über Wato ein Nagios Reload anstelle des Restart ausgeführt, -braucht das neuladen des Livestatus Modules zu lange und die Sitebar läuf in einen +Wird über Wato ein Nagios Reload anstelle des Restart ausgeführt, braucht +das Neuladen des Livestatus Modules zu lange und die Sidebar läuf in einen Livestatus Timeout und muss neu geladen werden. + +Mathias: Ich denke wir lösen das Problem in der Livestatus-API für Python. +Wenn der Connect nicht klappt, probieren wir es eine Zeitlang. Dafür +gibt es ja eine Timeout-Einstellung.

12 years, 5 months

Check_MK Git: check_mk: forms: add validation function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67a7d0698b41ef300de8c484776216fba3722e34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67a7d0698b41ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 27 21:31:49 2012 +0100 forms: add validation function --- web/htdocs/forms.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 9df5239..6c76846 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -27,7 +27,7 @@ from lib import * -def edit_dictionary(entries, value, focus=None, hover_help=True): +def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None): new_value = value.copy() if html.var("filled_in") == "form" and html.check_transaction(): messages = [] @@ -39,6 +39,14 @@ def edit_dictionary(entries, value, focus=None, hover_help=True): except MKUserError, e: messages.append(u"%s: %s" % (vs.title(), e.message)) html.add_user_error(e.varname, e.message) + + if validate: + try: + validate(new_value) + except MKUserError, e: + messages.append(e.message) + html.add_user_error(e.varname, e.message) + if messages: html.show_error("".join(["%s \n" % m for m in messages])) else:

12 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012