Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64475 discussions

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

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

by Mathias Kettner

Module: check_mk Branch: master Commit: cab2ee56fd32c93a25f720155cfdec673b8b8bf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cab2ee56fd32c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 11:44:37 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 mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a00948e1943637a0c5db3495673eff10bedccc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a00948e194363… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 11:27:04 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Custom user attributes can now be managed using WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 64d5f8d798e5a7c7016fd379778759708cbeaa28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d5f8d798e5a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 11:26:45 2013 +0200 Custom user attributes can now be managed using WATO --- ChangeLog | 5 +- web/htdocs/images/icon_custom_attr.png | Bin 0 -> 3395 bytes web/htdocs/wato.py | 245 +++++++++++++++++++++++++++++++- web/plugins/config/wato.py | 1 + 4 files changed, 245 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=64d5f8d798…

11 years, 3 months

Check_MK Git: check_mk: Change notify --keepalive protocol

by Mathias Kettner

Module: check_mk Branch: master Commit: 6fc59ed1c26e77dff6ca07954b879a152a940c25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fc59ed1c26e77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 10:08:40 2013 +0200 Change notify --keepalive protocol --- modules/notify.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 848c1c4..9102a46 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -349,8 +349,13 @@ def notify_keepalive(): g_notify_readahead_buffer = "" config_timestamp = notify_config_timestamp() + # Send signal that we are ready to receive the next notification + sys.stdout.write("*") + sys.stdout.flush() + while True: try: + # If the configuration has changed, we do a restart. But we do # this check just before the next notification arrives. We must # *not* read data from stdin, just peek! On the other hand we @@ -375,7 +380,15 @@ def notify_keepalive(): if g_notify_readahead_buffer.startswith('\n\n'): sys.exit(0) while '\n\n' in g_notify_readahead_buffer: - notify_notify() + try: + notify_notify() + except Exception, e: + if opt_debug: + raise + notify_log("ERROR %s\n%s" % (e, format_exception())) + sys.stdout.write("*") + sys.stdout.flush() + except Exception, e: if opt_debug: raise

11 years, 3 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e72b53399da7463aae29adc79dc866d5bb98364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e72b53399da74… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 09:38:58 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: fixed error in tablesearch

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ef6050dbb1bbae2444a013db582283537a1e79c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef6050dbb1bba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 5 08:45:39 2013 +0200 fixed error in tablesearch --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 9c27e23..5682918 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -140,7 +140,7 @@ def end(): del table_opts['search'] # persist # Search is always lower case -> case insensitive - search_term = html.var('_%s_search' % table_id, table_opts.get('search')).lower() + search_term = html.var('_%s_search' % table_id, table_opts.get('search', '')).lower() if search_term: html.set_var('_%s_search' % table_id, search_term) table_opts['search'] = search_term # persist

11 years, 3 months

Check_MK Git: check_mk: FIX: avoid exception when called first time and first page ist host tags

by Mathias Kettner

Module: check_mk Branch: master Commit: 437e6c72d6e12e9efc2d4a3093c4a12be34f1531 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=437e6c72d6e12e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 5 09:36:50 2013 +0200 FIX: avoid exception when called first time and first page ist host tags --- ChangeLog | 1 + web/htdocs/wato.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 48a2781..b41fc78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -244,6 +244,7 @@ WATO: * FIX: fix layout of Auxiliary tags table + * FIX: avoid exception when called first time and first page ist host tags 1.2.2p2: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d67f695..0cd5838 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11733,6 +11733,10 @@ def create_sample_config(): save_rulesets(g_root_folder, rulesets) + # Make sure the host tag attributes are immediately declared! + config.wato_host_tags = wato_host_tags + config.wato_aux_tags = wato_aux_tags + #. # .-Pattern Editor-------------------------------------------------------. # | ____ _ _ _____ _ _ _ |

11 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits