Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

Internal documentation cleanup in commands.py

by Mathias Kettner

Module: check_mk Branch: master Commit: c9a36753cb737e001e8696f3cf7b3bfc26f625fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9a36753cb737e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 21 09:55:51 2015 +0100 Internal documentation cleanup in commands.py --- web/plugins/views/commands.py | 147 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 136 insertions(+), 11 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c9a36753cb…

8 years, 8 months

windows agent: now reverts ipv4->ipv6 mapping done by getpeername

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4911864db6dc8842195ab90c0894a9426c7870e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4911864db6dc88… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Dec 18 17:25:12 2015 +0100 windows agent: now reverts ipv4->ipv6 mapping done by getpeername --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 886784 -> 887296 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 886784 -> 887296 bytes agents/windows/check_mk_agent.cc | 56 +++++++++++++++------- agents/windows/check_mk_agent.exe | Bin 807936 -> 808448 bytes agents/windows/check_mk_agent.msi | Bin 1954816 -> 1955840 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 807936 -> 808448 bytes agents/windows/install_agent-64.exe | Bin 406594 -> 406569 bytes agents/windows/install_agent.exe | Bin 397231 -> 397372 bytes 9 files changed, 39 insertions(+), 19 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 00146f2..9c79b4b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1066 +1092 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 5d03268..cdd70dc 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 9905bcd..360b3ec 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index c7d3dad..9abaa81 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3163,35 +3163,55 @@ DWORD WINAPI realtime_check_func(void *data_in) out.setSocket(INVALID_SOCKET); } current_address = data->last_address; - current_ip = ListenSocket::readableIP(&current_address); if (current_address.ss_family != 0) { - current_socket = socket(current_address.ss_family, SOCK_DGRAM, IPPROTO_UDP); - if (current_socket == INVALID_SOCKET) { - crash_log("failed to establish socket: %d", (int)::WSAGetLastError()); - return 1; - } - int sockaddr_size = 0; if (current_address.ss_family == AF_INET) { sockaddr_in *addrv4 = (sockaddr_in*)&current_address; addrv4->sin_port = htons(g_config->realtimePort()); sockaddr_size = sizeof(sockaddr_in); - } else { + } + else { sockaddr_in6 *addrv6 = (sockaddr_in6*)&current_address; - // FIXME: for reasons I don't understand, the v6-address we get - // from getpeername has all words flipped. why? is this safe or - // will it break on some systems? - for (int i = 0; i < 16; i += 2) { - BYTE temp = addrv6->sin6_addr.u.Byte[i]; - addrv6->sin6_addr.u.Byte[i] = addrv6->sin6_addr.u.Byte[i + 1]; - addrv6->sin6_addr.u.Byte[i + 1] = temp; - } - addrv6->sin6_port = htons(g_config->realtimePort()); - sockaddr_size = sizeof(sockaddr_in6); + if ((addrv6->sin6_addr.u.Word[0] == 0) + && (addrv6->sin6_addr.u.Word[1] == 0) + && (addrv6->sin6_addr.u.Word[2] == 0) + && (addrv6->sin6_addr.u.Word[3] == 0) + && (addrv6->sin6_addr.u.Word[4] == 0)) { + // this is a ipv4 address mapped to ipv6 + // revert that mapping, otherwise we may not be able + // to connect. + sockaddr_in temp {0}; + temp.sin_port = htons(g_config->realtimePort()); + temp.sin_family = AF_INET; + memcpy(&temp.sin_addr.s_addr, addrv6->sin6_addr.u.Byte + 12, 4); + + current_address.ss_family = AF_INET; + sockaddr_size = sizeof(sockaddr_in); + memcpy(&current_address, &temp, sockaddr_size); + } + else { + // FIXME: for reasons I don't understand, the v6-address we get + // from getpeername has all words flipped. why? is this safe or + // will it break on some systems? + for (int i = 0; i < 16; i += 2) { + BYTE temp = addrv6->sin6_addr.u.Byte[i]; + addrv6->sin6_addr.u.Byte[i] = addrv6->sin6_addr.u.Byte[i + 1]; + addrv6->sin6_addr.u.Byte[i + 1] = temp; + } + + addrv6->sin6_port = htons(g_config->realtimePort()); + sockaddr_size = sizeof(sockaddr_in6); + } } current_ip = ListenSocket::readableIP(&current_address); + current_socket = socket(current_address.ss_family, SOCK_DGRAM, IPPROTO_UDP); + if (current_socket == INVALID_SOCKET) { + crash_log("failed to establish socket: %d", (int)::WSAGetLastError()); + return 1; + } + if (connect(current_socket, (const sockaddr*)&current_address, sockaddr_size) == SOCKET_ERROR) { crash_log("failed to connect: %d", (int)::WSAGetLastError()); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e2958d1..9eaff2a 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 8235fa9..dbfe8e4 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 35479db..b2fc8d3 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 54a86d2..0082a5a 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 2981d7c..aae1705 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 8 months

#2821 FIX WATO rule based notifications: Validate regular expression for service conditions

by Andreas Boesl

Module: check_mk Branch: master Commit: 9aa3eeccb436dc17d9007054c519b52910da2073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aa3eeccb436dc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 18 14:56:44 2015 +0100 #2821 FIX WATO rule based notifications: Validate regular expression for service conditions The rule based notification conditions Match only the following services and Exclude the following services were unabled to detect invalid regular expression. An invalid regular expression causes an exception during the notification processing, which ultimately leads to the loss of any notification running through this broken rule. --- .werks/2821 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/2821 b/.werks/2821 new file mode 100644 index 0000000..9deee50 --- /dev/null +++ b/.werks/2821 @@ -0,0 +1,13 @@ +Title: WATO rule based notifications: Validate regular expression for service conditions +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i4 +Date: 1450446173 +Class: fix + +The rule based notification conditions Match only the following services and +Exclude the following services were unabled to detect invalid regular expression. + +An invalid regular expression causes an exception during the notification processing, +which ultimately leads to the loss of any notification running through this broken rule. diff --git a/ChangeLog b/ChangeLog index 5aacd49..dcf7160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -226,6 +226,7 @@ * 2728 FIX: Removed debug notification script (was not executable)... * 2843 FIX: Hanging notification scripts could prevent all other notifications... * 2815 FIX: Notification scripts: Fixed missing environment variables... + * 2821 FIX: WATO rule based notifications: Validate regular expression for service conditions... Event Console: * 2733 Visibility of Event Console events more flexible now... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7040032..14202cc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7007,7 +7007,7 @@ def generic_rule_match_conditions(): help = _("Specify a list of regular expressions that must match the beginning of the " "service name in order for the rule to match. Note: Host notifications never match this " "rule if this option is being used."), - valuespec = TextUnicode(size = 32), + valuespec = RegExpUnicode(size = 32), orientation = "horizontal", allow_empty = False, empty_text = _("Please specify at least one service regex. Disable the option if you want to allow all services."), @@ -7016,7 +7016,7 @@ def generic_rule_match_conditions(): ( "match_exclude_services", ListOfStrings( title = _("Exclude the following services"), - valuespec = TextUnicode(size = 32), + valuespec = RegExpUnicode(size = 32), orientation = "horizontal", ) ),

8 years, 8 months

GUI-Tests: ignore changes in date outputs

by Mathias Kettner

Module: check_mk Branch: master Commit: 256ae8681014ce47ff111687408aa37deb8cf090 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=256ae8681014ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 18 14:53:10 2015 +0100 GUI-Tests: ignore changes in date outputs --- web/htdocs/guitester.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/guitester.py b/web/htdocs/guitester.py index 458a50a..1d93788 100644 --- a/web/htdocs/guitester.py +++ b/web/htdocs/guitester.py @@ -298,6 +298,7 @@ def guitest_drop_dynamic_ids(thing): check_mk_version_regex = "(1\.2\.[68]?([bp][0-9]+)|1\.2\.[79]i[0-9](p[0-9]+)?|201[5-9]\.[01][0-9]\.[0123][0-9])" timeofday_regex = "[012][0-9]:[0-5][0-9]:[0-5][0-9]" year_regex = "201[56789]" +english_date_regex = "(Mon|Tue|Wed|Thu|Fri|Sat|Sun) +(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) +[1-9][0-9]?" def guitest_drop_dynamic_ids_in_text(text): @@ -308,4 +309,5 @@ def guitest_drop_dynamic_ids_in_text(text): text = re.sub(check_mk_version_regex, "CMK_VERSION", text) text = re.sub(timeofday_regex, "TIMEOFDAY", text) text = re.sub(year_regex, "YEAR", text) + text = re.sub(english_date_regex, "DATE", text) return text

8 years, 8 months

Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 420b1f445007421621e1c23c677512454fa1f975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=420b1f44500742… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 18 12:05:48 2015 +0100 Removed debug output --- web/htdocs/js/wato.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index adf4e68..5bc4759 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -203,7 +203,6 @@ function wato_fix_visibility() { for (var try_form = 0; try_form < available_forms.length; try_form++) { var my_form = document.getElementById(available_forms[try_form]); if (my_form != null) { - console.log("xx" + available_forms[try_form]); for (var child in my_form.childNodes){ oTr = my_form.childNodes[child]; if (oTr.className == "nform"){

8 years, 8 months

Fixed showing/hiding of dependent fields on edit host page

by Lars Michelsen

Module: check_mk Branch: master Commit: b90bdbda3d798c9627925c73c1c627f908d9916f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b90bdbda3d798c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 18 12:05:38 2015 +0100 Fixed showing/hiding of dependent fields on edit host page --- web/htdocs/js/wato.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index d71c54f..adf4e68 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -199,10 +199,11 @@ function wato_fix_visibility() { } // FIXME: use generic identifier for each form - var available_forms = [ "form_edithost", "form_editfolder", "form_bulkedit" ]; + var available_forms = [ "form_edit_host", "form_editfolder" ]; for (var try_form = 0; try_form < available_forms.length; try_form++) { var my_form = document.getElementById(available_forms[try_form]); if (my_form != null) { + console.log("xx" + available_forms[try_form]); for (var child in my_form.childNodes){ oTr = my_form.childNodes[child]; if (oTr.className == "nform"){

8 years, 8 months

Fixed broken links to edit host page after WATO recode

by Lars Michelsen

Module: check_mk Branch: master Commit: 97c539aea4dec3a267654525bec37cf20b1c88ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97c539aea4dec3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 18 12:03:04 2015 +0100 Fixed broken links to edit host page after WATO recode --- web/plugins/icons/wato.py | 2 +- web/plugins/wato/builtin_attributes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 2bcf61b..486a0e2 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -38,7 +38,7 @@ def wato_link(folder, site, hostname, where): help = _("Edit services") icon = "services" else: - url += "&mode=edithost" + url += "&mode=edit_host" help = _("Edit this host") icon = "wato" return icon, help, url diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 249acb4..abd7e8b 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -107,7 +107,7 @@ class ParentsAttribute(ValueSpecAttribute): def paint(self, value, hostname): parts = [ '<a href="%s">%s</a>' % ( - "wato.py?" + html.urlencode_vars([("mode", "edithost"), ("host", hn)]), hn) + "wato.py?" + html.urlencode_vars([("mode", "edit_host"), ("host", hn)]), hn) for hn in value ] return "", ", ".join(parts)

8 years, 8 months

Fixed broken rule lists when host conditions are configured

by Lars Michelsen

Module: check_mk Branch: master Commit: bdd7f959f6dedab98f2da15137b5b68ffb947568 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdd7f959f6deda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 18 13:19:03 2015 +0100 Fixed broken rule lists when host conditions are configured --- web/htdocs/wato.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9a10d28..609e474 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12373,14 +12373,12 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): condition = _("This rule does never apply due to an empty list of explicit hosts!") elif host_list[-1] != ALL_HOSTS[0]: tt_list = [] - for h in host_list: - f = find_host(h) - if f: - uri = html.makeuri([("mode", "edit_host"), ("folder", f[".path"]), ("host", h)]) - host_spec = '<a href="%s">%s</a>' % (uri, h) - else: - host_spec = h + for host_spec in host_list: + host = Host.host(host_spec) + if host: + host_spec = '<a href="%s">%s</a>' % (html.attrencode(host.edit_url()), host_spec) tt_list.append("<tt>%s</tt>" % host_spec) + if len(host_list) == 1: condition = _("Host name is %s") % tt_list[0] else:

8 years, 8 months

#2881 Automatically restart core instead of reload after changes in local check plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 7647cd04fdb096c825559e3ac22d4ca2294243b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7647cd04fdb096… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 18 11:35:03 2015 +0100 #2881 Automatically restart core instead of reload after changes in local check plugins If you create, remove or modify you own check plugins in <tt>~/local/share/check_mk/checks</tt> then usually had to do a real core restart with <tt>cmk -R</tt> in order to activate these changes. This is now done automatically. Whenever you do Activate Changes then Check_MK does a real restart on demand if it sees any modification in the check plugins. This also helps the handling of installing and removing Check_MK packages (MKPs). --- .werks/2881 | 14 ++++++++++++++ ChangeLog | 1 + modules/automation.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/.werks/2881 b/.werks/2881 new file mode 100644 index 0000000..575e104 --- /dev/null +++ b/.werks/2881 @@ -0,0 +1,14 @@ +Title: Automatically restart core instead of reload after changes in local check plugins +Level: 1 +Component: core +Compatible: compat +Version: 1.2.7i4 +Date: 1450434659 +Class: feature + +If you create, remove or modify you own check plugins in +<tt>~/local/share/check_mk/checks</tt> then usually had to do a real core +restart with <tt>cmk -R</tt> in order to activate these changes. This is now +done automatically. Whenever you do Activate Changes then Check_MK +does a real restart on demand if it sees any modification in the check plugins. +This also helps the handling of installing and removing Check_MK packages (MKPs). diff --git a/ChangeLog b/ChangeLog index 31514d7..5aacd49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.7i4: Core & Setup: * 2771 Errors in Check_MK configuration do not prevent the core from being restarted anymore... + * 2881 Automatically restart core instead of reload after changes in local check plugins... * 2682 FIX: Fixed exception Error creating configuration: global name 'extra_host_attributes' is not defined * 2443 FIX: Fixed quoting of ! in classical nagios checks configured via WATO... * 2718 FIX: Fixed agent timeouts not resulting in a crash report anympore... diff --git a/modules/automation.py b/modules/automation.py index 8622454..e76ec10 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -412,6 +412,8 @@ def automation_delete_host(args): def automation_restart(job = "restart", use_rushd = True): + if job == "reload" and check_plugins_have_changed(): + job = "restart" # make sure, Nagios does not inherit any open # filedescriptors. This really happens, e.g. if @@ -492,6 +494,34 @@ def automation_restart(job = "restart", use_rushd = True): sys.stdout = old_stdout return configuration_warnings + +def check_plugins_have_changed(): + if not omd_root: + return False # not supported for manual setup + + this_time = last_modification_in_dir(local_checks_dir) + last_time = time_of_last_config_creation() + return this_time > last_time + + +def last_modification_in_dir(dir_path): + max_time = os.stat(dir_path).st_mtime + for file_name in os.listdir(dir_path): + max_time = max(max_time, os.stat(dir_path + "/" + file_name).st_mtime) + return max_time + + +def time_of_last_config_creation(): + if monitoring_core == "cmc": + config_path = omd_root + "/var/check_mk/core/config" + else: + config_path = omd_root + "/etc/nagios/conf.d/check_mk_objects.cfg" + if os.path.exists(config_path): + return os.stat(config_path).st_mtime + else: + return 0 + + def automation_get_configuration(): # We read the list of variable names from stdin since # that could be too much for the command line

8 years, 8 months

Fix detection of neccessary core restart

by Mathias Kettner

Module: check_mk Branch: master Commit: 1ee4ef46396b897b43919553fb4222edd0e4d53f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ee4ef46396b89… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 18 12:05:55 2015 +0100 Fix detection of neccessary core restart --- modules/automation.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index e76ec10..84d9420 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -412,8 +412,12 @@ def automation_delete_host(args): def automation_restart(job = "restart", use_rushd = True): - if job == "reload" and check_plugins_have_changed(): + if check_plugins_have_changed(): + forced = True job = "restart" + else: + forced = False + # make sure, Nagios does not inherit any open # filedescriptors. This really happens, e.g. if @@ -429,7 +433,7 @@ def automation_restart(job = "restart", use_rushd = True): pass else: objects_file = var_dir + "/core/config" - if job == "restart": + if job == "restart" and not forced: job = "reload" # force reload for CMC # os.closerange(3, 256) --> not available in older Python versions @@ -500,7 +504,7 @@ def check_plugins_have_changed(): return False # not supported for manual setup this_time = last_modification_in_dir(local_checks_dir) - last_time = time_of_last_config_creation() + last_time = time_of_last_core_restart() return this_time > last_time @@ -511,13 +515,13 @@ def last_modification_in_dir(dir_path): return max_time -def time_of_last_config_creation(): +def time_of_last_core_restart(): if monitoring_core == "cmc": - config_path = omd_root + "/var/check_mk/core/config" + pidfile_path = omd_root + "/tmp/run/cmc.pid" else: - config_path = omd_root + "/etc/nagios/conf.d/check_mk_objects.cfg" - if os.path.exists(config_path): - return os.stat(config_path).st_mtime + pidfile_path = omd_root + "/tmp/lock/nagios.lock" + if os.path.exists(pidfile_path): + return os.stat(pidfile_path).st_mtime else: return 0

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015