[checkmk-commits] [tribe29/checkmk] d3b260: Write rulesets of sample config in new format

Branch: refs/heads/master Home: https://github.com/tribe29/checkmk Commit: d3b260382ea4823c27f3d5d33d6cbc8390f89df0 https://github.com/tribe29/checkmk/commit/d3b260382ea4823c27f3d5d33d6cbc839… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/watolib/__init__.py Log Message: ----------- Write rulesets of sample config in new format CMK-2031 Change-Id: I1563f9356f0a8cd2f2f1d469c3977dded84443d2 Commit: 9c7e2b4150ba0cec1e34df783944036812fccd53 https://github.com/tribe29/checkmk/commit/9c7e2b4150ba0cec1e34df78394403681… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/plugins/webapi/webapi.py M cmk/gui/wato/pages/rulesets.py M cmk/gui/wato/pages/services.py M cmk/gui/watolib/rulesets.py M tests/unit/cmk/gui/watolib/test_gui_rulesets.py Log Message: ----------- WATO: Handle new ruleset format correctly * Make WATO write out the new rule format now * Transform all rulesets to the new format when loading the structures * Change internal representation in Rule() * Rule() now returns the correct format with to_config() Next: The API of Rule() has changed and needs to be change at all call sites now. CMK-2031 Change-Id: I77f427fa752ae2d22d24462371f8f2040874b403 Commit: c6cccd7e7eed63ed535ed0ea357ce04a4504b499 https://github.com/tribe29/checkmk/commit/c6cccd7e7eed63ed535ed0ea357ce04a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/wato/pages/predefined_conditions.py M cmk/gui/wato/pages/rulesets.py M cmk/gui/wato/pages/services.py M cmk/gui/watolib/rulesets.py M cmk/utils/rulesets/tuple_rulesets.py M tests/unit/cmk/gui/watolib/test_gui_rulesets.py Log Message: ----------- Make GUI code work with new Rule API * Replace GUI specific rule matching code with standard rule matcher * Cleanup RuleConditions computation. Move type declaration to watolib module and translate between dict condition representation and WATO runtime RuleCondition format. CMK-2031 Change-Id: Ibf60279b060427f8bb8cc5945c776d82e28b3553 Commit: ae2d3d90efc3cc885a4148c0fde1008f3c8a6eed https://github.com/tribe29/checkmk/commit/ae2d3d90efc3cc885a4148c0fde1008f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/wato/pages/predefined_conditions.py M cmk/gui/watolib/rulesets.py M tests/unit/cmk/gui/watolib/test_gui_rulesets.py Log Message: ----------- Make loading/saving of folders in WATO rulesets work again Change-Id: I14a7bf58a9fbb8620813e255b78255850cee3e53 Commit: 6d9fe32de426c3f4b33abe28d2d7a4427f430db6 https://github.com/tribe29/checkmk/commit/6d9fe32de426c3f4b33abe28d2d7a4427… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/wato/pages/rulesets.py M cmk/gui/watolib/rulesets.py M cmk/utils/rulesets/ruleset_matcher.py M cmk/utils/rulesets/tuple_rulesets.py M cmk_base/config.py M tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py M tests/unit/cmk/utils/rulesets/test_ruleset_transformer.py M tests/unit/cmk/utils/rulesets/test_tuple_rulesets.py Log Message: ----------- Cleanup: Move rule matching code to rule_matcher module * The rule matching logic is now based on dictionary rules. The new match logic has been moved to the dedicated module cmk.utils.rulesets.rule_matcher now. * Using the more flexible RuleMatcher() object instead of a named tuple * Some legacy code still uses the old ruleset matching logic. This is left in tuple_rulesets for the moment. CMK-2031 Change-Id: I1494c240f2b68399046fe0f45e4564022cc4302f Commit: 0a017bd12af0cec2cbf7f45d84f36b333593982d https://github.com/tribe29/checkmk/commit/0a017bd12af0cec2cbf7f45d84f36b333… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/utils/rulesets/ruleset_matcher.py M cmk_base/config.py M tests/unit/cmk/utils/rulesets/test_ruleset_matcher.py M tests/unit/cmk_base/test_config.py Log Message: ----------- Cleanup RulesetMatcher dependencies RulesetMatcher and RulesetOptimizer are located in cmk.utils.rulesets which is not allowed to rely on the cmk_base specific ConfigCache. All dependencies have now been made explicit and need to be handed over at object creation. Ruleset optimizer specific code from ConfigCache has been moved to the RulesetOptizimer. CMK-2031 Change-Id: Ic32a740023068a4cab7b937c08df969b04f2b08b Commit: 04514bf55692ed0d915b2e4bf4a47340e0c464ad https://github.com/tribe29/checkmk/commit/04514bf55692ed0d915b2e4bf4a47340e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/wato/pages/services.py M cmk/gui/watolib/rulesets.py M cmk/utils/rulesets/ruleset_matcher.py Log Message: ----------- Make WATO rule match diagnose work again CMK-2031 Change-Id: Ic27e6135f254387cde3d9c0ac8d88a6e17247780 Commit: 8b8a887931aa661f96524327c2b9d740bb418fbd https://github.com/tribe29/checkmk/commit/8b8a887931aa661f96524327c2b9d740b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/wato/__init__.py M cmk/gui/wato/pages/rulesets.py M cmk/gui/watolib/__init__.py M cmk/gui/watolib/rulesets.py M cmk/gui/watolib/utils.py Log Message: ----------- Fix exception after moving rules; Cleanups * The "item" HTTP variable was not correctly encoded during moving of rules. This lead to an exception after page refresh * The NO_ITEM variable has been cleaned up Change-Id: Ifccd3f685b6c96f3f1b193eb1a21c78dac2db975 Commit: d278e491374a3b62f27194b7d08fc18be6472938 https://github.com/tribe29/checkmk/commit/d278e491374a3b62f27194b7d08fc18be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: A .werks/7348 Log Message: ----------- 7348 FIX Fix rule match diagnose after moving a rule The host/service context was lost when moving a rule from one position to another in a ruleset. This made the page title change to "[Ruleset title] '{}'" instead of "[Ruleset title] '[service description]'". The rule match diagnose did not work correctly in this situation. Change-Id: I04042ea22817a94a23746e7ae299ff307cce6c33 Commit: dd59e267bb2ad2de2b0811eaf304591b01410603 https://github.com/tribe29/checkmk/commit/dd59e267bb2ad2de2b0811eaf304591b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M cmk/gui/wato/pages/rulesets.py Log Message: ----------- Cleanup: Extract rule condition text rendering to dedicated class Change-Id: I2d42247fc123cd5a7ded907646c2b71cae3e7397 Commit: bf1bee575ecd3843945f96abbf1c1674dd8bc5f6 https://github.com/tribe29/checkmk/commit/bf1bee575ecd3843945f96abbf1c1674d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: R cmk/utils/rulesets/rule_matcher.py R tests/unit/cmk/utils/rulesets/test_rule_matcher.py Log Message: ----------- Remove unused rule matcher implementation This was the first (unoptimized) try to build a rule matcher based on the original mongodb query syntax. This did not perform very well. So we decided to drop this approach and extednd the tuple ruleset matcher logic to work with a more flexible condition structure. CMK-2031 Change-Id: I4ced27541904e7539ac5b1ea431b95fb51fc1f70 Commit: 3277332e2e38856dbb517cba5138decdd8228888 https://github.com/tribe29/checkmk/commit/3277332e2e38856dbb517cba5138decdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M tests/integration/cmk_base/test_mgmt_board.py M tests/integration/core/test_active_checks.py M tests/integration/livestatus/test_livestatus.py M tests/integration/notifications/test_unreachable_notifications.py M tests/testlib/__init__.py Log Message: ----------- Fix integration tests Change-Id: I9626a02a4ba46cc27c55a924b3d5959b05f7b5ec Commit: d268bbbe46a4e4d71cf9e420d08f381a4c178a81 https://github.com/tribe29/checkmk/commit/d268bbbe46a4e4d71cf9e420d08f381a4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M checks/azure_agent_info Log Message: ----------- azure_agent_info: clarify parsing of ratelimit Change-Id: I891ab7eb9693fae667775f3f29b131ea1a777e44 Commit: cc8126f35fad7840d03a5cb32021dd3ac0c08999 https://github.com/tribe29/checkmk/commit/cc8126f35fad7840d03a5cb32021dd3ac… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M agents/wnx/src/engine/cma_core.cpp M agents/wnx/src/engine/service_processor.cpp M agents/wnx/src/engine/service_processor.h Log Message: ----------- [CMK-2113] - attempts to re-start cmk-update-agent.exe every kick from monitoring site - minor: improved logging Change-Id: I977980e9a1e02099083ec8c9935a2a63bc6b6de4 Commit: e77fc6149611ed631fa681df90ee677f2ef91677 https://github.com/tribe29/checkmk/commit/e77fc6149611ed631fa681df90ee677f2… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: 2019-05-20 (Mon, 20 May 2019) Changed paths: M agents/wnx/src/common/cfg_info.h M agents/wnx/src/engine/cfg.cpp M agents/wnx/src/engine/providers/mrpe.cpp Log Message: ----------- [CMK-2033] - mrpe basic support fix, predefined names are converted for mrpe too - minor: local refactoring of names - minor: log is more clear Change-Id: Ic7648174efbf6f66c0f1c9d79b8a32b8d0ce8f55 Compare: https://github.com/tribe29/checkmk/compare/e61c5562d873...e77fc6149611