Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: liveproxyd: removed some debug messages

by Mathias Kettner

Module: check_mk Branch: master Commit: da8fd7fd0d922c0e1fdbe8d9467a11eaadb588ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da8fd7fd0d922c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 4 16:55:57 2013 +0200 liveproxyd: removed some debug messages --- doc/treasures/liveproxy/liveproxyd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index c64224d..2bb98a3 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -247,8 +247,8 @@ def get_new_requests(readable): client["state"] = "wait_for_channel" client["since"] = time.time() client["request"] = request - log("Get new request from %s/%d (%d bytes)" % - (sitename, client["socket"].fileno(), len(request))) + # log("Get new request from %s/%d (%d bytes)" % + # (sitename, client["socket"].fileno(), len(request))) else: client["state"] = "closed" except Exception, e: @@ -281,8 +281,8 @@ def distribute_requests(): def forward_request(sitename, client, channel): cls = client["socket"] chs = channel["socket"] - log("Forwarding request [%s] from client %s/%d to channel %s/%d" % ( - client["request"].replace("\n","\\n"), sitename, cls.fileno(), sitename, chs.fileno())) + # log("Forwarding request [%s] from client %s/%d to channel %s/%d" % ( + # client["request"].replace("\n","\\n"), sitename, cls.fileno(), sitename, chs.fileno())) try: chs.send(client["request"]) if not client["request"].startswith("COMMAND"): @@ -333,14 +333,14 @@ def receive_request(sitename, client): # Note: Multisite can send several requests at once. For example # a command and a wait query (reschedule button) request = client.get("nextrequest", "") - if request: - log("HIRN: client %s/%d noch ein Rest vom letzten mal: [%s]" % ( - sitename, client["socket"].fileno(), request.replace("\n", "\\n"))) + # if request: + # log("HIRN: client %s/%d noch ein Rest vom letzten mal: [%s]" % ( + # sitename, client["socket"].fileno(), request.replace("\n", "\\n"))) client["nextrequest"] = "" while "\n\n" not in request: try: chunk = client["socket"].recv(65536) - log("HIRN: CHUNK von client: [%s]" % chunk.replace("\n", "\\n")) + # log("HIRN: CHUNK von client: [%s]" % chunk.replace("\n", "\\n")) request += chunk except socket.error, e: if e.errno == 104: # Connection reset by peer @@ -351,12 +351,12 @@ def receive_request(sitename, client): if not chunk: log("Client %s/%d closed connection." % (sitename, client["socket"].fileno())) return None - log("HIRN: VOR DEM SPLITTEN: [%s]" % request) + # log("HIRN: VOR DEM SPLITTEN: [%s]" % request) end = request.index("\n\n") client["nextrequest"] = request[end+2:] request = request[:end+2] - log("HIRN: Diesesmal: [%s], naechstes Mal: [%s]" % ( - request.replace("\n", "\\n"), client["nextrequest"].replace("\n", "\\n"))) + #log("HIRN: Diesesmal: [%s], naechstes Mal: [%s]" % ( + # request.replace("\n", "\\n"), client["nextrequest"].replace("\n", "\\n"))) return request

11 years

Check_MK Git: check_mk: Multisite: enable liveproxyd

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d44d13e76c0f9395768104bc3614a70362005fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d44d13e76c0f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 4 17:43:46 2013 +0200 Multisite: enable liveproxyd --- doc/treasures/liveproxy/liveproxyd | 7 +- web/htdocs/index.py | 5 ++ web/htdocs/wato.py | 135 +++++++++++++++++++++++++++++------- web/plugins/config/builtin.py | 3 + 4 files changed, 123 insertions(+), 27 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 2bb98a3..b77d0b7 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -86,7 +86,7 @@ def initiate_connections(): sitestate = g_sites[sitename] channels = sitestate["channels"] if len(channels) < siteconf["channels"]: - if time.time() - sitestate["last_failed_connect"] >= siteconf["retry"]: + if time.time() - sitestate["last_failed_connect"] >= siteconf["connect_retry"]: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.setblocking(0) try: @@ -693,6 +693,11 @@ def read_configuration(): # Create state object for all sites for sitename, siteconf in sites.items(): + siteconf.setdefault("channels", 5) + siteconf.setdefault("heartbeat", (5, 2.0)) + siteconf.setdefault("channel_timeout", 3.0) + siteconf.setdefault("query_timeout", 120.0) + siteconf.setdefault("connect_retry", 4.0) g_sites[sitename] = { "state": "starting", "channels" : [], diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 763f3c3..f70d908 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -112,6 +112,11 @@ def connect_to_livestatus(html): for sitename, site in config.allsites().items(): siteconf = config.user_siteconf.get(sitename, {}) + # Convert livestatus-proxy links into UNIX socket + s = site["socket"] + if type(s) == tuple and s[0] == "proxy": + site["socket"] = "unix:" + defaults.livestatus_unix_socket + "proxy/" + sitename + if siteconf.get("disabled", False): html.site_status[sitename] = { "state" : "disabled", "site" : site } disabled_sites[sitename] = site diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 64f3961..6aed65c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3780,14 +3780,15 @@ def log_pending(status, linkinfo, what, message): def cmc_rush_ahead(): if defaults.omd_root: socket_path = defaults.omd_root + "/tmp/run/cmcrush" - try: - changeid = str(random.randint(1, 100000000000000000)) - file(log_dir + "changeid", "w").write(changeid + "\n") - socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) \ - .sendto(changeid, socket_path) - except: - if config.debug: - raise + if os.path.exists(socket_path): + try: + changeid = str(random.randint(1, 100000000000000000)) + file(log_dir + "changeid", "w").write(changeid + "\n") + socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) \ + .sendto(changeid, socket_path) + except: + if config.debug: + raise def log_commit_pending(): @@ -6531,7 +6532,11 @@ def mode_sites(phase): socket = site.get("socket", _("local site")) if socket == "disabled:": socket = _("don't query status") - table.cell(_("Socket"), socket) + table.cell(_("Socket")) + if type(socket) == tuple and socket[0] == "proxy": + html.write(_("Use livestatus Proxy-Daemon")) + else: + html.write(socket) # Status host if "status_host" in site: @@ -6602,23 +6607,77 @@ def mode_edit_site(phase): else: site = sites.get(siteid, {}) + vs_tcp_port = Tuple( + title = _("TCP Port to connect to"), + orientation = "float", + elements = [ + TextAscii(label = _("Host:"), allow_empty = False, size=15), + Integer(label = _("Port:"), minvalue=1, maxvalue=65535, default_value=6557), + ]) + conn_choices = [ + ( None, _("Connect to the local site") ), + ( "tcp", _("Connect via TCP"), vs_tcp_port), + ( "unix", _("Connect via UNIX socket"), TextAscii( + label = _("Path:"), + size = 40, + allow_empty = False)), + ( "disabled", _("Do not connect")), + ] + if config.liveproxyd_enabled: + conn_choices[2:2] = [ + ( "proxy", _("Use Livestatus Proxy-Daemon"), + Dictionary( + optional_keys = False, + columns = 1, + elements = [ + ( "socket", vs_tcp_port ), + ( "channels", + Integer( + title = _("Number of channels to keep open"), + minvalue = 2, + maxvalue = 50, + default_value = 5)), + ( "heartbeat", + Tuple( + title = _("Regular heartbeat"), + orientation = "float", + elements = [ + Integer(label = _("Rate:"), unit=_("/sec"), minvalue=1, default_value = 5), + Float(label = _("Timeout:"), unit=_("sec"), minvalue=0.1, default_value = 2.0), + ])), + ( "channel_timeout", + Float( + title = _("Timeout waiting for a free channel"), + minvalue = 0.1, + default_value = 3, + unit = _("sec"), + ) + ), + ( "query_timeout", + Float( + title = _("Total query timeout"), + minvalue = 0.1, + unit = _("sec"), + default_value = 120, + ) + ), + ( "connect_retry", + Float( + title = _("Wait time after failed connect"), + minvalue = 0.1, + unit = _("sec"), + default_value = 4.0, + )), + ] + ) + ) + ] + # ValueSpecs for the more complex input fields vs_conn_method = CascadingDropdown( html_separator = " ", - choices = [ - ( None, _("Connect to the local site") ), - ( "tcp", _("Connect via TCP"), Tuple( - orientation = "float", - elements = [ - TextAscii(label = _("Host:"), allow_empty = False, size=15), - Integer(label = _("Port:"), minvalue=1, maxvalue=65535, default_value=6557), - ])), - ( "unix", _("Connect via UNIX socket"), TextAscii( - label = _("Path:"), - size = 30, - allow_empty = False)), - ( "disabled", _("Do not connect")), - ]) + choices = conn_choices, + ) if phase == "action": @@ -6657,7 +6716,7 @@ def mode_edit_site(phase): # Connection method = vs_conn_method.from_html_vars("method") vs_conn_method.validate_value(method, "method") - if type(method) == tuple: + if type(method) == tuple and method[0] in [ "unix", "tcp"]: if method[0] == "unix": new_site["socket"] = "unix:" + method[1] else: @@ -6776,9 +6835,9 @@ def mode_edit_site(phase): forms.header(_("Livestatus settings")) forms.section(_("Connection")) method = site.get("socket", None) - if method and method.startswith("unix:"): + if type(method) == str and method.startswith("unix:"): method = ('unix', method[5:]) - elif method and method.startswith("tcp:"): + elif type(method) == str and method.startswith("tcp:"): method = ('tcp', tuple(method.split(":")[1:])) vs_conn_method.render_input("method", method) @@ -6904,6 +6963,7 @@ def load_sites(): def save_sites(sites): make_nagios_directory(multisite_dir) + # Important: even write out sites if it's empty. The global 'sites' # variable will otherwise survive in the Python interpreter of the # Apache processes. @@ -6916,9 +6976,32 @@ def save_sites(sites): rewrite_config_files_below(g_root_folder) # fix site attributes need_sidebar_reload() + if config.liveproxyd_enabled: + save_liveproxyd_config(sites) + # Call the sites saved hook call_hook_sites_saved(sites) +def save_liveproxyd_config(sites): + path = defaults.default_config_dir + "/liveproxyd.mk" + out = create_user_file(path, "w") + out.write("# Written by WATO\n# encoding: utf-8\n\n") + + conf = {} + for siteid, siteconf in sites.items(): + s = siteconf.get("socket") + if type(s) == tuple and s[0] == "proxy": + conf[siteid] = s[1] + + out.write("sites = \\\n%s\n" % pprint.pformat(conf)) + try: + pidfile = defaults.livestatus_unix_socket + "proxyd.pid" + pid = int(file(pidfile).read().strip()) + os.kill(pid, 10) + except Exception, e: + html.show_error(_("Warning: cannot reload Livestatus Proxy-Daemon: %s" % e)) + + # Makes sure, that in distributed mode we monitor only # the hosts that are directly assigned to our (the local) # site. diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 8011c12..0cfdaa6 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -123,6 +123,9 @@ debug_livestatus_queries = False # not reachable. show_livestatus_errors = True +# Whether the livestatu proxy daemon is available +liveproxyd_enabled = False + # Set this to a list in order to globally control which views are # being displayed in the sidebar snapin "Views" visible_views = None

11 years

Check_MK Git: check_mk: liveproxyd: heartbeat handling works

by Mathias Kettner

Module: check_mk Branch: master Commit: 535f95031580bbc80dbe5316c756da2f52601ec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=535f95031580bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 4 15:04:01 2013 +0200 liveproxyd: heartbeat handling works --- doc/treasures/liveproxy/liveproxyd | 315 ++++++++++++++++++++++++++++-------- 1 file changed, 249 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=535f950315…

11 years

Check_MK Git: check_mk: liveproxyd: gracefully handle invalid requests

by Mathias Kettner

Module: check_mk Branch: master Commit: 99723cb2ec6ec5bd8b803e6ace6516d0cee656a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99723cb2ec6ec5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 4 16:52:42 2013 +0200 liveproxyd: gracefully handle invalid requests --- doc/treasures/liveproxy/liveproxyd | 131 +++++++++++++++++++++++++----------- 1 file changed, 91 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=99723cb2ec…

11 years

Check_MK Git: check_mk: apache_status: fix exception if parameter is None

by Mathias Kettner

Module: check_mk Branch: master Commit: f61b36348bf7447ff7780201454009afc6be89c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f61b36348bf744… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 16:55:19 2013 +0200 apache_status: fix exception if parameter is None --- ChangeLog | 1 + checks/apache_status | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index c6f7623..d2d9db6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * windows_agent: Now available as 64 bit version * agent_vsphere: fix problem where sensors were missing when you queried multiple host systems via vCenter + * apache_status: fix exception if parameter is None Notifications: * Flexible Notification can now filter service levels diff --git a/checks/apache_status b/checks/apache_status index 991aebf..79f53b6 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -100,6 +100,9 @@ def inventory_apache_status(info): return inv def check_apache_status(item, params, info): + if params == None: + params = {} + all_data = apache_status_parse(info) if item not in all_data: return (3, 'Unable to find instance in agent output')

11 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 7aaaf4a8925e0de62670e0da0f723d24ab696e4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aaaf4a8925e0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 16:55:43 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years

Check_MK Git: check_mk: Updated bug entries #0891

by Mathias Kettner

Module: check_mk Branch: master Commit: aad342dc99986b510906af3793ebdabfb269968f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aad342dc99986b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 14:31:52 2013 +0200 Updated bug entries #0891 --- .bugs/891 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/891 b/.bugs/891 new file mode 100644 index 0000000..942daaa --- /dev/null +++ b/.bugs/891 @@ -0,0 +1,10 @@ +Title: Optical representation of regex field +Component: wato +State: open +Date: 2013-06-03 14:23:08 +Targetversion: 1.4.0 +Class: nastiness + +I think we should hilite regex inputs fields optically and +maybe also validate them. This can prevent regex errors +deeply in the Check_MK code generation.

11 years

Check_MK Git: check_mk: Updated bug entries #0890

by Mathias Kettner

Module: check_mk Branch: master Commit: 07ea424e418c33153df9421a21b6ad4f941f8101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07ea424e418c33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 14:20:24 2013 +0200 Updated bug entries #0890 --- .bugs/890 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/890 b/.bugs/890 new file mode 100644 index 0000000..30f064f --- /dev/null +++ b/.bugs/890 @@ -0,0 +1,11 @@ +Title: Better error handling for invalid regex in rule +Component: core +State: open +Date: 2013-06-03 14:18:36 +Targetversion: 1.2.3 +Class: nastiness + +If you enter e.g. H:\ into the "Mount Point" of the df-Rule then cmk -C +crashes with an exception. + +Can we make a validator here?

11 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 0e4d85efddc346dbff4e11a70909c27b7af11ae7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e4d85efddc346… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 3 14:20:25 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: windows agent not longer executes directories

by Andreas Boesl

Module: check_mk Branch: master Commit: 8544bdbfff6277b20d56e5ab1fece74e1fd30965 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8544bdbfff6277… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 3 14:18:46 2013 +0200 windows agent not longer executes directories --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 6 ++++++ agents/windows/check_mk_agent.exe | Bin 112640 -> 112640 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 131798 -> 131811 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 6 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index a56c28d..1daa238 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ you queried multiple host systems via vCenter * cached checks: no longer output cached data if the age of the cache file is twice the maximum cache age + * windows agent: no longer tries to execute directories Notifications: * Flexible Notification can now filter service levels diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a69b596..4b2249c 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2087,6 +2087,12 @@ void launch_program(SOCKET &out, char *dirname, char *name, bool is_plugin){ char path[512]; snprintf(path, sizeof(path), "%s\\%s", dirname, name); + // If the path in question is a directory -> return + DWORD dwAttr = GetFileAttributes(path); + if(dwAttr != 0xffffffff && (dwAttr & FILE_ATTRIBUTE_DIRECTORY)) { + return; + } + crash_log("Running program %s", path); char newpath[512]; char *command = add_interpreter(path, newpath); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index eb5abf3..b3f2665 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 65b86d5..eb151ae 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 5cad004..2f33014 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 63bdf3c..fbb9600 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013