Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: fixed uptime function: sed: not a recognized flag: r

by Simon Betz

Module: check_mk Branch: master Commit: 424bd3b6dab10a5ef176c9aa63532a205805751d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=424bd3b6dab10a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 31 13:40:18 2015 +0200 fixed uptime function: sed: not a recognized flag: r --- agents/check_mk_agent.aix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 2ebb4f4..2cac719 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -217,17 +217,17 @@ then fi # uptime formats -# 12:55pm up 105 days, 21 hrs, 2 users, load average: 0.26, 0.26, 0.26 -# 1:41pm up 105 days, 21:46, 2 users, load average: 0.28, 0.28, 0.27 -# 05:26PM up 1:16, 1 user, load average: 0.33, 0.21, 0.20 -# 06:13PM up 2:03, 1 user, load average: 1.16, 1.07, 0.91 -# 08:43AM up 29 mins, 1 user, load average: 0.09, 0.18, 0.21 -# 08:47AM up 66 days, 18:34, 1 user, load average: 2.25, 2.43, 2.61 +# 12:55pm up 105 days, 21 hrs, 2 users, load average: 0.26, 0.26, 0.26 --> 9147600 +# 1:41pm up 105 days, 21:46, 2 users, load average: 0.28, 0.28, 0.27 --> 9150360 +# 05:26PM up 1:16, 1 user, load average: 0.33, 0.21, 0.20 --> 4560 +# 06:13PM up 2:03, 1 user, load average: 1.16, 1.07, 0.91 --> 7380 +# 08:43AM up 29 mins, 1 user, load average: 0.09, 0.18, 0.21 --> 1740 +# 08:47AM up 66 days, 18:34, 1 user, load average: 2.25, 2.43, 2.61 --> 5769240 echo '<<<uptime>>>' -uptime | sed -e 's/^.*up//g' -e 's/user.*$//g' -e 's/hrs/0/g' -e 's/:/ /g' -e 's/days,//g' -e 's/mins//g' \ - | sed -r 's/(.*),.*/\1/' \ +uptime | sed -e 's/^.*up//g' -e 's/user.*$//g' -e 's/hrs/0/g' -e 's/:/ /g' \ + -e 's/days,//g' -e 's/mins//g' -e 's/.[^,]*$//' \ | awk '{if (NF == 3) a=86400*int($1)+3600*int($2)+60*int($3); \ - else if (NF ==2) a=3600*int($1)+60*int($2); \ + else if (NF == 2) a=3600*int($1)+60*int($2); \ else a=60*int($1); printf("%d\n",a)}'

8 years, 10 months

Check_MK Git: check_mk: fixed incorrect unit on frequency

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4ddcb33081d8500993c47b2e68433072d9c897ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ddcb33081d850… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Aug 31 09:29:56 2015 +0200 fixed incorrect unit on frequency --- web/plugins/wato/check_parameters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c9f6210..fa657b0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6969,10 +6969,10 @@ phase_elements = [ Tuple( title = _("Frequency"), elements = [ - Integer(title = _("warning if below"), unit = u"V", default_value = 45), - Integer(title = _("critical if below"), unit = u"V", default_value = 40), - Integer(title = _("warning if above"), unit = u"V", default_value = 55), - Integer(title = _("critical if above"), unit = u"V", default_value = 60), + Integer(title = _("warning if below"), unit = u"Hz", default_value = 45), + Integer(title = _("critical if below"), unit = u"Hz", default_value = 40), + Integer(title = _("warning if above"), unit = u"Hz", default_value = 55), + Integer(title = _("critical if above"), unit = u"Hz", default_value = 60), ], )) ]

8 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2340

by Mathias Kettner

Module: check_mk Branch: master Commit: a2d82400a2b980bc6c3f53b99933f40fb75a9872 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2d82400a2b980… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 31 10:19:53 2015 +0200 Updated bug entries #2340 --- .bugs/2340 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2340 b/.bugs/2340 new file mode 100644 index 0000000..ab8e8fb --- /dev/null +++ b/.bugs/2340 @@ -0,0 +1,9 @@ +Title: cmk --rrd-convert does not take service desription into account +Component: core +State: open +Date: 2015-08-31 10:18:59 +Targetversion: 1.2.7 +Class: bug + +Create a rule for all services beginning with CPU. But it affects +all services.

8 years, 10 months

Check_MK Git: check_mk: fullfill -> fulfill

by Mathias Kettner

Module: check_mk Branch: master Commit: ae2629b5272c0e904be2f92cdc4fdb26de81f6f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae2629b5272c0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 31 10:04:26 2015 +0200 fullfill -> fulfill --- .werks/1395 | 2 +- modules/check_mk.py | 8 ++++---- web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.werks/1395 b/.werks/1395 index ce93c74..457468f 100644 --- a/.werks/1395 +++ b/.werks/1395 @@ -51,7 +51,7 @@ if the host is being monitored by a remote system.</li> <li>EC notifications do not have a <i>previous</i> host or service state, since the Event Console is a stateless monitoring. Do not set any matching criteria on the event type since none of these -can be fullfilled currently.</li> +can be fulfilled currently.</li> <li>All EC notifications are sent as <i>service</i> notifications. The name of the event's application is taken as service description.</li> </ul> diff --git a/modules/check_mk.py b/modules/check_mk.py index 829fc4b..2504c86 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -485,7 +485,7 @@ def collect_hosttags(): g_hosttag_taglist_cache = {} g_global_caches.append('g_hosttag_taglist_cache') -# Check if a host fullfills the requirements of a tags +# Check if a host fulfills the requirements of a tags # list. The host must have all tags in the list, except # for those negated with '!'. Those the host must *not* have! # New in 1.1.13: a trailing + means a prefix match @@ -1128,12 +1128,12 @@ def get_sorted_check_table(hostname, remove_duplicates=False, world="config"): left = [] at_least_one_hit = False for check in unsorted: - deps_fullfilled = True + deps_fulfilled = True for dep in check[4]: # deps if dep in unsorted_descrs: - deps_fullfilled = False + deps_fulfilled = False break - if deps_fullfilled: + if deps_fulfilled: sorted.append(check) at_least_one_hit = True else: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5fba28a..e9833aa 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -71,7 +71,7 @@ class ValueSpec: # Create a canonical, minimal, default value that # matches the datatype of the value specification and - # fullfills also data validation. + # fulfills also data validation. def canonical_value(self): return None diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ba61f43..edfe7ce 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15483,7 +15483,7 @@ def mode_edit_rule(phase, new = False): # Host tags forms.section(_("Host tags")) render_condition_editor(tag_specs) - html.help(_("The rule will only be applied to hosts fullfilling all " + html.help(_("The rule will only be applied to hosts fulfilling all " "of the host tag conditions listed here, even if they appear " "in the list of explicit host names."))

8 years, 10 months

Check_MK Git: check_mk: renamed key in Pascal unit info

by Simon Betz

Module: check_mk Branch: master Commit: 3f89f73ca63b52932df07e82683f20d829f30332 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f89f73ca63b52… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 31 10:00:56 2015 +0200 renamed key in Pascal unit info --- web/plugins/metrics/check_mk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 56ea7f7..97d2c91 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -182,7 +182,7 @@ unit_info["bar"] = { "render" : lambda v: physical_precision(v, 6, _("bar")), } -unit_info["Pa"] = { +unit_info["pa"] = { "title" : _("Pascal"), "symbol" : _("Pa"), "render" : lambda v: physical_precision(v, 3, _("Pa")), @@ -2040,7 +2040,7 @@ metric_info["pressure"] = { metric_info["pressure_pa"] = { "title" : _("Pressure"), - "unit" : "Pa", + "unit" : "pa", "color" : "#ff6234", }

8 years, 10 months

Check_MK Git: check_mk: added default levels description to manpages of checks hp_msa_psu.temp and hp_msa_disk.temp

by Simon Betz

Module: check_mk Branch: master Commit: 5cdb0486b47dd42488615dadce300edfa7a988f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cdb0486b47dd4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 31 09:48:43 2015 +0200 added default levels description to manpages of checks hp_msa_psu.temp and hp_msa_disk.temp --- checkman/hp_msa_disk.temp | 3 ++- checkman/hp_msa_psu.temp | 3 ++- checks/hp_msa_psu | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/checkman/hp_msa_disk.temp b/checkman/hp_msa_disk.temp index 1e11149..c567174 100644 --- a/checkman/hp_msa_disk.temp +++ b/checkman/hp_msa_disk.temp @@ -11,7 +11,8 @@ description: Furthermore it displays the number of temperature sensors. The levels are configurable. - No default levels are set. + Lower levels are set to 20 and 15 celsius. + Upper levels are set to 40 and 45 celsius. item: Temperature summary. diff --git a/checkman/hp_msa_psu.temp b/checkman/hp_msa_psu.temp index 04b9e26..33326ac 100644 --- a/checkman/hp_msa_psu.temp +++ b/checkman/hp_msa_psu.temp @@ -8,7 +8,8 @@ description: To make it work you have to configure the hp_msa datasource program via WATO. The levels are configurable. - No default levels are set. + Lower levels are set to 25 and 20 celsius. + Upper levels are set to 45 and 50 celsius. item: The PSU identifier. diff --git a/checks/hp_msa_psu b/checks/hp_msa_psu index b9c2e59..3f33a7a 100644 --- a/checks/hp_msa_psu +++ b/checks/hp_msa_psu @@ -133,7 +133,7 @@ check_info['hp_msa_psu.sensor'] = { # +----------------------------------------------------------------------+ factory_settings["hp_msa_psu_temp_default_levels"] = { - "levels" : (35.0, 40.0), + "levels" : (45.0, 50.0), "levels_lower" : (25.0, 20.0), }

8 years, 10 months

Check_MK Git: check_mk: added temperature default levels for hp_msa_disk, hp_msa_psu

by Simon Betz

Module: check_mk Branch: master Commit: e0c3b0ee9510cc9d1cfeaac3d03f91e3ed64b587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0c3b0ee9510cc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 31 09:36:52 2015 +0200 added temperature default levels for hp_msa_disk, hp_msa_psu --- checks/hp_msa_disk | 6 ++++++ checks/hp_msa_psu | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/checks/hp_msa_disk b/checks/hp_msa_disk index d259128..ec9011e 100644 --- a/checks/hp_msa_disk +++ b/checks/hp_msa_disk @@ -201,6 +201,11 @@ check_info['hp_msa_disk.io'] = { # | |_| | # '----------------------------------------------------------------------' +factory_settings["hp_msa_disk_temp_default_levels"] = { + "levels" : (40.0, 45.0), + "levels_lower" : (20.0, 15.0), +} + def inventory_hp_msa_disk_temp(parsed): return [ ("Disks", {}) ] @@ -219,6 +224,7 @@ check_info['hp_msa_disk.temp'] = { 'service_description' : 'Temperature %s', 'group' : 'temperature', 'has_perfdata' : True, + 'default_levels_variable' : "hp_msa_disk_temp_default_levels", 'includes' : [ "hp_msa.include", "temperature.include" ], } diff --git a/checks/hp_msa_psu b/checks/hp_msa_psu index 6b2740c..b9c2e59 100644 --- a/checks/hp_msa_psu +++ b/checks/hp_msa_psu @@ -132,6 +132,11 @@ check_info['hp_msa_psu.sensor'] = { # | |_| | # +----------------------------------------------------------------------+ +factory_settings["hp_msa_psu_temp_default_levels"] = { + "levels" : (35.0, 40.0), + "levels_lower" : (25.0, 20.0), +} + def inventory_hp_msa_psu_temp(parsed): for key in parsed.keys(): yield key, {} @@ -148,6 +153,7 @@ check_info['hp_msa_psu.temp'] = { 'service_description' : 'Temperature PSU %s', 'has_perfdata' : True, 'group' : 'temperature', + 'default_levels_variable' : 'hp_msa_psu_temp_default_levels', 'includes' : [ "temperature.include", "hp_msa.include" ], }

8 years, 10 months

Check_MK Git: check_mk: #2532 FIX Fixed undefined variable exception in prediction in rare cases

by Sebastian Herbord

Module: check_mk Branch: master Commit: 651f9dbaf1db59298923c6e0b699919306798a03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=651f9dbaf1db59… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Aug 31 09:15:07 2015 +0200 #2532 FIX Fixed undefined variable exception in prediction in rare cases In some rare cases missing or broken prediction files could cause an exception --- .werks/2532 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/2532 b/.werks/2532 new file mode 100644 index 0000000..e0e8cb1 --- /dev/null +++ b/.werks/2532 @@ -0,0 +1,9 @@ +Title: Fixed undefined variable exception in prediction in rare cases +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1441005224 +Class: fix + +In some rare cases missing or broken prediction files could cause an exception diff --git a/ChangeLog b/ChangeLog index 6d33941..57c0405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,7 @@ * 2548 FIX: Fixed exceptions in different places in case of user errors... * 2549 FIX: Silently ignore not existing painters and sorters in views... * 2531 FIX: Fixed graph hover for services containing backslashes... + * 2532 FIX: Fixed undefined variable exception in prediction in rare cases... WATO: * 2365 Removed old deprecated notification global options for plain emails...

8 years, 10 months

Check_MK Git: check_mk: #2531 FIX Fixed graph hover for services containing backslashes

by Sebastian Herbord

Module: check_mk Branch: master Commit: 69e55658695308bea8e66983939320cfba7be90a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69e55658695308… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Aug 31 09:05:33 2015 +0200 #2531 FIX Fixed graph hover for services containing backslashes Hovering over the graph icon caused error messages on services containing backslashes (esp. on windows checks) --- .werks/2531 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/2531 b/.werks/2531 new file mode 100644 index 0000000..cb44029 --- /dev/null +++ b/.werks/2531 @@ -0,0 +1,10 @@ +Title: Fixed graph hover for services containing backslashes +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1441004586 +Class: fix + +Hovering over the graph icon caused error messages on services containing backslashes (esp. on +windows checks) diff --git a/ChangeLog b/ChangeLog index afd1125..6d33941 100644 --- a/ChangeLog +++ b/ChangeLog @@ -181,6 +181,7 @@ * 2544 FIX: Fixed links to availability timeline using the context buttons * 2548 FIX: Fixed exceptions in different places in case of user errors... * 2549 FIX: Silently ignore not existing painters and sorters in views... + * 2531 FIX: Fixed graph hover for services containing backslashes... WATO: * 2365 Removed old deprecated notification global options for plain emails...

8 years, 10 months

Check_MK Git: check_mk: cisco_vpn_tunnel: Adapted get_rate() to the new api style

by Bastian Kuhn

Module: check_mk Branch: master Commit: ff826bf6195bbfe733afd279be4e54158345f62a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff826bf6195bbf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 31 09:05:06 2015 +0200 cisco_vpn_tunnel: Adapted get_rate() to the new api style --- checks/cisco_vpn_tunnel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_vpn_tunnel b/checks/cisco_vpn_tunnel index f70a256..f78afe6 100644 --- a/checks/cisco_vpn_tunnel +++ b/checks/cisco_vpn_tunnel @@ -51,8 +51,8 @@ def check_cisco_vpn_tunnel(item, params, info): for tunnel, in_octets, out_octets in info: if tunnel == item: this_time = time.time() - in_octets_sec = get_rate("cisco_vpn_tunnel_in" + item, this_time, int(in_octets)) - out_octets_sec = get_rate("cisco_vpn_tunnel_out" + item, this_time, int(out_octets)) + in_octets_sec = get_rate("input", this_time, int(in_octets)) + out_octets_sec = get_rate("output", this_time, int(out_octets)) perfdata = [ ("if_in_octets", in_octets_sec ), ("if_out_octets", out_octets_sec),

8 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015