Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4940 FIX Handle non-ASCII characters in event console messages

by Sven Panne

Module: check_mk Branch: master Commit: 72269d2afb2c68e807bd647e7bb1bd2a5bcd79d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72269d2afb2c68… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 29 13:42:34 2017 +0200 4940 FIX Handle non-ASCII characters in event console messages Messages containing non-ASCII characters were silently dropped in the event console. This has been fixed. Change-Id: I9fe9fbeeffa90d31aa8950c4998c0485ac399d5b --- .werks/4940 | 11 +++++++++++ bin/mkeventd | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4940 b/.werks/4940 new file mode 100644 index 0000000..19655a0 --- /dev/null +++ b/.werks/4940 @@ -0,0 +1,11 @@ +Title: Handle non-ASCII characters in event console messages +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498736427 +Class: fix + +Messages containing non-ASCII characters were silently dropped in the event +console. This has been fixed. diff --git a/bin/mkeventd b/bin/mkeventd index a11ee13..a329445 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3156,7 +3156,7 @@ class StatusServer: # TODO: Change the lock type in future? # process_raw_lines("%s" % ";".join(arguments)) with file(g_pipe_path, "w") as pipe: - pipe.write("%s\n" % ";".join(arguments)) + pipe.write(("%s\n" % ";".join(arguments)).encode("utf-8")) def handle_command_changestate(self, arguments):

7 years, 3 months

4923 FIX Host diagnostic: Fixed error when saving host with DNS name as IPv4 address

by Lars Michelsen

Module: check_mk Branch: master Commit: b4dd7a8d06aca9d5e6e93a5aac54e2e76fd43b30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4dd7a8d06aca9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 13:29:10 2017 +0200 4923 FIX Host diagnostic: Fixed error when saving host with DNS name as IPv4 address Change-Id: I234f790e666618a52b184a308cd351859ca16641 --- .werks/4923 | 11 +++++++++++ web/htdocs/wato.py | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/4923 b/.werks/4923 new file mode 100644 index 0000000..a20ccfe --- /dev/null +++ b/.werks/4923 @@ -0,0 +1,11 @@ +Title: Host diagnostic: Fixed error when saving host with DNS name as IPv4 address +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498735705 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 91b338d..cd4fcdf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2473,9 +2473,10 @@ def mode_diag_host(phase): title = _('Hostname'), allow_empty = False )), - ('ipaddress', IPv4Address( - title = _('IP address'), - allow_empty = False + ('ipaddress', HostAddress( + title = _("IPv4 Address"), + allow_empty = False, + allow_ipv6_address = False, )), ('snmp_community', Password( title = _("SNMPv1/2 community"),

7 years, 3 months

fixed werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: 565310fad47fc0d7e0125c4a48f03b36df4c175c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=565310fad47fc0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 29 13:05:01 2017 +0200 fixed werk description Change-Id: I27b040d36d8ae64b05e045f1c9f6a8dde0eba9d9 --- .werks/4839 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/4839 b/.werks/4839 index 8af9169..7c7b644 100644 --- a/.werks/4839 +++ b/.werks/4839 @@ -1,4 +1,4 @@ -Title: windows agents: fixed invalid hieroglyps in agent output, when plugin output includes FF FE byte order mark +Title: windows agents: fixed invalid hieroglyphs in agent output, when plugin output includes FF FE byte order mark Level: 1 Component: checks Compatible: compat

7 years, 3 months

4839 FIX windows agents: fixed invalid hieroglyps in agent output, when plugin output includes FF FE byte order mark

by Andreas Boesl

Module: check_mk Branch: master Commit: fe2d6ccb8bc306fd2ded85368a69ad1fd3400052 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe2d6ccb8bc306… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 29 12:08:09 2017 +0200 4839 FIX windows agents: fixed invalid hieroglyps in agent output, when plugin output includes FF FE byte order mark Change-Id: I6aa92a6ebc2838fb933fa89c3fe1c6562c7ee92d --- .werks/4839 | 10 ++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1369600 -> 1339904 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 17208624 -> 15823277 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1369600 -> 1339904 bytes agents/windows/check_mk_agent.exe | Bin 1351680 -> 1317888 bytes agents/windows/check_mk_agent.msi | Bin 2992128 -> 2927616 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 15041453 -> 13681693 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1351680 -> 1317888 bytes agents/windows/install_agent-64.exe | Bin 603781 -> 591863 bytes agents/windows/install_agent.exe | Bin 603278 -> 589498 bytes agents/windows/sections/SectionPluginGroup.cc | 4 ++-- 12 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/4839 b/.werks/4839 new file mode 100644 index 0000000..8af9169 --- /dev/null +++ b/.werks/4839 @@ -0,0 +1,10 @@ +Title: windows agents: fixed invalid hieroglyps in agent output, when plugin output includes FF FE byte order mark +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498730806 +Class: fix + +One candidate for this error was the windows_updates.vbs plugin. diff --git a/agents/windows/build_version b/agents/windows/build_version index 3c6eb2a..07dcacc 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2715 +2800 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0860858..9842480 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index e4a9ed5..6a6935d 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index ddf6f3a..288d4bf 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.exe b/agents/windows/check_mk_agent.exe index fe6d16f..855f556 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 25fd387..800596e 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 19d5b5e..cb22bb3 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 06ce1f3..3baaa64 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 8a7134b..2f47628 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 6f923a9..45e8927 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPluginGroup.cc b/agents/windows/sections/SectionPluginGroup.cc index 30e52a4..c8dc3e7 100644 --- a/agents/windows/sections/SectionPluginGroup.cc +++ b/agents/windows/sections/SectionPluginGroup.cc @@ -138,9 +138,9 @@ static int launch_program(script_container *cont) { reinterpret_cast<unsigned char *>(cont->buffer_work); if ((buf_u[0] == 0xFF) && (buf_u[1] == 0xFE)) { wchar_t *buffer_u16 = - reinterpret_cast<wchar_t *>(cont->buffer_work); + reinterpret_cast<wchar_t *>(cont->buffer_work + 2); std::string buffer_u8 = to_utf8(buffer_u16); - HeapFree(GetProcessHeap(), 0, buffer_u16); + HeapFree(GetProcessHeap(), 0, cont->buffer_work); cont->buffer_work = (char *)HeapAlloc(GetProcessHeap(), 0, buffer_u8.size() + 1); memcpy(cont->buffer_work, buffer_u8.c_str(), buffer_u8.size() + 1);

7 years, 3 months

Unbreak --with-nagios4 configuration.

by Sven Panne

Module: check_mk Branch: master Commit: d4b02251b9ab085d88c74087c00cd4f3f04757e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4b02251b9ab08… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 29 11:28:21 2017 +0200 Unbreak --with-nagios4 configuration. Change-Id: I866b0971ec25c5274a72514ecf9d8af91cbcb0f4 --- livestatus/src/NagiosMockup.cc | 1 + livestatus/src/TableHosts.cc | 24 ++++++++++++++---------- livestatus/src/TableServices.cc | 9 +++++---- livestatus/src/TableStatus.cc | 11 ++++++----- livestatus/src/contact_fwd.h | 4 +++- 5 files changed, 29 insertions(+), 20 deletions(-) diff --git a/livestatus/src/NagiosMockup.cc b/livestatus/src/NagiosMockup.cc index fc9ccee..0304233 100644 --- a/livestatus/src/NagiosMockup.cc +++ b/livestatus/src/NagiosMockup.cc @@ -59,6 +59,7 @@ int neb_register_callback(int /*unused*/, void * /*unused*/, int /*unused*/, int obsess_over_hosts; int obsess_over_services; int process_performance_data; +int process_external_command1(char * /*unused*/) { return 0; } time_t program_start; int rotate_log_file(time_t /*unused*/) { return 0; } int schedule_new_event(int /*unused*/, int /*unused*/, time_t /*unused*/, diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 4c1fc63..388b8b7 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -94,11 +94,13 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc, table->addColumn(make_unique<OffsetStringColumn>( prefix + "check_command", "Nagios command for active host check of this host", - (char *)(&hst.check_command) - ref, indirect_offset, extra_offset)); + DANGEROUS_OFFSETOF(host, check_command), indirect_offset, extra_offset, + -1)); table->addColumn(make_unique<OffsetStringHostMacroColumn>( prefix + "check_command_expanded", "Nagios command for active host check of this host with the macros expanded", - (char *)(&hst.check_command) - ref, indirect_offset, extra_offset)); + DANGEROUS_OFFSETOF(host, check_command), indirect_offset, extra_offset, + -1)); #else table->addColumn(make_unique<OffsetStringColumn>( prefix + "check_command", @@ -220,11 +222,11 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc, DANGEROUS_OFFSETOF(host, accept_passive_host_checks), indirect_offset, extra_offset, -1)); #else - table->addColumn( - new OffsetIntColumn(prefix + "accept_passive_checks", - "Whether passive host checks are accepted (0/1)", - (char *)(&hst.accept_passive_checks) - ref, - indirect_offset, extra_offset)); + table->addColumn(make_unique<OffsetIntColumn>( + prefix + "accept_passive_checks", + "Whether passive host checks are accepted (0/1)", + DANGEROUS_OFFSETOF(host, accept_passive_checks), indirect_offset, + extra_offset, -1)); #endif // NAGIOS4 table->addColumn(make_unique<OffsetIntColumn>( prefix + "event_handler_enabled", @@ -267,11 +269,13 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc, table->addColumn(make_unique<OffsetTimeColumn>( prefix + "last_notification", "Time of the last notification (Unix timestamp)", - (char *)(&hst.last_notification) - ref, indirect_offset, extra_offset)); + DANGEROUS_OFFSETOF(host, last_notification), indirect_offset, + extra_offset, -1)); table->addColumn(make_unique<OffsetTimeColumn>( prefix + "next_notification", "Time of the next notification (Unix timestamp)", - (char *)(&hst.next_notification) - ref, indirect_offset, extra_offset)); + DANGEROUS_OFFSETOF(host, next_notification), indirect_offset, + extra_offset, -1)); #endif // NAGIOS4 table->addColumn(make_unique<OffsetTimeColumn>( prefix + "next_check", @@ -398,7 +402,7 @@ void TableHosts::addColumns(Table *table, MonitoringCore *mc, table->addColumn(make_unique<OffsetIntColumn>( prefix + "obsess_over_host", "The current obsess_over_host setting... (0/1)", - (char *)(&hst.obsess) - ref, indirect_offset, extra_offset)); + DANGEROUS_OFFSETOF(host, obsess), indirect_offset, extra_offset, -1)); #endif // NAGIOS4 table->addColumn(make_unique<AttributeListAsIntColumn>( prefix + "modified_attributes", diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 659e585..e82658f 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -93,11 +93,11 @@ void TableServices::addColumns(Table *table, MonitoringCore *mc, #else table->addColumn(make_unique<OffsetStringColumn>( prefix + "check_command", "Nagios command used for active checks", - (char *)(&svc.check_command) - ref, indirect_offset)); + DANGEROUS_OFFSETOF(service, check_command), indirect_offset, -1, -1)); table->addColumn(make_unique<OffsetStringServiceMacroColumn>( prefix + "check_command_expanded", "Nagios command used for active checks with the macros expanded", - (char *)(&svc.check_command) - ref, indirect_offset)); + DANGEROUS_OFFSETOF(service, check_command), indirect_offset, -1, -1)); #endif table->addColumn(make_unique<OffsetStringColumn>( prefix + "event_handler", "Nagios command used as event handler", @@ -284,7 +284,8 @@ void TableServices::addColumns(Table *table, MonitoringCore *mc, table->addColumn(make_unique<OffsetIntColumn>( prefix + "accept_passive_checks", "Whether the service accepts passive checks (0/1)", - (char *)(&svc.accept_passive_checks) - ref, indirect_offset)); + DANGEROUS_OFFSETOF(service, accept_passive_checks), indirect_offset, -1, + -1)); #endif // NAGIOS4 table->addColumn(make_unique<OffsetIntColumn>( prefix + "event_handler_enabled", @@ -332,7 +333,7 @@ void TableServices::addColumns(Table *table, MonitoringCore *mc, table->addColumn(make_unique<OffsetIntColumn>( prefix + "obsess_over_service", "Whether 'obsess_over_service' is enabled for the service (0/1)", - (char *)(&svc.obsess) - ref, indirect_offset)); + DANGEROUS_OFFSETOF(service, obsess), indirect_offset, -1, -1)); #endif // NAGIOS4 table->addColumn(make_unique<AttributeListAsIntColumn>( prefix + "modified_attributes", diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index d3a3873..2acd78c 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -74,7 +74,8 @@ extern int external_command_buffer_slots; #else // TODO: check if this data is available in nagios_squeue namespace { -time_t dummy = 0; +time_t dummy_time = 0; +int dummy_int = 0; } // namespace #endif // NAGIOS4 @@ -166,7 +167,7 @@ TableStatus::TableStatus(MonitoringCore *mc) : Table(mc) { addColumn(make_unique<TimePointerColumn>( "last_command_check", "The time of the last check for a command as UNIX timestamp (placeholder)", - &dummy)); + &dummy_time)); #endif // NAGIOS4 addColumn(make_unique<TimePointerColumn>( "last_log_rotation", "Time time of the last log file rotation", @@ -202,15 +203,15 @@ TableStatus::TableStatus(MonitoringCore *mc) : Table(mc) { addColumn(make_unique<IntPointerColumn>( "external_command_buffer_slots", "The size of the buffer for the external commands (placeholder)", - &dummy)); + &dummy_int)); addColumn(make_unique<IntPointerColumn>( "external_command_buffer_usage", "The number of slots in use of the external command buffer (placeholder)", - &dummy)); + &dummy_int)); addColumn(make_unique<IntPointerColumn>( "external_command_buffer_max", "The maximum number of slots used in the external command buffer (placeholder)", - &dummy)); + &dummy_int)); #endif // NAGIOS4 // Livestatus' own status diff --git a/livestatus/src/contact_fwd.h b/livestatus/src/contact_fwd.h index 0c977b6..3cf0d03 100644 --- a/livestatus/src/contact_fwd.h +++ b/livestatus/src/contact_fwd.h @@ -25,9 +25,11 @@ #ifndef contact_fwd_h #define contact_fwd_h -#ifdef CMC +#if defined(CMC) class Contact; typedef Contact contact; +#elif defined(NAGIOS4) +typedef struct contact contact; #else typedef struct contact_struct contact; #endif

7 years, 3 months

Abort configure when the right Boost libraries are not found.

by Sven Panne

Module: check_mk Branch: master Commit: 9ab4796a79b65f00f32909f4df21517256e48ecb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ab4796a79b65f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 29 11:00:07 2017 +0200 Abort configure when the right Boost libraries are not found. Change-Id: I2de69f699620e20a0963005f2f9013de15779a24 --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 22dbe24..a566a81 100644 --- a/configure.ac +++ b/configure.ac @@ -85,8 +85,11 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h strings.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h]) # Checks for C++ features -AX_BOOST_BASE +AX_BOOST_BASE(,,AC_MSG_ERROR([Boost library not found or too old])) AX_BOOST_ASIO +if test "x$ax_cv_boost_asio" = xno; then + AC_MSG_ERROR([Boost::ASIO library not found]) +fi AC_LANG_PUSH([C++])

7 years, 3 months

Always cleanup pylint test directories

by Lars Michelsen

Module: check_mk Branch: master Commit: b98cf769e0ba64435d638183cc35f046fa3cca1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b98cf769e0ba64… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 10:43:32 2017 +0200 Always cleanup pylint test directories Change-Id: Idac21f872e598ccf22a85488c68e3c621a5f7647 --- tests/pylint/conftest.py | 28 ++++++++++++++++++++++++++++ tests/pylint/test_pylint_checks.py | 8 +++----- tests/pylint/test_pylint_modules.py | 8 +++----- tests/pylint/test_pylint_web.py | 12 +++++------- tests/testlib/pylint_cmk.py | 25 ++++++------------------- 5 files changed, 45 insertions(+), 36 deletions(-) diff --git a/tests/pylint/conftest.py b/tests/pylint/conftest.py new file mode 100644 index 0000000..73231cf --- /dev/null +++ b/tests/pylint/conftest.py @@ -0,0 +1,28 @@ +#!/usr/bin/env python + +import os +import tempfile +import shutil +import pytest + +(a)pytest.fixture(scope="session") +def pylint_test_dir(): + base_path = os.environ.get("WORKDIR") + if base_path: + base_path += "/" + os.path.basename(sys.argv[0]) + if not os.path.exists(base_path): + os.makedirs(base_path) + else: + base_path = None + + test_dir = tempfile.mkdtemp(prefix="cmk_pylint", dir=base_path) + + print("Prepare check in %s ..." % test_dir) + yield test_dir + + # + # Cleanup code + # + + print("Cleanup pylint test dir %s ..." % test_dir) + shutil.rmtree(test_dir) diff --git a/tests/pylint/test_pylint_checks.py b/tests/pylint/test_pylint_checks.py index c4ab1d8..7071546 100755 --- a/tests/pylint/test_pylint_checks.py +++ b/tests/pylint/test_pylint_checks.py @@ -11,10 +11,8 @@ import testlib.pylint_cmk as pylint_cmk # Mark all tests in this file to be pylint checks pytestmark = pytest.mark.pylint -def test_pylint_checks(): - base_path = pylint_cmk.get_test_dir() - - f = file(base_path + "/cmk-checks.py", "w") +def test_pylint_checks(pylint_test_dir): + f = file(pylint_test_dir + "/cmk-checks.py", "w") # add the modules for path in pylint_cmk.ordered_module_files(): @@ -34,6 +32,6 @@ def test_pylint_checks(): f.close() - exit_code = pylint_cmk.run_pylint(base_path, cleanup_test_dir=True) + exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in checks, inventory " \ "or agent bakery plugins" diff --git a/tests/pylint/test_pylint_modules.py b/tests/pylint/test_pylint_modules.py index 8fd7383..5ffb0a4 100755 --- a/tests/pylint/test_pylint_modules.py +++ b/tests/pylint/test_pylint_modules.py @@ -11,13 +11,11 @@ import testlib.pylint_cmk as pylint_cmk # Mark all tests in this file to be pylint checks pytestmark = pytest.mark.pylint -def test_pylint_modules(): - base_path = pylint_cmk.get_test_dir() - - f = file(base_path + "/cmk-modules.py", "w") +def test_pylint_modules(pylint_test_dir): + f = file(pylint_test_dir + "/cmk-modules.py", "w") for path in pylint_cmk.ordered_module_files(): pylint_cmk.add_file(f, path) f.close() - exit_code = pylint_cmk.run_pylint(base_path, cleanup_test_dir=True) + exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in modules" diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py index fc3427f..6a0749d 100755 --- a/tests/pylint/test_pylint_web.py +++ b/tests/pylint/test_pylint_web.py @@ -39,11 +39,9 @@ def get_plugin_files(plugin_dir): return sorted(files) -def test_pylint_web(): - base_path = pylint_cmk.get_test_dir() - +def test_pylint_web(pylint_test_dir): # Make compiled files import eachother by default - sys.path.insert(0, base_path) + sys.path.insert(0, pylint_test_dir) modules = glob.glob(cmk_path() + "/web/htdocs/*.py") \ + glob.glob(cmc_path() + "/web/htdocs/*.py") \ @@ -51,7 +49,7 @@ def test_pylint_web(): for module in modules: print("Copy %s to test directory" % module) - f = open(base_path + "/" + os.path.basename(module), "w") + f = open(pylint_test_dir + "/" + os.path.basename(module), "w") pylint_cmk.add_file(f, module) f.close() @@ -73,9 +71,9 @@ def test_pylint_web(): module_name = plugin_dir print("[%s] add %s" % (module_name, plugin_path)) - module = file(base_path + "/" + module_name + ".py", "a") + module = file(pylint_test_dir + "/" + module_name + ".py", "a") pylint_cmk.add_file(module, plugin_path) module.close() - exit_code = pylint_cmk.run_pylint(base_path, cleanup_test_dir=True) + exit_code = pylint_cmk.run_pylint(pylint_test_dir) assert exit_code == 0, "PyLint found an error in the web code" diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index f0e806d..6fcda12 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -80,20 +80,7 @@ def add_file(f, path): f.write(file(path).read()) -def get_test_dir(): - base_path = os.environ.get("WORKDIR") - if base_path: - base_path += "/" + os.path.basename(sys.argv[0]) - if not os.path.exists(base_path): - os.makedirs(base_path) - else: - base_path = tempfile.mkdtemp(prefix="cmk_pylint") - - print("Prepare check in %s ..." % base_path) - return base_path - - -def run_pylint(base_path, check_files=None, cleanup_test_dir=False): +def run_pylint(base_path, check_files=None): #, cleanup_test_dir=False): pylint_args = os.environ.get("PYLINT_ARGS", "") if pylint_args: pylint_args += " " @@ -112,11 +99,11 @@ def run_pylint(base_path, check_files=None, cleanup_test_dir=False): exit_code = p.wait() print("Finished with exit code: %d" % exit_code) - if exit_code == 0 and cleanup_test_dir: - # Don't remove directory when specified via WORKDIR env - if not os.environ.get("WORKDIR"): - print("Removing build path...") - shutil.rmtree(base_path) + #if exit_code == 0 and cleanup_test_dir: + # # Don't remove directory when specified via WORKDIR env + # if not os.environ.get("WORKDIR"): + # print("Removing build path...") + # shutil.rmtree(base_path) return exit_code

7 years, 3 months

4939 FIX Always use DNS when looking up the IP of Graphite servers

by Sven Panne

Module: check_mk Branch: master Commit: bf36de225dfadf24f782ff45f01283cf375ce103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf36de225dfadf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 29 10:36:15 2017 +0200 4939 FIX Always use DNS when looking up the IP of Graphite servers There were a few configurations where the IP used for Graphite servers was always 127.0.0.1: Simulation mode, using store SNMP walks, and few more highly obscure configurations used only for development. This was wrong, the Graphite servers have nothing to do with the monitoring in itself. This has been fixed, the lookup for Graphite servers is now always being done via DNS. Change-Id: Ic612e8ac3fc087bbbc837dbafe2287dba27cb8b2 --- .werks/4939 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/4939 b/.werks/4939 new file mode 100644 index 0000000..6684735 --- /dev/null +++ b/.werks/4939 @@ -0,0 +1,17 @@ +Title: Always use DNS when looking up the IP of Graphite servers +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1498724827 + +There were a few configurations where the IP used for Graphite servers was +always 127.0.0.1: Simulation mode, using store SNMP walks, and few more +highly obscure configurations used only for development. This was wrong, +the Graphite servers have nothing to do with the monitoring in itself. + +This has been fixed, the lookup for Graphite servers is now always being +done via DNS.

7 years, 3 months

4922 FIX Logwatch: Show only hosts with problematic log files in " Problematic log file" list

by Lars Michelsen

Module: check_mk Branch: master Commit: fb8bc1fa0af86cd0530dcade878f769a4dad8b2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb8bc1fa0af86c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 10:22:07 2017 +0200 4922 FIX Logwatch: Show only hosts with problematic log files in "Problematic log file" list Change-Id: I8d34a96cff04e433e5dbbd51e89be2fb9ac0e317 --- .werks/4922 | 11 +++++++++++ web/htdocs/logwatch.py | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/.werks/4922 b/.werks/4922 new file mode 100644 index 0000000..ff21528 --- /dev/null +++ b/.werks/4922 @@ -0,0 +1,11 @@ +Title: Logwatch: Show only hosts with problematic log files in "Problematic log file" list +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498724504 + + diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 06ffe7b..7a2f301 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -86,6 +86,13 @@ def show_log_list(): for site, host_name, logs in all_logs(): if not logs: continue + + all_logs_empty = not any([ parse_file(site, host_name, file_name) + for file_name in logs ]) + + if all_logs_empty: + continue # Logfile vanished + html.h2(html.render_a(host_name, href=html.makeuri([('site', site), ('host', host_name)]))) list_logs(site, host_name, logs) html.footer()

7 years, 3 months

4921 Users can be limited to a list of authorized sites now

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d5d6f273cb5487bf75852d15936b1c0e0be912d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d5d6f273cb548… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 29 10:04:52 2017 +0200 4921 Users can be limited to a list of authorized sites now It is now possible to configure a list of authorized sites for each user. This is especially useful when having a huge number of sites configured, like several hundred, in a distributed setup. In case you have users that have their hosts on only some of these sites, you can set the new authorized sites option for these users. For the users that have authorized sites configured the GUI will only contact these sites instead of all sites to build up their views. In large environments this will be a huge performance improvement. Change-Id: I428928d99714dda7dffa2a668cd63b67830ce610 --- .werks/4921 | 19 +++++++++++++++++++ web/htdocs/config.py | 19 +++++++++++++++++-- web/htdocs/sites.py | 11 ++++++----- web/htdocs/valuespec.py | 20 ++++++++++++++++++-- web/htdocs/wato.py | 37 +++++++++++++++++++++++++++++++++++++ web/htdocs/watolib.py | 2 +- 6 files changed, 98 insertions(+), 10 deletions(-) diff --git a/.werks/4921 b/.werks/4921 new file mode 100644 index 0000000..a94cec0 --- /dev/null +++ b/.werks/4921 @@ -0,0 +1,19 @@ +Title: Users can be limited to a list of authorized sites now +Level: 2 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498723224 +Class: feature + +It is now possible to configure a list of authorized sites for each user. + +This is especially useful when having a huge number of sites configured, +like several hundred, in a distributed setup. In case you have users that +have their hosts on only some of these sites, you can set the new authorized +sites option for these users. + +For the users that have authorized sites configured the GUI will only contact +these sites instead of all sites to build up their views. In large environments +this will be a huge performance improvement. diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 03e15eb..92ecb65 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -428,6 +428,21 @@ class LoggedInUser(object): self.save_file("favorites", list(stars)) + def is_site_disabled(self, site_id): + siteconf = self.siteconf.get(site_id, {}) + return siteconf.get("disabled", False) + + + def authorized_sites(self): + authorized_sites = self.get_attribute("authorized_sites") + all_sites = allsites() + if authorized_sites is None: + return all_sites + else: + return dict([ (site_id, site) for site_id, site in all_sites.items() + if site_id in authorized_sites ]) + + def may(self, pname): if pname in self.permissions: return self.permissions[pname] @@ -660,8 +675,8 @@ def configured_sites(): def sorted_sites(): sitenames = [] - for sitename, site in allsites().iteritems(): - sitenames.append((sitename, site['alias'])) + for site_id, site in user.authorized_sites().items(): + sitenames.append((site_id, site['alias'])) sitenames = sorted(sitenames, key=lambda k: k[1], cmp = lambda a,b: cmp(a.lower(), b.lower())) return sitenames diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 4383fcd..e26c9e9 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -186,12 +186,13 @@ def _connect_multiple_sites(): def _get_enabled_and_disabled_sites(): enabled_sites, disabled_sites = {}, {} - for site_id, site in config.allsites().items(): - siteconf = config.user.siteconf.get(site_id, {}) - if siteconf.get("disabled", False): - disabled_sites[site_id] = site + for site_id, site in config.user.authorized_sites().items(): + if config.user.is_site_disabled(site_id): + sites = disabled_sites else: - enabled_sites[site_id] = site + sites = enabled_sites + + sites[site_id] = site return enabled_sites, disabled_sites diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6a2701e..1b652d6 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2022,6 +2022,7 @@ class ListChoice(ValueSpec): # Make sure that at least one variable with the prefix is present html.hidden_field(varprefix, "1", add_var=True) + def value_to_text(self, value): self.load_elements() d = dict(self._elements) @@ -2033,6 +2034,7 @@ class ListChoice(ValueSpec): return "%s" % html.render_table(html.render_tr(html.render_td(html.render_br().join( map(lambda x: HTML(x), texts) )))) #OLD: return "<table><tr><td>" + "<br>".join(texts) + "</td></tr></table>" + def from_html_vars(self, varprefix): self.load_elements() value = [] @@ -2042,20 +2044,30 @@ class ListChoice(ValueSpec): value.append(key) return value + def validate_datatype(self, value, varprefix): self.load_elements() + if type(value) != list: raise MKUserError(varprefix, _("The datatype must be list, but is %s") % type_name(value)) - d = dict(self._elements) + for v in value: - if v not in d: + if self._value_is_invalid(v): raise MKUserError(varprefix, _("%s is not an allowed value") % v) + def validate_value(self, value, varprefix): if not self._allow_empty and not value: raise MKUserError(varprefix, _('You have to select at least one element.')) ValueSpec.custom_validate(self, value, varprefix) + + def _value_is_invalid(self, value): + d = dict(self._elements) + return value not in d + + + # A alternative way of editing list choices class MultiSelect(ListChoice): def __init__(self, **kwargs): @@ -2118,6 +2130,10 @@ class DualListChoice(ListChoice): html.write_text(_("There are no elements for selection.")) return + # Use values from HTTP request in complain mode + if value is None: + value = self.from_html_vars(varprefix) + selected = [] unselected = [] if self._custom_order: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d9c7d7f..91b338d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10370,6 +10370,10 @@ def mode_users(phase): else: html.i(_("none")) + #table.cell(_("Sites")) + #html.write(vs_authorized_sites().value_to_text(user.get("authorized_sites", + # vs_authorized_sites().default_value()))) + # notifications if not load_configuration_settings().get("enable_rulebased_notifications"): table.cell(_("Notifications")) @@ -10501,6 +10505,8 @@ def mode_edit_user(phase): if cmk.is_managed_edition(): vs_customer = managed.vs_customer() + vs_sites = vs_authorized_sites() + if phase == "action": if not html.check_transaction(): return "users" @@ -10583,6 +10589,14 @@ def mode_edit_user(phase): elif "customer" in user_attrs: del user_attrs["customer"] + authorized_sites = vs_sites.from_html_vars("authorized_sites") + vs_sites.validate_value(authorized_sites, "authorized_sites") + + if authorized_sites is not None: + user_attrs["authorized_sites"] = authorized_sites + elif "authorized_sites" in user_attrs: + del user_attrs["authorized_sites"] + # Roles user_attrs["roles"] = filter(lambda role: html.get_checkbox("role_" + role), roles.keys()) @@ -10687,6 +10701,11 @@ def mode_edit_user(phase): html.help(vs_customer.help()) + forms.section(vs_sites.title()) + vs_sites.render_input("authorized_sites", + user.get("authorized_sites", vs_sites.default_value())) + html.help(vs_sites.help()) + custom_user_attributes('ident') forms.header(_("Security")) @@ -10926,6 +10945,24 @@ def mode_edit_user(phase): html.end_form() +def vs_authorized_sites(): + return Alternative( + title = _("Authorized sites"), + help = _("The sites the user is authorized to see in the GUI."), + default_value = None, + style = "dropdown", + elements = [ + FixedValue(None, + title = _("All sites"), + totext = _("May see all sites"), + ), + DualListChoice( + title = _("Specific sites"), + choices = config.site_choices, + ), + ], + ) + def generate_wato_users_elements_function(none_value, only_contacts = False): def get_wato_users(nv): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 8bf310c..fbf56ea 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4473,7 +4473,7 @@ class ActivateChanges(object): # these sites are shown on activation page and get change entries # added during WATO changes. def _activation_sites(self): - return [ (site_id, site) for site_id, site in config.configured_sites() + return [ (site_id, site) for site_id, site in config.user.authorized_sites().items() if config.site_is_local(site_id) or site.get("replication") ]

7 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017