Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64260 discussions

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, 4 months

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, 4 months

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, 4 months

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, 4 months

Check_MK Git: check_mk: FIX: better error message if not logged into site during remote automation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bcd22c8272abc911dbc3e2023518c421ea649967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcd22c8272abc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:52:26 2012 +0200 FIX: better error message if not logged into site during remote automation --- ChangeLog | 5 ++++- web/htdocs/wato.py | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d329f9..974a60e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,11 @@ 1.2.0b4: WATO: * ps and ps.perf configurable via WATO now (without inventory) - * FIX: honor folder-permissions when creating, deleting and modifiying rules + * FIX: honor folder-permissions when creating, deleting + and modifiying rules * 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 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 01923e8..5bbec4e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6675,6 +6675,10 @@ def get_url(url, insecure, user=None, password=None, params = ''): return response_body def check_mk_remote_automation(siteid, command, args, indata): + site = config.site(siteid) + if "secret" not in site: + raise MKGeneralException(_("Cannot access site %s - you are not logged in.") + % site.get("alias", siteid)) # If the site is not up-to-date, synchronize it first. repstatus = load_replication_status() if repstatus.get(siteid, {}).get("need_sync"):

12 years, 4 months

Check_MK Git: check_mk: FIX: convert more buttons to new graphical style

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89552cfc01d9a8b6c548c81306d0b371805e9477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89552cfc01d9a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:47:57 2012 +0200 FIX: convert more buttons to new graphical style --- ChangeLog | 1 + web/htdocs/htmllib.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 917f731..1d329f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) + * FIX: convert more buttons to new graphical style Mobile GUI: * FIX: commands can be executed again diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 30add17..1482521 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -176,6 +176,7 @@ class html: self.buffering = True self.transformations = [] self.final_javascript_code = "" + self.auto_id = 0 def set_buffering(self, b): self.buffering = b @@ -186,6 +187,10 @@ class html: def pop_transformation(self): del self.transformations[-1] + def some_id(self): + self.auto_id += 1 + return "id_%d" % self.auto_id + def plugin_stylesheets(self): global plugin_stylesheets try: @@ -343,8 +348,9 @@ class html: def buttonlink(self, href, text, add_transid=False, obj_id='', style='', title='', disabled=''): if add_transid: href += "&_transid=%s" % self.fresh_transid() - if obj_id: - obj_id = ' id=%s' % obj_id + if not obj_id: + obj_id = self.some_id() + obj_id = ' id=%s' % obj_id if style: style = ' style="%s"' % style if title: @@ -352,9 +358,12 @@ class html: if disabled: title = ' disabled="%s"' % disabled + if not self.mobile: + self.write('<label for="%s" class=image_button>' % obj_id) self.write('<input%s%s%s%s value="%s" class=buttonlink type=button onclick="location.href=\'%s\'">' % \ (obj_id, style, title, disabled, text, href)) - # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) + if not self.mobile: + self.write('</label>') def icon(self, help, icon): self.write('<img align=absmiddle class=icon title="%s" src="images/icon_%s.png">' % (

12 years, 4 months

Check_MK Git: check_mk: FIX: detect non-local site even if unix: is being used

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8dd6f24507a6a815f9a2bbf6bc3958e3c7a86ab1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dd6f24507a6a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:47:33 2012 +0200 FIX: detect non-local site even if unix: is being used --- ChangeLog | 1 + web/htdocs/config.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fc7250..917f731 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ WATO: * ps and ps.perf configurable via WATO now (without inventory) * FIX: honor folder-permissions when creating, deleting and modifiying rules + * FIX: detect non-local site even if unix: is being used 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 db8955b..39767b7 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.startswith("unix:") + return not sock or sock == defaults.livestatus_unix_socket def is_multisite(): if len(sites) > 1:

12 years, 4 months

Check_MK Git: check_mk: Use label for checkbox in WATO site configuration

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a34d5b65175a3de94b6cb8db73d4a4dbbba17a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a34d5b65175a3d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 18:28:55 2012 +0200 Use label for checkbox in WATO site configuration --- web/htdocs/wato.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 49cb264..01923e8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6493,8 +6493,7 @@ def mode_edit_site(phase): "the connection to the remote sites. This brings a great speed up in high-latency " "situations but locks a number of threads in the Livestatus module of the target site. ")) html.write("</td><td class=content>") - html.checkbox("persist", site.get("persist", False)) - html.write(_("Use persistent connections")) + html.checkbox("persist", site.get("persist", False), label=_("Use persistent connections")) html.write("</td></tr>") # URL-Prefix

12 years, 4 months

Check_MK Git: check_mk: Minor layout fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b831e7a1cc1096198c2969bf5be61dc73ae493a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b831e7a1cc109… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 14:10:27 2012 +0200 Minor layout fixes --- web/htdocs/check_mk.css | 7 ++++--- web/htdocs/htmllib.py | 5 +++-- web/htdocs/login.css | 1 + web/htdocs/login.py | 4 ++-- web/htdocs/pages.css | 3 --- web/htdocs/wato.css | 3 ++- web/plugins/wato/check_mk_configuration.py | 1 + 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a0c5c43..047873b 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -67,14 +67,15 @@ input, select, textarea { border: 1px #73767A solid; outline-style: none; outline-width: medium; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; background-color: #fff; font-family: arial, helvetica, sans-serif; vertical-align: middle; } +input[type=text] { + box-shadow: 0.5px 0.5px 0.8px 0 #888 inset; +} + select { padding: 1px 3px; } diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7604c72..30add17 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -451,9 +451,10 @@ class html: default_value = "" addprops = "" add_style = "" - if "size" in args: + if "size" in args and args["size"]: addprops += " size=%d" % (args["size"] + 1) - add_style = "width: %dex; " % args["size"] + if "width:" not in args.get("style", ""): + add_style = "width: %d.5ex; " % args["size"] if "type" in args: mytype = args["type"] diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 545c9e8..796700d 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -114,6 +114,7 @@ label { padding: 3px 5px 3px 5px; background-image: url("images/login_input_normal.png"); background-repeat: no-repeat; + box-shadow: none; } .inputerror #input_user, .inputerror #input_pass { diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 0d7b2d1..0035894 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -243,9 +243,9 @@ def normal_login_page(called_directly = True): html.hidden_field('_login', '1') html.hidden_field('_origtarget', htmllib.attrencode(origtarget)) html.write("<label id=label_user class=legend for=_username>%s:</label><br />" % _('Username')) - html.text_input("_username", size = 50, id="input_user") + html.text_input("_username", id="input_user") html.write("<label id=label_pass class=legend for=_password>%s:</label><br />" % _('Password')) - html.password_input("_password", size = 50, id="input_pass") + html.password_input("_password", id="input_pass", size=None) if html.has_user_errors(): html.write('<div id=login_error>') diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 3b0816d..d861b05 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -474,9 +474,6 @@ input.tab#results, input.tabactive#results { background-color: #fe6; } /* input elements in forms */ -table.form input.text { -} - table.form input.number { text-align: right; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 0eae8ea..f738e39 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -45,9 +45,10 @@ Boston, MA 02110-1301 USA. /* Tables in WATO are not size to 100% per default */ .wato table.data { - box-shadow: 0 0 3px #334488; + /* box-shadow: 0 0 3px #334488; */ width: auto; } + .wato table.data th { -moz-border-radius: 0px; background-color: #508aa1; diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5356642..826ed4d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -149,6 +149,7 @@ register_configvar(group, help = _("When you point your browser to the Multisite GUI, usually the dashboard " "is shown in the main (right) frame. You can replace this with any other " "URL you like here."), + size = 80, default_value = "dashboard.py"), domain = "multisite")

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0697

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f611738373d80b946c1f1408f95414eb5254a74b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f611738373d80b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 6 12:59:24 2012 +0200 Updated bug entries #0697 --- .bugs/697 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/697 b/.bugs/697 index 141900d..a75d12a 100644 --- a/.bugs/697 +++ b/.bugs/697 @@ -1,9 +1,12 @@ Title: WATO host/folders - <form> must not be nested Component: wato -State: open +Class: bug +State: done Date: 2012-04-25 12:47:08 Targetversion: 1.2.0 -Class: bug It is not allowed to have nested forms. The search host form must be moved outside the host table form. + +2012-05-06 12:59:22: changed state open -> done +Fixed a couple of days ago.

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits