Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: New configuratin variable snmp_timeout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8fbece99b96b89bc46027e172043b4031a928f34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fbece99b96b89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 7 12:58:02 2012 +0200 New configuratin variable snmp_timeout --- ChangeLog | 4 +++ modules/check_mk.py | 16 ++++++++++++++ web/htdocs/wato.py | 4 +- web/plugins/wato/check_mk_configuration.py | 30 ++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b0bb9b..26d2adf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.0b4: + Core: + * New configuration variable snmp_timing, allowing to + configure timeout and retries for SNMP requests (also via WATO) + WATO: * ps and ps.perf configurable via WATO now (without inventory) * FIX: honor folder-permissions when creating, deleting diff --git a/modules/check_mk.py b/modules/check_mk.py index 31ed6f8..03d8e14 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -226,6 +226,7 @@ max_num_processes = 50 # SNMP communities and encoding snmp_default_community = 'public' snmp_communities = [] +snmp_timing = [] snmp_character_encodings = [] # Inventory and inventory checks @@ -611,6 +612,14 @@ def snmp_base_command(what, hostname): # Do not load *any* MIB files. This save lot's of CPU. options += " -m '' -M ''" + + # Configuration of timing and retries + settings = snmp_timing_of(hostname) + if "timeout" in settings: + options += " -t %d" % settings["timeout"] + if "retries" in settings: + options += " -r %d" % settings["retries"] + return command + ' ' + options @@ -626,6 +635,13 @@ def snmp_credentials_of(hostname): # nothing configured for this host -> use default return snmp_default_community +def snmp_timing_of(hostname): + timing = host_extra_conf(hostname, snmp_timing) + if len(timing) > 0: + return timing[0] + else: + return {} + def get_snmp_character_encoding(hostname): entries = host_extra_conf(hostname, snmp_character_encodings) if len(entries) > 0: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a6d167e..4e50688 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9969,8 +9969,8 @@ def mode_edit_rule(phase): div_id = "div_all_hosts" checked = host_list != ALL_HOSTS - html.checkbox("explicit_hosts", checked, onclick="valuespec_toggle_option(this, %r)" % div_id) - html.write(" " + _("Specify explicit host names")) + html.checkbox("explicit_hosts", checked, onclick="valuespec_toggle_option(this, %r)" % div_id, + label = _("Specify explicit host names")) html.write('<div id="%s" style="display: %s">' % ( div_id, not checked and "none" or "")) negate_hosts = len(host_list) > 0 and host_list[0].startswith("!") diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 826ed4d..5fa38eb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -939,6 +939,36 @@ register_rule(group, "If you want to use SNMP v2c on those devices, nevertheless, then use this rule set. " "One reason is enabling 64 bit counters.")) +register_rule(group, + "snmp_timing", + Dictionary( + title = _("Timing settings for SNMP access"), + help = _("This rule decides about the number of retries and timeout values " + "for the SNMP access to devices."), + elements = [ + ( "timeout", + Integer( + title = _("Timeout between retries"), + help = _("The default is 1 sec."), + default_value = 1, + minvalue = 1, + maxvalue = 60, + unit = _("sec"), + ), + ), + ( "retries", + Integer( + title = _("Number of retries"), + help = _("The default is 5."), + default_value = 5, + minvalue = 1, + maxvalue = 50, + ) + ), + ]), + match = "dict") + + register_rule(group, "usewalk_hosts",

12 years, 1 month

Check_MK Git: check_mk: Fixed declaration of BI aggregations since weekends changes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c25a8a6b4b4eb850259ae98b88cc57084872b228 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c25a8a6b4b4eb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 11:16:37 2012 +0200 Fixed declaration of BI aggregations since weekends changes --- web/htdocs/config.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 462c20f..89b9de4 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -78,6 +78,12 @@ class FOREACH_HOST: pass class FOREACH_SERVICE: pass class REMAINING: pass +# Has to be declared here once since the functions can be assigned in +# bi.py and also in multisite.mk. "Double" declarations are no problem +# here since this is a dict (List objects have problems with duplicate +# definitions). +aggregation_functions = {} + # .----------------------------------------------------------------------. # | _____ _ _ | @@ -533,7 +539,6 @@ def load_default_values(into): # into["aggregation_rules"] = {} into["aggregations"] = [] - into["aggregation_functions"] = {} # __ ___ _____ ___ # \ \ / / \|_ _/ _ \

12 years, 1 month

Check_MK Git: check_mk: FIX: Fixed syntax error in "Single-Host Problems" view definition

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6ba64804dc6fcc482d3f6aaa1917ad740171850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6ba64804dc6fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 11:09:08 2012 +0200 FIX: Fixed syntax error in "Single-Host Problems" view definition --- ChangeLog | 1 + web/plugins/views/builtin.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b5956b..a1e88bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * FIX: fixed filter of recent event views (4 hours didn't catch) * FIX: convert more buttons to new graphical style * FIX: Logwatch handles logs with only OK lines in it correctly in logfile list views + * FIX: Fixed syntax error in "Single-Host Problems" view definition Mobile GUI: * FIX: commands can be executed again diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 222a7a3..3360473 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2389,7 +2389,7 @@ multisite_builtin_views.update({ 'hostregex', 'opthostgroup', 'aggr_effective_state'], - 'sorters': [('aggr_group'), ('site_host', False)], + 'sorters': [('aggr_group', False), ('site_host', False)], 'title': 'Single-Host Problems', 'topic': _('Business Intelligence')},

12 years, 1 month

Check_MK Git: check_mk: FIX: Logwatch: fixed missing linebreak during reclassifing lines of logfiles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff79bba1f0e48857f9c08da80ef0bf4d472d849b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff79bba1f0e488… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 10:47:44 2012 +0200 FIX: Logwatch: fixed missing linebreak during reclassifing lines of logfiles --- ChangeLog | 3 +++ checks/logwatch | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b0bb9b..697321a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,9 @@ * FIX: commands can be executed again * FIX: fixed styling of buttons + Checks & Agents: + * FIX: Logwatch: fixed missing linebreak during reclassifing lines of logfiles + 1.2.0b3: Core: * FIX: fixed SNMP info declaration in checks: could be garbled diff --git a/checks/logwatch b/checks/logwatch index 43d3fca..007c235 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -322,7 +322,7 @@ def check_logwatch(item, params, info): # Only rewrite the lines if at least one line has been reclassified if reclassified: - file(logfile, 'w').write('\n'.join(reclassified_lines)) + file(logfile, 'w').write('\n'.join(reclassified_lines) + '\n') # # Render output

12 years, 1 month

Check_MK Git: check_mk: FIX: Logwatch handles logs with only OK lines in it correctly in logfile list views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af1f6fff3f2dc2de7465a0fb0254c6789d543fe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af1f6fff3f2dc2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 10:58:20 2012 +0200 FIX: Logwatch handles logs with only OK lines in it correctly in logfile list views --- ChangeLog | 1 + web/htdocs/logwatch.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 697321a..0b5956b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) * FIX: convert more buttons to new graphical style + * FIX: Logwatch handles logs with only OK lines in it correctly in logfile list views Mobile GUI: * FIX: commands can be executed again diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index b72b8fc..a3dce57 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -257,7 +257,7 @@ def get_worst_log(logs): for log in logs: for line in log['lines']: - if line['level'] > worst_level: + if line['level'] >= worst_level: worst_level = line['level'] worst_log = log

12 years, 1 month

Check_MK Git: check_mk: make config options directly active after resetting them

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5c2397b4a9b7044125ef1387cf95187f1ce525e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c2397b4a9b704… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 7 09:25:46 2012 +0200 make config options directly active after resetting them --- .bugs/607 | 8 +- ChangeLog | 2 + web/htdocs/config.py | 609 ++++++++++++++++++++++++++------------------------ web/htdocs/views.py | 2 +- 4 files changed, 325 insertions(+), 296 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c2397b4a9…

12 years, 1 month

Check_MK Git: check_mk: Used tmp-file for POST data if too large for command line

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 18d955d419ad3badd80dfee812d77bb9e2d55566 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d955d419ad3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 20:27:46 2012 +0200 Used tmp-file for POST data if too large for command line --- ChangeLog | 2 +- web/htdocs/wato.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 964da72..3b270a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ * FIX: better error message if not logged into site during action that needs remote access * FIX: send automation data via POST not GET. This fixes inventory - on hosts with up to 2000 services + on hosts with more than 500 services. Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2f9511f..a6d167e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6657,9 +6657,22 @@ def get_url(url, insecure, user=None, password=None, params = '', post_data = No # -s: silent # -S: show errors # -w '%{http_code}': add the http status code to the end of the output - command = 'curl -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % (insecure, cred, params, url) + command = 'curl -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % ( + insecure, cred, params, url) + tmp_file = None if post_data != None: - command += ' --data-binary "%s"' % post_data + # Put POST data on command line as long as it is not + # longer than 50 KB (remember: Linux has an upper limit + # of 132 KB for command line plus environment + if len(post_data) < 50000: + command += ' --data-binary "%s"' % post_data + else: + import tempfile + tmp_file = tempfile.NamedTemporaryFile(dir = defaults.tmp_dir) + tmp_file.write(post_data) + tmp_file.flush() + command += ' --data-binary "@%s"' % tmp_file.name + response = os.popen(command).read().strip() try: status_code = int(response[-3:])

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0672

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 326f1c94da055c40898cd5e9ae4651bc8c1a38bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=326f1c94da055c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 20:27:27 2012 +0200 Updated bug entries #0672 --- .bugs/672 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/672 b/.bugs/672 index c41ef77..e53c665 100644 --- a/.bugs/672 +++ b/.bugs/672 @@ -1,9 +1,9 @@ Title: Hosts with 4.000 services in replicated WATO fail Component: wato -State: open +Class: bug +State: done Date: 2012-04-06 11:23:12 Targetversion: 1.2.0 -Class: bug When a host has many services and you save a manual check configuration for a host on a slave site, then the command @@ -12,3 +12,6 @@ a useful error message. Solution: put the post data into a tmp file (yurks) - optimally only if it is too large. + +2012-05-06 20:27:23: changed state open -> done +Works now (tested) with 10.000 services on one host.

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0672

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f67c8f0b14c072634d4f9f79bdaa870df626b4e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f67c8f0b14c072… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 19:53:35 2012 +0200 Updated bug entries #0672 --- .bugs/672 | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.bugs/672 b/.bugs/672 index 723cd0a..c41ef77 100644 --- a/.bugs/672 +++ b/.bugs/672 @@ -1,4 +1,4 @@ -Title: Hosts with many services in replicated WATO -> Request-URI Too Large +Title: Hosts with 4.000 services in replicated WATO fail Component: wato State: open Date: 2012-04-06 11:23:12 @@ -6,7 +6,9 @@ Targetversion: 1.2.0 Class: bug When a host has many services and you save a manual check -configuration for a host on a slave site, then the internal -web services the remotely does inventory creates a too large -URL. Either convert this to POST or send the list of -services as a Python object as the body of the request. +configuration for a host on a slave site, then the command +line for curl is getting too large. This does not even output +a useful error message. + +Solution: put the post data into a tmp file (yurks) - optimally +only if it is too large.

12 years, 1 month

Check_MK Git: check_mk: FIX: fix remote inventory with hosts with > 2k services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4bb8ab0e91403436b2d113d2c1599708961b3f00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bb8ab0e914034… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 19:51:46 2012 +0200 FIX: fix remote inventory with hosts with >2k services --- ChangeLog | 2 ++ web/htdocs/config.py | 2 +- web/htdocs/wato.py | 24 ++++++++++++++---------- web/plugins/wato/auth.py | 2 ++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 974a60e..964da72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ * FIX: detect non-local site even if unix: is being used * FIX: better error message if not logged into site during action that needs remote access + * FIX: send automation data via POST not GET. This fixes inventory + on hosts with up to 2000 services Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 39767b7..82fd60e 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -441,7 +441,7 @@ def site(name): def site_is_local(name): s = sites.get(name, {}) sock = s.get("socket") - return not sock or sock == defaults.livestatus_unix_socket + return not sock or sock == "unix:" + defaults.livestatus_unix_socket def is_multisite(): if len(sites) > 1: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5bbec4e..2f9511f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2963,8 +2963,6 @@ def configure_gateway(state, site_id, folder, host, effective, gateway): gwcreat = False if gateway: - if len(gateway) != 3: - raise Exception("Gateway ist %r" % (gateway,)) gw_host, gw_ip, dns_name = gateway if not gw_host: if where == "nowhere": @@ -3853,7 +3851,6 @@ def check_mk_local_automation(command, args=[], indata=""): html.show_error("<h3>Cannot activate changes</h3>%s" % e) return - if config.debug: log_audit(None, "automation", "Automation: %s" % " ".join(cmd)) try: @@ -3878,6 +3875,7 @@ def check_mk_local_automation(command, args=[], indata=""): raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % (" ".join(cmd), exitcode, hilite_errors(outdata), outdata.lstrip().startswith('sudo:') and sudo_msg or '')) + # On successful "restart" command execute the activate changes hook if command == 'restart': call_hook_activate_changes() @@ -6649,7 +6647,7 @@ def do_site_login(site_id, name, password): def upload_file(url, file_path, insecure): return get_url(url, insecure, params = ' -F snapshot=@%s' % file_path) -def get_url(url, insecure, user=None, password=None, params = ''): +def get_url(url, insecure, user=None, password=None, params = '', post_data = None): cred = '' if user: cred = ' -u "%s:%s"' % (user, password) @@ -6659,7 +6657,10 @@ def get_url(url, insecure, user=None, password=None, params = ''): # -s: silent # -S: show errors # -w '%{http_code}': add the http status code to the end of the output - response = os.popen('curl -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % (insecure, cred, params, url)).read().strip() + command = 'curl -w "\n%%{http_code}" -s -S%s%s%s "%s" 2>&1' % (insecure, cred, params, url) + if post_data != None: + command += ' --data-binary "%s"' % post_data + response = os.popen(command).read().strip() try: status_code = int(response[-3:]) response_body = response[:-3] @@ -6705,8 +6706,10 @@ def do_remote_automation(site, command, vars): ("command", command), ("secret", secret), ("debug", config.debug and '1' or '') - ] + vars) - response = get_url(url, site.get('insecure', False)) + ]) + vars_encoded = htmllib.urlencode_vars(vars) + response = get_url(url, site.get('insecure', False), + post_data=vars_encoded) if not response: raise MKAutomationException("Empty output from remote site.") try: @@ -7124,6 +7127,9 @@ def page_automation(): if secret != get_login_secret(): raise MKAuthException(_("Invalid automation secret.")) + # Initialise g_root_folder, load all folder information + prepare_folder_info() + command = html.var("command") if command == "checkmk-automation": cmk_command = html.var("automation") @@ -7138,9 +7144,6 @@ def page_automation(): def automation_push_snapshot(): try: - # Initialise g_root_folder, load all folder information - prepare_folder_info() - site_id = html.var("siteid") if not site_id: raise MKGeneralException(_("Missing variable siteid")) @@ -11001,6 +11004,7 @@ def call_hook_pre_activate_changes(): # the hosts as values. def call_hook_activate_changes(): if hook_registered('activate-changes'): + hosts = collect_hosts(g_root_folder) call_hooks("activate-changes", collect_hosts(g_root_folder)) # This hook is executed when the save_users() function is called diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index 19e1a02..5a0e450 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -189,4 +189,6 @@ def create_auth_file(users): api.register_hook('users-saved', create_auth_file) api.register_hook('roles-saved', lambda x: create_auth_file(load_users())) +# TODO: optimize: This hook does not use the list of the collected +# hosts. And collicting the hosts is a lengthy operation. api.register_hook('activate-changes', lambda x: create_auth_file(load_users()))

12 years, 1 month

← Newer
1
...
35
36
37
38
39
40
41
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012