Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: FIX cisco_fru_power: Prevent inventory for not available FRUs

by Bastian Kuhn

Module: check_mk Branch: master Commit: 96096778b80e1fab4de474ba90f2dca351bb43d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96096778b80e1f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 17 14:29:19 2013 +0100 FIX cisco_fru_power: Prevent inventory for not available FRUs --- .werks/110 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_fru_power | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/110 b/.werks/110 new file mode 100644 index 0000000..7e24a8a --- /dev/null +++ b/.werks/110 @@ -0,0 +1,10 @@ +Title: cisco_fru_power: Prevent inventory for not available FRUs +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387286933 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index 45fb10d..cfd71a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 0381 FIX: win_printers: Fixed creation of duplicate services... * 0347 FIX: smart.stats: Remove duplicate disks... * 0109 FIX: cisco_fantray: Prevent inventory for not available fans + * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/cisco_fru_power b/checks/cisco_fru_power index 2f57a24..37cdc3d 100644 --- a/checks/cisco_fru_power +++ b/checks/cisco_fru_power @@ -65,7 +65,7 @@ power_oper_type = ('', 'offEnvOther', 'on', 'offAdmin', 'offDenied', power_admin_type = ( '', 'on', 'off', 'inlineAuto', 'inlineOn', 'powercycle') def inventory_cisco_fru_power(info): - return [ (line[0], None ) for line in info if saveint(line[2]) != 1 ] + return [ (line[0], None ) for line in info if saveint(line[2]) not in [ 1, 5 ] ] def check_cisco_fru_power(item, params, info): for line in info:

10 years, 6 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: a9eebc1e31ac0b469dcbc05e218bb4d39588f1df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9eebc1e31ac0b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 17 14:30:34 2013 +0100 merge conflict ---

10 years, 6 months

Check_MK Git: check_mk: Updated bug entries #2100

by Lars Michelsen

Module: check_mk Branch: master Commit: e7e664d2b7c08f83f138c4e8747d7bb1c2df7177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7e664d2b7c08f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 13:39:05 2013 +0100 Updated bug entries #2100 --- .bugs/2100 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2100 b/.bugs/2100 new file mode 100644 index 0000000..6d1602b --- /dev/null +++ b/.bugs/2100 @@ -0,0 +1,8 @@ +Title: OpenLDAP: Group sync seems broken +Component: multisite +State: open +Date: 2013-12-17 13:38:38 +Targetversion: 1.2.4 +Class: bug + +Groups are not synced anymore. The search-filter on the distinguishedName does not work in Openldap, nor can "dn" be used in a searchfilter.

10 years, 6 months

Check_MK Git: check_mk: FIX solaris_mem: Is now compatible to more systems

by Lars Michelsen

Module: check_mk Branch: master Commit: 77c0fa00213cc1fd1af5b4f1fe2014a65a76e5de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77c0fa00213cc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 13:34:42 2013 +0100 FIX solaris_mem: Is now compatible to more systems Depending on the system, the agent might provide memory information of slightly different format: SunOS hosta 5.10 Generic_142900-03 sun4u sparc SUNW,UltraAX-i2 Memory: 512M phys mem, 353M free mem, 2000M total swap, 2000M free swap SunOS hostb 5.10 Generic_142900-03 sun4u sparc SUNW,Sun-Fire-480R Memory: 10G phys mem, 1905M free mem, 8002M total swap, 8002M free swap SunOS hostc 5.6 Generic_105181-21 sun4u sparc SUNW,Ultra-1 Memory: 640M real, 10M free, 293M swap in use, 349M swap free SunOS hostd 5.8 Generic_108528-09 sun4u sparc SUNW,Ultra-60 Memory: 2048M real, 913M free, 723M swap in use, 2863M swap free The check is now compatible to all of them. --- .werks/383 | 25 +++++++++++++++++++++++++ ChangeLog | 1 + checks/solaris_mem | 44 +++++++++++++++++++++++++++----------------- 3 files changed, 53 insertions(+), 17 deletions(-) diff --git a/.werks/383 b/.werks/383 new file mode 100644 index 0000000..a6e4bee --- /dev/null +++ b/.werks/383 @@ -0,0 +1,25 @@ +Title: solaris_mem: Is now compatible to more systems +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387283624 +Targetversion: future + +Depending on the system, the agent might provide memory information +of slightly different format: + +SunOS hosta 5.10 Generic_142900-03 sun4u sparc SUNW,UltraAX-i2 +Memory: 512M phys mem, 353M free mem, 2000M total swap, 2000M free swap + +SunOS hostb 5.10 Generic_142900-03 sun4u sparc SUNW,Sun-Fire-480R +Memory: 10G phys mem, 1905M free mem, 8002M total swap, 8002M free swap + +SunOS hostc 5.6 Generic_105181-21 sun4u sparc SUNW,Ultra-1 +Memory: 640M real, 10M free, 293M swap in use, 349M swap free + +SunOS hostd 5.8 Generic_108528-09 sun4u sparc SUNW,Ultra-60 +Memory: 2048M real, 913M free, 723M swap in use, 2863M swap free + +The check is now compatible to all of them. diff --git a/ChangeLog b/ChangeLog index c05775e..17fa00e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... * 0381 FIX: win_printers: Fixed creation of duplicate services... * 0347 FIX: smart.stats: Remove duplicate disks... + * 0383 FIX: solaris_mem: Is now compatible to more systems... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/solaris_mem b/checks/solaris_mem index be9c3f1..94864ed 100644 --- a/checks/solaris_mem +++ b/checks/solaris_mem @@ -27,27 +27,37 @@ #<<<solaris_mem>>> #Memory: 256G real, 54G free, 257G swap in use, 86G swap free +#<<<solaris_mem>>> +#Memory: 512M phys mem, 353M free mem, 2000M total swap, 2000M free swap + +#<<<solaris_mem>>> +#Memory: 10G phys mem, 1905M free mem, 8002M total swap, 8002M free swap + +#<<<solaris_mem>>> +#Memory: 640M real, 10M free, 293M swap in use, 349M swap free + +#<<<solaris_mem>>> +#Memory: 2048M real, 913M free, 723M swap in use, 2863M swap free + +def solaris_mem_to_kbytes(s): + if s[-1] == 'G': + return saveint(s[:-1]) * 1024 * 1024 + elif s[-1] == 'M': + return saveint(s[:-1]) * 1024 + def inventory_solaris_mem_used(info): return [(None, "memused_default_levels")] def check_solaris_mem_used(_no_item, params, info): - values = ['MemTotal', 'MemFree', 'SwapTotal', 'SwapFree'] - data = {} - data['MemTotal'] = info[0][1] - data['MemFree'] = info[0][3] - data['SwapTotal'] = info[0][5] #swap in use - data['SwapFree'] = info[0][9] - - for value in values: - if data[value][-1] == 'G': - data[value] = saveint(data[value][:-1]) * 1024 * 1024 - elif data[value][-1] == 'M': - data[value] = saveint(data[value][:-1]) * 1024 - - #SwapTotal is Swap in use, so we have to add SwapFree - data['SwapTotal'] = data['SwapTotal'] + data['SwapFree'] - - return check_memory(params, data) + keys = ['MemTotal', 'MemFree', 'SwapTotal', 'SwapFree'] + values = [ solaris_mem_to_kbytes(v) for v in info[0] if v[0] in '01234567890' ] + if len(values) != 4: + return 3, "Got unexpected information from agent" + + # convert swap-in-use to swap-total, as expected by check_memory() + values[2] = values[2] + values[3] + + return check_memory(params, dict(zip(keys, values))) check_info['solaris_mem'] = { "check_function" : check_solaris_mem_used,

10 years, 6 months

Check_MK Git: check_mk: FIX winperf.cpuusage: update man page:

by Mathias Kettner

this check is deprecated Message-ID: <52b0415b.yyta8OyXx/LgXJvt%mk(a)mathias-kettner.de> 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: b6c6835edbd9098d36eddfa74c1cf7e94ebf9e57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6c6835edbd909… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 13:19:31 2013 +0100 FIX winperf.cpuusage: update man page: this check is deprecated --- .werks/349 | 10 ++++++++++ ChangeLog | 1 + checkman/winperf.cpuusage | 11 +++++++---- checkman/winperf_processor.util | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.werks/349 b/.werks/349 new file mode 100644 index 0000000..9e7bfff --- /dev/null +++ b/.werks/349 @@ -0,0 +1,10 @@ +Title: winperf.cpuusage: update man page: this check is deprecated +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387282751 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index c05775e..c237f4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... * 0381 FIX: win_printers: Fixed creation of duplicate services... * 0347 FIX: smart.stats: Remove duplicate disks... + * 0349 FIX: winperf.cpuusage: update man page: this check is deprecated Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checkman/winperf.cpuusage b/checkman/winperf.cpuusage index c228052..dedd4fc 100644 --- a/checkman/winperf.cpuusage +++ b/checkman/winperf.cpuusage @@ -1,18 +1,21 @@ -title: CPU usage on Windows systems +title: CPU usage on Windows systems (deprecated) agents: windows catalog: os/kernel license: GPL distribution: check_mk description: This check monitors the CPU usage on a Windows system using the - windows performance counters (agent section {<<<winperf>>>}). + windows performance counters (agent section {winperf}). In its current implementation this check is always OK. Setting a level for warning or a critical state is possible, but might - not be very usefull, since the computed value is an average over - just one check cycle. A combination with a larger value of {max_check_attempts} + not be very usefull, since the computed value is an average over just one + check cycle. A combination with a larger value of {max_check_attempts} or {notification_delay} might be useful here. + Note: this check is deprecated and not used by modern Check_MK agents. + It is replaced by {winperf_processor.util}. + perfdata: The averaged percentage of CPU utilization during the last check cycle. diff --git a/checkman/winperf_processor.util b/checkman/winperf_processor.util index 3413259..f995171 100644 --- a/checkman/winperf_processor.util +++ b/checkman/winperf_processor.util @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: This check monitors the CPU utilization on a Windows system using the - windows performance counters (agent section {<<<winperf_processor>>>}). + windows performance counters (agent section {winperf_processor}). This check replaces {winperf.cpuusage} which is outdated since version {1.1.11i1} Setting a level for warning or a critical state is possible, but might

10 years, 6 months

Check_MK Git: check_mk: Updated bug entries #2099

by Lars Michelsen

Module: check_mk Branch: master Commit: 06028f8d1802155bb06e7251eda42a11626af9a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06028f8d180215… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 13:12:05 2013 +0100 Updated bug entries #2099 --- .bugs/2099 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.bugs/2099 b/.bugs/2099 new file mode 100644 index 0000000..0436b86 --- /dev/null +++ b/.bugs/2099 @@ -0,0 +1,23 @@ +Title: ps check outputs wrong cpu usage +Component: checks +State: open +Date: 2013-12-17 13:10:37 +Targetversion: 1.2.4 +Class: bug + +The check uses the average cpu usage since start of the process: + + +*** + CODE HEADER DESCRIPTION + + %cpu %CPU cpu utilization of the process in "##.#" format. + Currently, it is the CPU time used divided by the + time the process has been running + (cputime/realtime ratio), expressed as a + percentage. It will not add up to 100% unless + you are lucky. (alias pcpu). +*** + +This is totally wrong. Better would be to use the raw counter values from ps and +keep an eye on the counters on our own.

10 years, 6 months

Check_MK Git: check_mk: Updated gb versions

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f9c63e1baba7254e7584b9a407b4a9a3d3ac14d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f9c63e1baba72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 13:12:42 2013 +0100 Updated gb versions --- .bugs/2099 | 2 +- .bugs/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bugs/2099 b/.bugs/2099 index 0436b86..a5ce780 100644 --- a/.bugs/2099 +++ b/.bugs/2099 @@ -2,7 +2,7 @@ Title: ps check outputs wrong cpu usage Component: checks State: open Date: 2013-12-17 13:10:37 -Targetversion: 1.2.4 +Targetversion: 1.2.5i1 Class: bug The check uses the average cpu usage since start of the process: diff --git a/.bugs/config b/.bugs/config index e6b60c1..85f22ca 100644 --- a/.bugs/config +++ b/.bugs/config @@ -30,6 +30,6 @@ classes = [ ] targetversions = [ - "1.2.4", + "1.2.5i1", "future", ]

10 years, 6 months

Check_MK Git: check_mk: Fixed folding markers

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e213e9eb79b1e3105d6bcee0529d2a0fc4d08dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e213e9eb79b1e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 12:58:11 2013 +0100 Fixed folding markers --- checks/brocade_mlx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 1602684..cd32dd1 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -87,6 +87,7 @@ check_info["brocade_mlx.module_status"] = { "has_perfdata" : False, } +#. # .--Memory--------------------------------------------------------------. # | __ __ | # | | \/ | ___ _ __ ___ ___ _ __ _ _ | @@ -154,6 +155,7 @@ check_info["brocade_mlx.module_mem"] = { "group" : "memory_multiitem", } +#. # .--CPU-----------------------------------------------------------------. # | ____ ____ _ _ | # | / ___| _ \| | | | |

10 years, 6 months

Check_MK Git: check_mk: Active HTTP check now supports multiline regexp matching

by Lars Michelsen

Module: check_mk Branch: master Commit: a3d447cf0ae465225a32634d2f38e3780c046844 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3d447cf0ae465… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 12:47:58 2013 +0100 Active HTTP check now supports multiline regexp matching Previous versions of the configuration form did not provide the option to form regex patterns accross multi lines. The used check_http plugin provides the option "-l" to realize this. The WATO form now has a checkbox to make it possible to use this. --- .werks/382 | 13 +++++++++++++ ChangeLog | 1 + checks/check_http | 2 ++ web/plugins/wato/active_checks.py | 23 ++++++++++++++--------- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.werks/382 b/.werks/382 new file mode 100644 index 0000000..0186b27 --- /dev/null +++ b/.werks/382 @@ -0,0 +1,13 @@ +Title: Active HTTP check now supports multiline regexp matching +Level: 1 +Component: wato +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387280779 +Targetversion: future + +Previous versions of the configuration form did not provide the +option to form regex patterns accross multi lines. The used +check_http plugin provides the option "-l" to realize this. The +WATO form now has a checkbox to make it possible to use this. diff --git a/ChangeLog b/ChangeLog index 06fc932..0558d5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 0329 Removed Distributed WATO peer mode... NOTE: Please refer to the migration notes! * 0244 New features for WATO page Backup & Restore... + * 0382 Active HTTP check now supports multiline regexp matching... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... * 0241 FIX: Improved sorting of WATO folders in dropdown menu... * 0019 FIX: Fixed wording in WATO rule for MSSQL check diff --git a/checks/check_http b/checks/check_http index d74666e..1ac9f7e 100644 --- a/checks/check_http +++ b/checks/check_http @@ -89,6 +89,8 @@ def check_http_arguments(params): args += ' -s %s' % quote_shell_string(settings["expect_string"]) if "expect_regex" in settings: + if len(settings['expect_regex']) >= 4 and settings['expect_regex'][3]: + args += ' -l ' if settings['expect_regex'][1]: args += ' -R' else: diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 5b0e27f..7285211 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -631,15 +631,20 @@ register_rule(group, ) ), ( "expect_regex", - Tuple( - title = _("Regular expression to expect in content"), - orientation = "vertical", - show_titles = False, - elements = [ - RegExp(label = _("Regular expression: ")), - Checkbox(label = _("Case insensitive")), - Checkbox(label = _("return CRITICAL if found, OK if not")), - ]) + Transform( + Tuple( + orientation = "vertical", + show_titles = False, + elements = [ + RegExp(label = _("Regular expression: ")), + Checkbox(label = _("Case insensitive")), + Checkbox(label = _("return CRITICAL if found, OK if not")), + Checkbox(label = _("Multiline string matching")), + ] + ), + forth = lambda x: len(x) == 3 and tuple(list(x) + [False]) or x, + title = _("Regular expression to expect in content"), + ), ), ( "post_data", Tuple(

10 years, 6 months

Check_MK Git: check_mk: Updated bug entries #2098

by Lars Michelsen

Module: check_mk Branch: master Commit: 63ceaa2a7111660131da4f1eda8d39cffe5d6623 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ceaa2a711166… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 12:34:50 2013 +0100 Updated bug entries #2098 --- .bugs/2098 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2098 b/.bugs/2098 new file mode 100644 index 0000000..9cc6cfb --- /dev/null +++ b/.bugs/2098 @@ -0,0 +1,9 @@ +Title: Add try-out button to active check rule editor +Component: wato +State: open +Date: 2013-12-17 12:26:03 +Targetversion: future +Class: feature + +ich hätte da einen Vorschlag zu Active Checks. +Wir wärs wenn man zu den Rules noch einen Try-it-out Button macht? dann sieht man sofort ob der Check fehlschlägt oder funktioniert.

10 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013