Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

[CMK-1730] - initial commit of new Windows Agent

by Sergey Kipnis

Module: check_mk Branch: master Commit: d23343b97f8ce104e8f51b34bd0040cb13ee8a70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d23343b97f8ce1… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu Feb 28 14:04:41 2019 +0100 [CMK-1730] - initial commit of new Windows Agent Change-Id: I375d03193d5559042f0d7445de74df14e7433710 --- .gitignore | 1 + .gitmodules | 0 .../dependencies/json/json-master-3.4.0.tar.gz | Bin 0 -> 4325040 bytes agents/windows/dependencies/json/readme.txt | 1 + agents/windows/dependencies/unpack_all.cmd | 20 + .../dependencies/yaml-cpp/yaml-cpp-master.tar.gz | Bin 0 -> 1352201 bytes agents/wnx/.gitignore | 12 + agents/wnx/.vscode/settings.json | 6 + agents/wnx/bin/readme.txt | 1 + agents/wnx/bin/run_all.cmd | 5 + agents/wnx/bin/test_service.cmd | 26 + agents/wnx/build_release.cmd | 81 + agents/wnx/build_watest.cmd | 30 + agents/wnx/call_deploy.cmd | 4 + agents/wnx/call_unit_tests.cmd | 35 + agents/wnx/call_unit_tests_quick.cmd | 1 + agents/wnx/doc/ExternalTransport.txt | 71 + agents/wnx/doc/InternalTransport.txt | 137 ++ agents/wnx/doc/readme.txt | 1 + agents/wnx/include/readme.txt | 1 + agents/wnx/include/tools/_kbd.h | 17 + agents/wnx/include/tools/_misc.h | 577 +++++++ agents/wnx/include/tools/_process.h | 323 ++++ agents/wnx/include/tools/_raii.h | 70 + agents/wnx/include/tools/_tgt.h | 68 + agents/wnx/include/tools/_xdbg.h | 83 + agents/wnx/include/tools/_xlog.h | 1215 +++++++++++++++ agents/wnx/install/.gitignore | 2 + agents/wnx/install/InstallFolderDialog.wxs | 33 + agents/wnx/install/InstallMainDialog.wxs | 86 + agents/wnx/install/Product.wxs | 407 +++++ agents/wnx/install/bld_msi.cmd | 33 + agents/wnx/install/faq.txt | 10 + agents/wnx/install/install.sln | 25 + agents/wnx/install/install.wixproj | 67 + agents/wnx/install/msbld.cmd | 5 + agents/wnx/install/readme-wix.txt | 21 + agents/wnx/install/readme.txt | 19 + agents/wnx/install/resources/GPL-V2.rtf | 342 ++++ agents/wnx/install/resources/check_mk.dat | 1 + agents/wnx/install/resources/check_mk.yml | 362 +++++ agents/wnx/install/resources/faq.txt | 10 + agents/wnx/microservice/microservice.cpp | Bin 0 -> 19010 bytes agents/wnx/microservice/microservice.sln | 31 + agents/wnx/microservice/microservice.vcxproj | 176 +++ .../wnx/microservice/microservice.vcxproj.filters | 30 + agents/wnx/microservice/pch.cpp | Bin 0 -> 430 bytes agents/wnx/microservice/pch.h | Bin 0 -> 1262 bytes agents/wnx/microservice/readme.txt | 1 + agents/wnx/openhardwaremonitor-clean.cmd | 23 + agents/wnx/prepare_to_tests.cmd | 35 + agents/wnx/readme.txt | 15 + agents/wnx/src/check_mk_service.vcxproj | 280 ++++ agents/wnx/src/check_mk_service.vcxproj.filters | 40 + agents/wnx/src/check_service.cmd | 4 + agents/wnx/src/common/cfg_info.cpp | 13 + agents/wnx/src/common/cfg_info.h | 168 ++ agents/wnx/src/common/cfg_yaml.h | 135 ++ agents/wnx/src/common/cmdline_info.h | 88 ++ agents/wnx/src/common/datablock.h | 44 + agents/wnx/src/common/mailslot_transport.h | 506 ++++++ agents/wnx/src/common/readme.txt | 2 + agents/wnx/src/common/version.h | 7 + agents/wnx/src/common/wtools.cpp | 1398 +++++++++++++++++ agents/wnx/src/common/wtools.h | 928 +++++++++++ agents/wnx/src/engine/asio.h | Bin 0 -> 1546 bytes agents/wnx/src/engine/async_answer.cpp | 150 ++ agents/wnx/src/engine/async_answer.h | 124 ++ agents/wnx/src/engine/cap.cpp | 155 ++ agents/wnx/src/engine/cap.h | 21 + agents/wnx/src/engine/carrier.cpp | 202 +++ agents/wnx/src/engine/carrier.h | 249 +++ agents/wnx/src/engine/cfg.cpp | 974 ++++++++++++ agents/wnx/src/engine/cfg.h | 762 +++++++++ agents/wnx/src/engine/cfg_details.h | 378 +++++ agents/wnx/src/engine/cma_core.cpp | Bin 0 -> 41424 bytes agents/wnx/src/engine/cma_core.h | 657 ++++++++ agents/wnx/src/engine/cvt.cpp | 34 + agents/wnx/src/engine/cvt.h | 55 + agents/wnx/src/engine/engine.vcxproj | 512 ++++++ agents/wnx/src/engine/engine.vcxproj.filters | 404 +++++ agents/wnx/src/engine/eventlog/eventlogbase.cpp | 76 + agents/wnx/src/engine/eventlog/eventlogbase.h | 162 ++ agents/wnx/src/engine/eventlog/eventlogstd.cpp | 345 ++++ agents/wnx/src/engine/eventlog/eventlogstd.h | 86 + agents/wnx/src/engine/eventlog/eventlogvista.cpp | 470 ++++++ agents/wnx/src/engine/eventlog/eventlogvista.h | 91 ++ agents/wnx/src/engine/external_port.cpp | 156 ++ agents/wnx/src/engine/external_port.h | 248 +++ agents/wnx/src/engine/glob_match.h | 159 ++ agents/wnx/src/engine/groups.cpp | 376 +++++ agents/wnx/src/engine/logger.cpp | 310 ++++ agents/wnx/src/engine/logger.h | Bin 0 -> 43188 bytes agents/wnx/src/engine/on_start.cpp | 110 ++ agents/wnx/src/engine/on_start.h | 29 + agents/wnx/src/engine/provider_api.h | 60 + agents/wnx/src/engine/providers/check_mk.cpp | 68 + agents/wnx/src/engine/providers/check_mk.h | 32 + agents/wnx/src/engine/providers/df.cpp | 110 ++ agents/wnx/src/engine/providers/df.h | 33 + agents/wnx/src/engine/providers/fileinfo.cpp | 492 ++++++ agents/wnx/src/engine/providers/fileinfo.h | 40 + agents/wnx/src/engine/providers/fileinfo_details.h | 87 ++ agents/wnx/src/engine/providers/internal.cpp | 271 ++++ agents/wnx/src/engine/providers/internal.h | 193 +++ agents/wnx/src/engine/providers/logwatch_event.cpp | 464 ++++++ agents/wnx/src/engine/providers/logwatch_event.h | 151 ++ .../src/engine/providers/logwatch_event_details.h | 24 + agents/wnx/src/engine/providers/mem.cpp | 47 + agents/wnx/src/engine/providers/mem.h | 32 + agents/wnx/src/engine/providers/mrpe.cpp | 309 ++++ agents/wnx/src/engine/providers/mrpe.h | 124 ++ agents/wnx/src/engine/providers/ohm.cpp | 61 + agents/wnx/src/engine/providers/ohm.h | 45 + .../wnx/src/engine/providers/p_perf_counters.cpp | 227 +++ agents/wnx/src/engine/providers/p_perf_counters.h | 70 + agents/wnx/src/engine/providers/plugins.cpp | 114 ++ agents/wnx/src/engine/providers/plugins.h | 72 + agents/wnx/src/engine/providers/ps.cpp | 316 ++++ agents/wnx/src/engine/providers/ps.h | 37 + agents/wnx/src/engine/providers/services.cpp | 147 ++ agents/wnx/src/engine/providers/services.h | 32 + agents/wnx/src/engine/providers/skype.cpp | 172 ++ agents/wnx/src/engine/providers/skype.h | 53 + agents/wnx/src/engine/providers/spool.cpp | 143 ++ agents/wnx/src/engine/providers/spool.h | 46 + agents/wnx/src/engine/providers/system_time.cpp | 28 + agents/wnx/src/engine/providers/system_time.h | 32 + agents/wnx/src/engine/providers/wmi.cpp | 305 ++++ agents/wnx/src/engine/providers/wmi.h | 122 ++ agents/wnx/src/engine/read_file.h | 80 + agents/wnx/src/engine/readme.txt | 3 + agents/wnx/src/engine/section_header.h | 139 ++ agents/wnx/src/engine/service_api.cpp | 126 ++ agents/wnx/src/engine/service_api.h | 27 + agents/wnx/src/engine/service_processor.cpp | 380 +++++ agents/wnx/src/engine/service_processor.h | 640 ++++++++ agents/wnx/src/engine/stdafx.cpp | Bin 0 -> 442 bytes agents/wnx/src/engine/stdafx.h | Bin 0 -> 1148 bytes agents/wnx/src/engine/stdafx_defines.h | Bin 0 -> 1624 bytes agents/wnx/src/engine/unpack_packs.cmd | 36 + agents/wnx/src/engine/windows_service_api.cpp | 354 +++++ agents/wnx/src/engine/windows_service_api.h | 49 + agents/wnx/src/install/readme.txt | 1 + agents/wnx/src/lwa/Configurable.h | 294 ++++ agents/wnx/src/lwa/ConfigurableTrash.h | 11 + agents/wnx/src/lwa/Configuration.cpp | 1058 +++++++++++++ agents/wnx/src/lwa/Configuration.h | 98 ++ agents/wnx/src/lwa/SettingsCollector.cc | 25 + agents/wnx/src/lwa/SettingsCollector.h | 147 ++ agents/wnx/src/lwa/stringutil.cpp | 324 ++++ agents/wnx/src/lwa/stringutil.h | 363 +++++ agents/wnx/src/lwa/types.cc | 300 ++++ agents/wnx/src/lwa/types.h | 466 ++++++ agents/wnx/src/lwa/win_error.cc | 47 + agents/wnx/src/lwa/win_error.h | 38 + agents/wnx/src/main/check_mk_service.cpp | Bin 0 -> 9140 bytes agents/wnx/src/main/check_mk_service.h | Bin 0 -> 2574 bytes agents/wnx/src/main/pch.cpp | Bin 0 -> 430 bytes agents/wnx/src/main/pch.h | Bin 0 -> 730 bytes agents/wnx/src/main/readme.txt | 1 + agents/wnx/src/player/pch.cpp | 5 + agents/wnx/src/player/pch.h | 23 + agents/wnx/src/player/player.h | 369 +++++ agents/wnx/src/player/player_api.h | 23 + agents/wnx/src/player/plugin_player.cpp | 344 ++++ agents/wnx/src/player/plugin_player.vcxproj | 240 +++ .../wnx/src/player/plugin_player.vcxproj.filters | 36 + agents/wnx/src/player/readme.txt | 1 + agents/wnx/src/player/test/.gitignore | 3 + agents/wnx/src/player/test/mk_inventory_test.vbs | 375 +++++ agents/wnx/src/player/test/readme.txt | 3 + agents/wnx/src/player/test/summary.output | 5 + agents/wnx/src/player/test/test_plugin.cmd | 4 + agents/wnx/src/player/test/test_plugin.output | 2 + agents/wnx/src/player/test/test_plugin2.bat | 3 + agents/wnx/src/player/test/test_plugin2.output | 3 + agents/wnx/src/player/test/write_dbg.exe | Bin 0 -> 85504 bytes agents/wnx/src/providers/perf_counter/deploy.cmd | 12 + agents/wnx/src/providers/perf_counter/pch.cpp | Bin 0 -> 430 bytes agents/wnx/src/providers/perf_counter/pch.h | Bin 0 -> 744 bytes .../src/providers/perf_counter/perf_counter.cpp | Bin 0 -> 16774 bytes .../perf_counter/provider_perf_counter.vcxproj | 235 +++ .../provider_perf_counter.vcxproj.filters | 30 + agents/wnx/src/providers/readme.txt | 1 + agents/wnx/src/snippets/CreateProcess.cpp | 127 ++ agents/wnx/src/snippets/asio_liste_socket.cpp | 188 +++ agents/wnx/src/snippets/assorted.h | 8 + agents/wnx/src/snippets/protected_fields.h | 93 ++ agents/wnx/src/tests/pch.cpp | Bin 0 -> 430 bytes agents/wnx/src/tests/pch.h | Bin 0 -> 1262 bytes agents/wnx/src/tests/tests.cpp | 28 + agents/wnx/src/tests/tests.sln | 31 + agents/wnx/src/tests/tests.vcxproj | 192 +++ agents/wnx/src/tests/tests.vcxproj.filters | 33 + agents/wnx/src/updater/readme.txt | 1 + agents/wnx/start_wmi.cmd | 15 + agents/wnx/test_files/cap/plugins.test.cap | Bin 0 -> 17533 bytes agents/wnx/test_files/config/check_mk.example.ini | 222 +++ .../test_files/config/check_mk.fileinfo.test.ini | 6 + .../wnx/test_files/config/check_mk.global.test.ini | 71 + .../test_files/config/check_mk.logfiles.test.ini | 30 + .../test_files/config/check_mk.logwatch.test.ini | 28 + .../wnx/test_files/config/check_mk.mrpe.test.ini | 38 + .../wnx/test_files/config/check_mk.old.example.yml | 322 ++++ .../config/check_mk.plugins_local.test.ini | 28 + agents/wnx/test_files/config/check_mk.ps.test.ini | 6 + agents/wnx/test_files/config/check_mk.test.ini | 222 +++ agents/wnx/test_files/config/check_mk.test.out | 245 +++ .../test_files/config/check_mk.winperf.test.ini | 9 + .../wnx/test_files/config/check_mk_dev.example.yml | 193 +++ agents/wnx/test_files/config/check_mk_dev.yml | 286 ++++ .../wnx/test_files/config/check_mk_dev_default.yml | 101 ++ .../test_files/config/check_mk_dev_malformed.yml | 155 ++ .../wnx/test_files/config/check_mk_dev_minimum.yml | 5 + .../config/check_mk_dev_unit_testing.yml | 160 ++ .../wnx/test_files/config/check_mk_dev_utf16.yml | Bin 0 -> 7262 bytes .../config/modular/.safe_config/global.yml | 104 ++ .../config/modular/.safe_config/logfiles.yml | 55 + .../config/modular/.safe_config/logwatch.yml | 37 + .../config/modular/.safe_config/main.yml | 16 + .../config/modular/.safe_config/other.yml | 110 ++ .../test_files/config/modular/.safe_config/ps.yml | 4 + .../config/modular/.safe_config/winperf.yml | 13 + agents/wnx/test_files/config/modular/global.yml | 104 ++ agents/wnx/test_files/config/modular/logfiles.yml | 55 + agents/wnx/test_files/config/modular/logwatch.yml | 37 + agents/wnx/test_files/config/modular/main.yml | 26 + agents/wnx/test_files/config/modular/other.yml | 110 ++ agents/wnx/test_files/config/modular/ps_custom.yml | 4 + agents/wnx/test_files/config/modular/winperf.yml | 13 + agents/wnx/test_files/config/mrpe_checks.cfg | 4 + agents/wnx/test_files/config/readme.txt | 5 + agents/wnx/test_files/ohm/.gitignore | 2 + .../test_files/ohm/cli/OpenHardwareMonitorCLI.exe | Bin 0 -> 12288 bytes .../test_files/ohm/cli/OpenHardwareMonitorLib.dll | Bin 0 -> 262656 bytes agents/wnx/test_files/ohm/cli/readme.txt | 5 + agents/wnx/test_files/ohm/gui/Aga.Controls.dll | Bin 0 -> 149504 bytes .../test_files/ohm/gui/OpenHardwareMonitor.config | 92 ++ .../wnx/test_files/ohm/gui/OpenHardwareMonitor.exe | Bin 0 -> 489984 bytes .../ohm/gui/OpenHardwareMonitor.exe.config | 7 + .../test_files/ohm/gui/OpenHardwareMonitorLib.dll | Bin 0 -> 262656 bytes .../test_files/ohm/gui/OxyPlot.WindowsForms.dll | Bin 0 -> 22016 bytes agents/wnx/test_files/ohm/gui/OxyPlot.dll | Bin 0 -> 373248 bytes agents/wnx/test_files/ohm/gui/readme.txt | 1 + agents/wnx/test_files/ohm/readme.txt | 2 + agents/wnx/test_files/plugins/async20.cmd | 4 + agents/wnx/test_files/plugins/delay0.cmd | 4 + agents/wnx/test_files/plugins/delay120.cmd | 4 + agents/wnx/test_files/plugins/delay3.cmd | 4 + agents/wnx/test_files/plugins/delay5.cmd | 4 + agents/wnx/test_files/sections/test_output.txt | 1643 ++++++++++++++++++++ agents/wnx/test_files/sections/winperf_phydisk.out | 34 + agents/wnx/test_files/shared_public/test.txt | 1 + ...0\271\320\273.\321\202\320\265\321\201\321\202" | 1 + agents/wnx/test_files/unit_test/.gitignore | 3 + agents/wnx/test_files/unit_test/summary.output | 5 + agents/wnx/test_files/unit_test/test_plugin.cmd | 4 + agents/wnx/test_files/unit_test/test_plugin.output | 2 + agents/wnx/test_files/unit_test/test_plugin2.bat | 3 + .../wnx/test_files/unit_test/test_plugin2.output | 3 + agents/wnx/test_files/unit_test/write_dbg.exe | Bin 0 -> 85504 bytes agents/wnx/test_files/work/bin/readme.txt | 1 + agents/wnx/test_files/work/plugins/readme.txt | 1 + agents/wnx/test_files/work/providers/readme.txt | 1 + agents/wnx/test_files/work/utils/readme.txt | 1 + agents/wnx/wamain.sln | 105 ++ agents/wnx/watest/check_watest.cmd | 11 + agents/wnx/watest/fileout.dat | 1 + agents/wnx/watest/pch.cpp | Bin 0 -> 430 bytes agents/wnx/watest/pch.h | Bin 0 -> 1754 bytes agents/wnx/watest/temp.check.out | 141 ++ agents/wnx/watest/test-cap.cpp | Bin 0 -> 766 bytes agents/wnx/watest/test-carrier.cpp | Bin 0 -> 11980 bytes agents/wnx/watest/test-cvt.cpp | Bin 0 -> 46526 bytes agents/wnx/watest/test-eventlog.cpp | Bin 0 -> 4620 bytes agents/wnx/watest/test-external-port.cpp | Bin 0 -> 7302 bytes agents/wnx/watest/test-log.cpp | Bin 0 -> 23540 bytes agents/wnx/watest/test-mrpe.cpp | Bin 0 -> 12154 bytes agents/wnx/watest/test-ohm.cpp | Bin 0 -> 8054 bytes agents/wnx/watest/test-player-cmdline.cpp | Bin 0 -> 1310 bytes agents/wnx/watest/test-player.cpp | Bin 0 -> 24778 bytes agents/wnx/watest/test-plugin.cpp | Bin 0 -> 72260 bytes agents/wnx/watest/test-section_fileinfo.cpp | Bin 0 -> 22358 bytes agents/wnx/watest/test-section_logwatchevent.cpp | Bin 0 -> 36600 bytes agents/wnx/watest/test-section_providers.cpp | Bin 0 -> 12216 bytes agents/wnx/watest/test-section_ps.cpp | Bin 0 -> 12742 bytes agents/wnx/watest/test-section_wmi.cpp | Bin 0 -> 27976 bytes agents/wnx/watest/test-service-processor.cpp | Bin 0 -> 3994 bytes agents/wnx/watest/test-service.cpp | Bin 0 -> 12244 bytes agents/wnx/watest/test-skype.cpp | Bin 0 -> 4756 bytes agents/wnx/watest/test-spool.cpp | Bin 0 -> 9938 bytes agents/wnx/watest/test-tools.cpp | Bin 0 -> 19014 bytes agents/wnx/watest/test-winperf.cpp | Bin 0 -> 15432 bytes agents/wnx/watest/test-wtools.cpp | Bin 0 -> 12684 bytes agents/wnx/watest/test-yaml.cpp | Bin 0 -> 47942 bytes agents/wnx/watest/watest.cpp | Bin 0 -> 4782 bytes agents/wnx/watest/watest.vcxproj | 345 ++++ agents/wnx/watest/watest.vcxproj.filters | 137 ++ buildscripts/Jenkinsfile | 66 + wnx_build.cmd | 2 + 301 files changed, 32891 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d23343b97f…

5 years, 3 months

7225 Livestatus proxy: Transport site connect error to GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e9a34f869fcdd72ddf2a02f6a62f802efa8fd9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e9a34f869fcdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 09:03:02 2019 +0100 7225 Livestatus proxy: Transport site connect error to GUI Instead of always showing a plain "Site connection not initiated yet" message, the GUI is now able to show a little more detailed connection error messages from the livestatus proxy. This should make debugging of connection errors a little easier. Change-Id: I2b68fa24288d24d60dfb5f9aa7acfb2ed4ae9357 --- .werks/7225 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/7225 b/.werks/7225 new file mode 100644 index 0000000..28f2bed --- /dev/null +++ b/.werks/7225 @@ -0,0 +1,13 @@ +Title: Livestatus proxy: Transport site connect error to GUI +Level: 1 +Component: liveproxy +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1551686561 +Class: feature + +Instead of always showing a plain "Site connection not initiated yet" message, +the GUI is now able to show a little more detailed connection error messages +from the livestatus proxy. This should make debugging of connection errors a +little easier.

5 years, 3 months

agent_aws: New check which monitor AWS/RDS limits

by Simon Betz

Module: check_mk Branch: master Commit: 3470b196782b41b8b4c40ab1a888bd82b86064f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3470b196782b41… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 26 10:14:27 2019 +0100 agent_aws: New check which monitor AWS/RDS limits Change-Id: I22d11e0dc09cf7bb189ff409e2794817f933ede0 --- .werks/7104 | 27 +++++++++ agents/special/agent_aws | 61 ++++++++++++++++++- checkman/aws_rds_limits | 40 +++++++++++++ checks/aws_rds_limits | 71 ++++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 90 ++++++++++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 55 +++++++++++++++-- cmk/gui/plugins/wato/datasource_programs.py | 4 +- 7 files changed, 339 insertions(+), 9 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3470b19678…

5 years, 3 months

7192 FIX Network scan: Exclude IPv4 addresses that are configured as addition IPv4 addresses

by Lars Michelsen

Module: check_mk Branch: master Commit: 196078a81c7f7370063a44c844042260468ac27f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=196078a81c7f73… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 13:18:51 2019 +0100 7192 FIX Network scan: Exclude IPv4 addresses that are configured as addition IPv4 addresses The network scan discovered hosts from IPv4 addresses that are configured as additional IPv4 addresses for existing hosts. The scan now completely ignores these IPv4 addresses just like it is done for pirmary IPv4 addresses. Change-Id: Iedee4253ee9a4e652fb5ecf5cd76ffb3932ccfcd --- .werks/7192 | 12 ++++++++++++ cmk/gui/watolib/network_scan.py | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.werks/7192 b/.werks/7192 new file mode 100644 index 0000000..1c3ded9 --- /dev/null +++ b/.werks/7192 @@ -0,0 +1,12 @@ +Title: Network scan: Exclude IPv4 addresses that are configured as addition IPv4 addresses +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551442640 +Class: fix + +The network scan discovered hosts from IPv4 addresses that are configured as additional +IPv4 addresses for existing hosts. The scan now completely ignores these IPv4 addresses +just like it is done for pirmary IPv4 addresses. diff --git a/cmk/gui/watolib/network_scan.py b/cmk/gui/watolib/network_scan.py index 726cdae..fe2c7d0 100644 --- a/cmk/gui/watolib/network_scan.py +++ b/cmk/gui/watolib/network_scan.py @@ -162,8 +162,18 @@ def _mask_bits_to_int(n): # This will not scale well. Do you have a better idea? def _known_ip_addresses(): - addresses = (host.attribute("ipaddress") for host in Host.all().itervalues()) - return [address for address in addresses if address] + addresses = set() + + for host in Host.all().itervalues(): + attributes = host.attributes() + + address = attributes.get("ipaddress") + if address: + addresses.add(address) + + addresses.update(attributes.get("additional_ipv4addresses", [])) + + return addresses def _excludes_by_regexes(addresses, exclude_specs):

5 years, 3 months

7193 FIX Background jobs: Fixed possible "pid" KeyError exception

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b9dcb80bc286b74f355d31c804e7781fce1277d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b9dcb80bc286b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 13:39:22 2019 +0100 7193 FIX Background jobs: Fixed possible "pid" KeyError exception When background jobs terminated during initialization, the status information of the job was missing necessary information which led to exceptions in the status overview of the jobs and the job cleanup code. In case you experienced such an issue in previous versions, you could remove the state files from <tt>var/check_mk/background_jobs/[job]/jobstatus.mk</tt> to temporarily fix the problem. Change-Id: I78c7b176eeb3a7fd9438eca28b979f3b1372f877 --- .werks/7193 | 18 ++++++++++++++ cmk/gui/background_job.py | 41 +++++++++++++++++-------------- cmk/gui/gui_background_job.py | 4 +-- tests/unit/cmk/gui/test_background_job.py | 2 +- 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/.werks/7193 b/.werks/7193 new file mode 100644 index 0000000..91e31f3 --- /dev/null +++ b/.werks/7193 @@ -0,0 +1,18 @@ +Title: Background jobs: Fixed possible "pid" KeyError exception +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1551445523 + +When background jobs terminated during initialization, the status +information of the job was missing necessary information which +led to exceptions in the status overview of the jobs and the +job cleanup code. + +In case you experienced such an issue in previous versions, you +could remove the state files from <tt>var/check_mk/background_jobs/[job]/jobstatus.mk</tt> +to temporarily fix the problem. diff --git a/cmk/gui/background_job.py b/cmk/gui/background_job.py index b493c57..7a6307c 100644 --- a/cmk/gui/background_job.py +++ b/cmk/gui/background_job.py @@ -162,6 +162,7 @@ class BackgroundProcess(BackgroundProcessInterface, multiprocessing.Process): self._logger.verbose( "Initialized background job (Job ID: %s)" % self._job_parameters["job_id"]) self._jobstatus.update_status({ + "pid": self.pid, "state": JobStatus.state_running, }) @@ -309,21 +310,23 @@ class BackgroundJob(object): ]: return False - if "pid" in job_status: - try: - p = psutil.Process(job_status["pid"]) - if job_status["state"] == JobStatus.state_initialized: - # The process was just created, but has/may not been renamed yet - # Additionally it has no open file handle to the status file - # The _is_correct_process check will fail in this gray area - # We consider this scenario as OK, if the start time was recent enough - if time.time() - job_status["started"] < 5: # 5 seconds - return True - - if self._is_correct_process(job_status, p): + if job_status["pid"] is None: + return False + + try: + p = psutil.Process(job_status["pid"]) + if job_status["state"] == JobStatus.state_initialized: + # The process was just created, but has/may not been renamed yet + # Additionally it has no open file handle to the status file + # The _is_correct_process check will fail in this gray area + # We consider this scenario as OK, if the start time was recent enough + if time.time() - job_status["started"] < 5: # 5 seconds return True - except (psutil.NoSuchProcess, psutil.AccessDenied): - return False + + if self._is_correct_process(job_status, p): + return True + except (psutil.NoSuchProcess, psutil.AccessDenied): + return False return False @@ -365,11 +368,11 @@ class BackgroundJob(object): def _terminate_processes(self): job_status = self.get_status() - if not job_status.get("pid"): + if job_status["pid"] is None: return # Send SIGTERM - self._logger.debug("Stopping job using SIGTERM \"%s\" (PID: %d)", self._job_id, + self._logger.debug("Stopping job using SIGTERM \"%s\" (PID: %s)", self._job_id, job_status["pid"]) try: process = psutil.Process(job_status["pid"]) @@ -414,7 +417,7 @@ class BackgroundJob(object): status = self._jobstatus.get_status() # Some dynamic stuff - if status.get("state", "") == JobStatus.state_running: + if status.get("state", "") == JobStatus.state_running and status["pid"] is not None: try: p = psutil.Process(status["pid"]) if not self._is_correct_process(status, p): @@ -464,7 +467,7 @@ class BackgroundJob(object): if p.exitcode == 0: job_status = self.get_status() - self._logger.debug("Started job \"%s\" (PID: %s)", self._job_id, job_status.get("pid")) + self._logger.debug("Started job \"%s\" (PID: %s)", self._job_id, job_status["pid"]) def _prepare_work_dir(self): self._delete_work_dir() @@ -474,7 +477,6 @@ class BackgroundJob(object): try: p = self._background_process_class(job_parameters) p.start() - self._jobstatus.update_status({"pid": p.pid}) except Exception as e: self._logger.error("Error while starting subprocess: %s", e, exc_info=True) os._exit(1) @@ -502,6 +504,7 @@ class JobStatus(object): data.setdefault("state", JobStatus.state_initialized) data.setdefault("duration", 0.0) + data.setdefault("pid", None) data["loginfo"] = {} for field_id, field_path in [("JobProgressUpdate", self._progress_update_path), diff --git a/cmk/gui/gui_background_job.py b/cmk/gui/gui_background_job.py index 489c933..6f73b32 100644 --- a/cmk/gui/gui_background_job.py +++ b/cmk/gui/gui_background_job.py @@ -499,7 +499,7 @@ class JobRenderer(object): job_status["estimated_duration"])) for left, right in [ (_("Runtime"), runtime_info), - (_("PID"), job_status.get("pid", "")), + (_("PID"), job_status["pid"] or ""), (_("Result"), "<br>".join(loginfo["JobResult"])), ]: if right is None: @@ -622,7 +622,7 @@ class JobRenderer(object): html.td(job_status.get("user", _("Unknown user")), css="job_owner") # PID - html.td(job_status.get("pid", ""), css="job_pid") + html.td(job_status["pid"] or "", css="job_pid") # Druation html.td(cmk.utils.render.timespan(job_status.get("duration", 0)), css="job_runtime") diff --git a/tests/unit/cmk/gui/test_background_job.py b/tests/unit/cmk/gui/test_background_job.py index fb09401..a3f51d2 100644 --- a/tests/unit/cmk/gui/test_background_job.py +++ b/tests/unit/cmk/gui/test_background_job.py @@ -95,7 +95,7 @@ def test_start_job(): assert status["state"] == background_job.JobStatus.state_initialized job.start() - assert job.is_running() + testlib.wait_until(job.is_running, timeout=5, interval=0.1) with pytest.raises(background_job.BackgroundJobAlreadyRunning): job.start()

5 years, 3 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 86716c5d4f60371229e7e407424a8f0bf09a20c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86716c5d4f6037… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 4 08:39:04 2019 +0100 Reserved 20 Werk IDS Change-Id: I55a577c47d751783275006a37a48c7b63508cf11 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1a1c12a..96cf9b5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7224 +7244

5 years, 3 months

Fix linter warnings in testlib

by Lars Michelsen

Module: check_mk Branch: master Commit: e9dde8cbcfc44f23e4c8fb3c6d9d1c6e424bd73b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9dde8cbcfc44f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 21:41:32 2019 +0100 Fix linter warnings in testlib Change-Id: I4a919593e31eba0aabe8ca4ffab1595a7b0220bb --- tests/testlib/__init__.py | 116 +++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e9dde8cbcf…

5 years, 3 months

Reserved 20 Werk IDS

by Moritz Kiemer

Module: check_mk Branch: master Commit: dbf43533c47b7cf283cad469a0a73ddc16b5fc87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbf43533c47b7c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Mar 4 08:14:52 2019 +0100 Reserved 20 Werk IDS Change-Id: I88ef2d6684a6dfc101a38f5b094daa3cb925a343 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3502a49..1a1c12a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7204 +7224

5 years, 3 months

Tests: Wait for livestatus being ready after core restart

by Lars Michelsen

Module: check_mk Branch: master Commit: eef087ccf9d24c591285063a2ce68beaa66ebac3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eef087ccf9d24c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 20:58:05 2019 +0100 Tests: Wait for livestatus being ready after core restart Change-Id: Ifdaa0020c1545cb62ea3323841c509efebb4c406 --- .../cmk_base/test_services_prediction.py | 3 +- tests/testlib/__init__.py | 53 +++++++++++++--------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index 0146868..126051a 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -27,7 +27,8 @@ def cfg_setup(request, web, site): site.write_file( "var/check_mk/rrd/test-prediction/CPU_load.info", file("%s/tests/integration/cmk_base/test-files/CPU_load.info" % repo_path()).read()) - site.omd("restart", "cmc") + + site.restart_core() create_linux_test_host(request, web, site, "test-prediction") diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 633f318..b98d3d2 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -304,6 +304,37 @@ class Site(object): live.set_timeout(2) return live + def wait_for_core_reloaded(self, after): + # Activating changes can involve an asynchronous(!) monitoring + # core restart/reload, so e.g. querying a Livestatus table immediately + # might not reflect the changes yet. Ask the core for a successful reload. + def config_reloaded(): + import livestatus + try: + new_t = self.live.query_value("GET status\nColumns: program_start\n") + except livestatus.MKLivestatusException: + # Seems like the socket may vanish for a short time. Keep waiting in case + # of livestatus (connection) issues... + return False + + return new_t > after + + reload_time, timeout = time.time(), 10 + while not config_reloaded(): + if time.time() > reload_time + timeout: + raise Exception("Config did not update within %d seconds" % timeout) + time.sleep(0.2) + + assert config_reloaded() + + def restart_core(self): + # Remember the time for the core reload check and wait a second because the program_start + # is reported as integer and wait_for_core_reloaded() compares with ">". + before_restart = time.time() + time.sleep(1) + self.omd("restart", "core") + self.wait_for_core_reloaded(before_restart) + def send_host_check_result(self, hostname, state, output, expected_state=None): if expected_state is None: expected_state = state @@ -1632,27 +1663,7 @@ class CMKWebSession(WebSession): "Failed to activate %s: %r" % (site_id, status) assert status["_time_ended"] > time_started - # Activating changes can involve an asynchronous(!) monitoring - # core restart/reload, so e.g. querying a Livestatus table immediately - # might not reflect the changes yet. Ask the core for a successful reload. - def config_reloaded(): - import livestatus - try: - new_t = self.site.live.query_value("GET status\nColumns: program_start\n") - except livestatus.MKLivestatusException: - # Seems like the socket may vanish for a short time. Keep waiting in case - # of livestatus (connection) issues... - return False - - return new_t > old_t - - reload_time, timeout = time.time(), 10 - while not config_reloaded(): - if time.time() > reload_time + timeout: - raise Exception("Config did not update within %d seconds" % timeout) - time.sleep(0.2) - - assert config_reloaded() + self.site.wait_for_core_reloaded(old_t) def get_regular_graph(self, hostname, service_description, graph_index, expect_error=False): result = self._api_request(

5 years, 4 months

7191 FIX get_all_hosts: Users with read but not write access to all hosts/ folders can now use this call

by Lars Michelsen

Module: check_mk Branch: master Commit: 664a20212837fc226e1c4d4544eeeab1ec7e5009 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=664a20212837fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 14:12:09 2019 +0100 7191 FIX get_all_hosts: Users with read but not write access to all hosts/folders can now use this call There was a bug in the permission checking logic of the get_all_hosts API call. In case one tried to create a "read only" for exporting all hosts, this was not possible without the write permission. The following permissions should be needed: <ul> <li>Use Multisite at all</li> <li>Access to Web-API</li> <li>Use WATO</li> <li>Read access to all hosts and folders</li> </ul> In previous versions the permission "Write access to all hosts and folders" was needed in addition. Change-Id: I1a14cce597ec727f87f336fd12a4210c0eaa489e --- .werks/7191 | 25 +++++++++++++++++++++++++ cmk/gui/watolib/hosts_and_folders.py | 10 +++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.werks/7191 b/.werks/7191 new file mode 100644 index 0000000..ff941cf --- /dev/null +++ b/.werks/7191 @@ -0,0 +1,25 @@ +Title: get_all_hosts: Users with read but not write access to all hosts/folders can now use this call +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1551431255 + +There was a bug in the permission checking logic of the get_all_hosts API call. In case one +tried to create a "read only" for exporting all hosts, this was not possible without the write +permission. + +The following permissions should be needed: + +<ul> +<li>Use Multisite at all</li> +<li>Access to Web-API</li> +<li>Use WATO</li> +<li>Read access to all hosts and folders</li> +</ul> + +In previous versions the permission "Write access to all hosts and folders" was needed in +addition. diff --git a/cmk/gui/watolib/hosts_and_folders.py b/cmk/gui/watolib/hosts_and_folders.py index 290b2f2..0046c4c 100644 --- a/cmk/gui/watolib/hosts_and_folders.py +++ b/cmk/gui/watolib/hosts_and_folders.py @@ -1149,8 +1149,9 @@ class CREFolder(BaseFolder): return host def _user_needs_permission(self, how): - if config.user.may("wato.all_folders"): + if how == "write" and config.user.may("wato.all_folders"): return + if how == "read" and config.user.may("wato.see_all_folders"): return @@ -1976,8 +1977,11 @@ class CREHost(WithPermissionsAndAttributes): return self.folder().groups(self) def _user_needs_permission(self, how): - if config.user.may("wato.all_folders"): - return True + if how == "write" and config.user.may("wato.all_folders"): + return + + if how == "read" and config.user.may("wato.see_all_folders"): + return if how == "write": config.user.need_permission("wato.edit_hosts")

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019