Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: FIX: Cleaned up graph rendering of Check_MK services

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a7e662bf5ed3a97b40d79de1dabf2ec563dd6e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a7e662bf5ed3a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 13:26:20 2013 +0200 FIX: Cleaned up graph rendering of Check_MK services --- ChangeLog | 1 + pnp-templates/check-mk.php | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ec9cda..8933262 100644 --- a/ChangeLog +++ b/ChangeLog @@ -237,6 +237,7 @@ Checks & Agents: * FIX: winperf_processor: fix case where CPU percent is exactly 100% * FIX: blade_powerfan: fix mixup of default levels 50/40 -> 40/50 + * FIX: Cleaned up graph rendering of Check_MK services Multisite: * FIX: LDAP: Disabling use of referrals in active directory configuration diff --git a/pnp-templates/check-mk.php b/pnp-templates/check-mk.php index b0c4fbf..55a7e78 100644 --- a/pnp-templates/check-mk.php +++ b/pnp-templates/check-mk.php @@ -30,36 +30,36 @@ $opt[1] = "--vertical-label 'time (s)' -l 0 --title '$hostname: Check_MK check $def[1] = "DEF:extime=$RRDFILE[1]:$DS[1]:MAX "; $def[1] .= "AREA:extime#d080af:\"execution time \" "; $def[1] .= "LINE1:extime#d020a0: "; -$def[1] .= "GPRINT:extime:LAST:\"current\: %.2lf s\" "; -$def[1] .= "GPRINT:extime:MAX:\"max(+/-)\: %.2lf s \" "; -$def[1] .= "GPRINT:extime:AVERAGE:\"avg(+/-)\: %.2lf s\" "; +$def[1] .= "GPRINT:extime:LAST:\"last\: %8.2lf s\" "; +$def[1] .= "GPRINT:extime:MAX:\"max\: %8.2lf s \" "; +$def[1] .= "GPRINT:extime:AVERAGE:\"avg\: %8.2lf s\\n\" "; if (isset($RRDFILE[2])) { $opt[2] = "--vertical-label 'time (s)' -l 0 --title '$hostname: Check_MK process times' "; $def[2] = "DEF:user_time=$RRDFILE[2]:$DS[1]:MAX "; $def[2] .= "LINE1:user_time#d020a0:\"user time\" "; -$def[2] .= "GPRINT:user_time:LAST:\" current\: %.2lf s\" "; -$def[2] .= "GPRINT:user_time:MAX:\"max(+/-)\: %.2lf s \" "; -$def[2] .= "GPRINT:user_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; +$def[2] .= "GPRINT:user_time:LAST:\" last\: %8.2lf s\" "; +$def[2] .= "GPRINT:user_time:MAX:\"max\: %8.2lf s \" "; +$def[2] .= "GPRINT:user_time:AVERAGE:\"avg\: %8.2lf s\\n\" "; $def[2] .= "DEF:system_time=$RRDFILE[3]:$DS[1]:MAX "; $def[2] .= "LINE1:system_time#d08400:\"system time\" "; -$def[2] .= "GPRINT:system_time:LAST:\" current\: %.2lf s\" "; -$def[2] .= "GPRINT:system_time:MAX:\"max(+/-)\: %.2lf s \" "; -$def[2] .= "GPRINT:system_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; +$def[2] .= "GPRINT:system_time:LAST:\" last\: %8.2lf s\" "; +$def[2] .= "GPRINT:system_time:MAX:\"max\: %8.2lf s \" "; +$def[2] .= "GPRINT:system_time:AVERAGE:\"avg\: %8.2lf s\\n\" "; $def[2] .= "DEF:children_user_time=$RRDFILE[4]:$DS[1]:MAX "; $def[2] .= "LINE1:children_user_time#308400:\"childr. user time \" "; -$def[2] .= "GPRINT:children_user_time:LAST:\" current\: %.2lf s\" "; -$def[2] .= "GPRINT:children_user_time:MAX:\"max(+/-)\: %.2lf s \" "; -$def[2] .= "GPRINT:children_user_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; +$def[2] .= "GPRINT:children_user_time:LAST:\" last\: %8.2lf s\" "; +$def[2] .= "GPRINT:children_user_time:MAX:\"max\: %8.2lf s \" "; +$def[2] .= "GPRINT:children_user_time:AVERAGE:\"avg\: %8.2lf s\\n\" "; $def[2] .= "DEF:children_system_time=$RRDFILE[5]:$DS[1]:MAX "; $def[2] .= "LINE1:children_system_time#303400:\"childr. system time\" "; -$def[2] .= "GPRINT:children_system_time:LAST:\"current\: %.2lf s\" "; -$def[2] .= "GPRINT:children_system_time:MAX:\"max(+/-)\: %.2lf s \" "; -$def[2] .= "GPRINT:children_system_time:AVERAGE:\"avg(+/-)\: %.2lf s\" "; +$def[2] .= "GPRINT:children_system_time:LAST:\"last\: %8.2lf s\" "; +$def[2] .= "GPRINT:children_system_time:MAX:\"max\: %8.2lf s \" "; +$def[2] .= "GPRINT:children_system_time:AVERAGE:\"avg\: %8.2lf s\\n\" "; } ?>

11 years, 3 months

Check_MK Git: check_mk: added check manpage mysql.connections

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 69a77b8e4890275a8afa3aa4550b087f9082f722 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69a77b8e489027… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 5 13:22:29 2013 +0200 added check manpage mysql.connections --- checkman/mysql.connections | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/checkman/mysql.connections b/checkman/mysql.connections new file mode 100644 index 0000000..347310f --- /dev/null +++ b/checkman/mysql.connections @@ -0,0 +1,28 @@ +title: MySQL Database: Maximum connection usage since startup +agents: linux +catalog: app/mysql +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check allows tracking of connection usage for a MySQL database. + Therefor it queries + {the maximum number of connections that have been in use simultaneously since the server started} + and + {the maximum number of possible parallel connections}. + From these both it calculates the + {maximum usage level of these connections in percent} + and matches the given warning and critical thresholds against it. + +inventory: + The check generates one item for the connection usage. + +[parameters] +warning (float): The maximum connection usage (in percent) that triggers + a warning state. +critical (float): The maximum connection usage (in percent) that triggers + a critical state. + +[configuration] +perc_used (float, float): The default levels for {warning} and {critical} + preset to {(None, None)}

11 years, 3 months

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

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 683c8dec522329c859206b94b21780fdcea8df58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=683c8dec522329… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 5 13:22:35 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Fix Check_MK execution time in keepalive mode

by Mathias Kettner

Module: check_mk Branch: master Commit: fc7a4f4bfd96d47822503586a31d542d4a98c62e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc7a4f4bfd96d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 13:11:49 2013 +0200 Fix Check_MK execution time in keepalive mode --- modules/check_mk_base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index dd67c78..e470ad4 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -933,6 +933,8 @@ def do_check(hostname, ipaddress, only_check_types = None): run_time = time.time() - start_time if check_mk_perfdata_with_times: times = os.times() + if opt_keepalive: + times = map(lambda a: a[0]-a[1], zip(times, g_initial_times)) output += "execution time %.1f sec|execution_time=%.3f user_time=%.3f "\ "system_time=%.3f children_user_time=%.3f children_system_time=%.3f\n" %\ (run_time, run_time, times[0], times[1], times[2], times[3]) @@ -990,6 +992,8 @@ class MKCheckTimeout(Exception): pass def do_check_keepalive(): + global g_initial_times + def check_timeout(signum, frame): raise MKCheckTimeout() @@ -1005,6 +1009,7 @@ def do_check_keepalive(): while True: cleanup_globals() hostname = sys.stdin.readline() + g_initial_times = os.times() if not hostname: break hostname = hostname.strip()

11 years, 3 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e636e92d61b55c5050e26691f7887a793f17408 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e636e92d61b55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 13:11:50 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: added gb

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 1410988d73ff1caee38e751856a05b1d90ea7eca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1410988d73ff1c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 5 12:35:44 2013 +0200 added gb --- .bugs/957 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/957 b/.bugs/957 new file mode 100644 index 0000000..52ed9a7 --- /dev/null +++ b/.bugs/957 @@ -0,0 +1,12 @@ +Title: field author in check manpages is mandatory +Component: checks +State: open +Date: 2013-07-05 12:33:13 +Targetversion: 1.2.3 +Class: cleanup + +author field should no longer be used +but cmk -M declares it as mandatory + +cmk -M mysql.connections +Invalid check manpage /omd/sites/bs1st/share/check_mk/checkman/mysql.connections: missing 'author'

11 years, 3 months

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

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 49e768b953d39abaea3608eb6bcd5d2ee0464316 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49e768b953d39a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 5 12:35:58 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 153a02326d7b491fdf495b8223e419373e704846 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=153a02326d7b49… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 5 12:12:22 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: fixed: html.debug bool flag renamed to html. enable_debug

by Andreas Boesl

Module: check_mk Branch: master Commit: 410bfe983bc083dee3eab8664d9316f8cf13f0db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=410bfe983bc083… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 5 12:12:06 2013 +0200 fixed: html.debug bool flag renamed to html.enable_debug (collided with html.debug function) --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/htmllib.py | 6 +++--- web/htdocs/index.py | 2 +- web/htdocs/login.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 9c52e3d..f9c4134 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -77,7 +77,7 @@ class html_mod_python(htmllib.html): def top_heading(self, title): if type(self.user) == str: login_text = "<b>%s</b> (%s" % (config.user_id, "+".join(config.user_role_ids)) - if self.debug: + if self.enable_debug: if config.get_language(): login_text += "/%s" % config.get_language() login_text += ')' diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 73fd679..33dfd4b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -66,7 +66,7 @@ class html: self.keybindings = [] self.keybindings_enabled = True self.io_error = False - self.debug = False + self.enable_debug = False self.help_visible = False RETURN = 13 @@ -728,7 +728,7 @@ class html: self.write("%s</td></tr></table>" % _("<a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a>")) self.write("<hr class=header>\n") - if self.debug: + if self.enable_debug: self.write("<div class=urldebug>%s</div>" % self.makeuri([])) def body_start(self, title='', **args): @@ -999,7 +999,7 @@ class html: '<param name="autostart" value="true">\n' '<param name="playcount" value="1">\n' '</object>\n' % (url, url, url)) - if self.debug: + if self.enable_debug: self.write("(playing sound %s)" % url) def apache_user(self): diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 710f620..f3c583a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -185,7 +185,7 @@ def handler(req, profiling = True): # store results in the request object for later usage. html = html_mod_python(req) - html.debug = config.debug + html.enable_debug = config.debug html.id = {} # create unique ID for this request __builtin__.html = html diff --git a/web/htdocs/login.py b/web/htdocs/login.py index aa06ade..051850f 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -152,7 +152,7 @@ def check_auth(): try: return check_auth_cookie(cookie_name) except Exception, e: - #if html.debug: + #if html.enable_debug: # html.write('Exception occured while checking cookie %s' % cookie_name) # raise #else:

11 years, 3 months

Check_MK Git: check_mk: FIX: get_average(): Gracefully handle time anomlies of target systems

by Mathias Kettner

Module: check_mk Branch: master Commit: 349c1498e4ac472606166234f3f7e4fdba8399ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=349c1498e4ac47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 11:44:23 2013 +0200 FIX: get_average(): Gracefully handle time anomlies of target systems --- ChangeLog | 3 +++ modules/check_mk_base.py | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index b41fc78..874340b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -233,6 +233,9 @@ 1.2.2p3: + Core: + * FIX: get_average(): Gracefully handle time anomlies of target systems + Checks & Agents: * FIX: winperf_processor: fix case where CPU percent is exactly 100% * FIX: blade_powerfan: fix mixup of default levels 50/40 -> 40/50 diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 19e07df..dd67c78 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -825,6 +825,11 @@ def get_average(itemname, this_time, this_val, backlog_minutes, initialize_zero last_time, last_val = g_counters.get(itemname) timedif = this_time - last_time + # Gracefully handle time-anomaly of target systems. We loose + # one value, but what then heck.. + if timedif < 0: + timedif = 0 + # Compute the weight: We do it like this: First we assume that # we get one sample per minute. And that backlog_minutes is the number # of minutes we should average over. Then we want that the weight

11 years, 3 months

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013