[checkmk-commits] [tribe29/checkmk] 687044: Prepare for discovered service labels

Branch: refs/heads/1.6.0 Home: https://github.com/tribe29/checkmk Commit: 687044241258969a30157ee644fc7f16f391cdf3 https://github.com/tribe29/checkmk/commit/687044241258969a30157ee644fc7f16f… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk/utils/labels.py M cmk_base/discovered_labels.py M tests/unit/cmk/utils/test_labels.py M tests/unit/cmk_base/test_discovered_labels.py Log Message: ----------- Prepare for discovered service labels * Add new class ServiceLabel: This represents a service label in the Checkmk code during execution. This class is meant to be exposed to the check API. It will be usable in the discovery function to create a new label like this: ServiceLabel(u"my_label_key", u"my_value") * The labels of all services per host are stored in a single file in the path var/check_mk/discovered_service_labels. This file is managed by the DiscoveredServiceLabelsStore class. * During the service discovery in Checkmk base code, the class DiscoveredServiceLabelsOfHost will be used to collect all discovered labels and hand them over to DiscoveredServiceLabelsStore for persistance. CMK-1816 Change-Id: I918daf1890abe922799485db52a0523228ce3ebf Commit: 2fa19aa1b885b55b49df8f84f6d391f3e241078d https://github.com/tribe29/checkmk/commit/2fa19aa1b885b55b49df8f84f6d391f3e… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk/gui/watolib/rulesets.py M cmk/utils/labels.py M cmk_base/config.py M tests/unit/cmk/utils/test_labels.py M tests/unit/cmk_base/test_config.py Log Message: ----------- Export discovered service labels to core Moved the effective service label calculation to the LabelManager helper class of the ConfigCache. All discovered labels are now written to the core configuration which makes them usable in the GUI. CMK-1816 Change-Id: Id6c93e1a7490518477df5b6cc8adc8d548a68d76 Commit: 797904907be9477abd79a812a65dc160991de07a https://github.com/tribe29/checkmk/commit/797904907be9477abd79a812a65dc1609… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/config.py M cmk_base/discovery.py Log Message: ----------- Minor cleanups * Turn discovery helper functions into iterators * Add some type annotations and fix some others CMK-1816 Change-Id: I9d2a2cad17a67ab29044089aa00644cb615ca854 Commit: 381810bb4f622b607be5f46892ddbc359eea77f0 https://github.com/tribe29/checkmk/commit/381810bb4f622b607be5f46892ddbc359… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/check_table.py M cmk_base/discovery.py Log Message: ----------- Wrap discovery results into DiscoveredService objects Right after receiving the discovered service tuples from the discovery functions the tuples are validated and converted into DiscoveredService objects for easier handling in the discovery function call stack. Spread a lot of type hints on the way. CMK-1816 Change-Id: I4fab7754397032a98086ddb75dc1582f3c420f49 Commit: 3a0cae6f32b232734f7500bd4f2573d26dad0eeb https://github.com/tribe29/checkmk/commit/3a0cae6f32b232734f7500bd4f2573d26… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/check_table.py M cmk_base/discovery.py Log Message: ----------- Spread use of DiscoveredService object Cleanup some unpacking of discovered service attributes into tuples and use the DiscoveredService objects instead. CMK-1816 Change-Id: Iafeebd78e48747ec7d361cb5e6a78dd7fe2dadaf Commit: 6516147de214d30ea441dc8f68745a095be33503 https://github.com/tribe29/checkmk/commit/6516147de214d30ea441dc8f68745a095… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/discovery.py Log Message: ----------- set_autochecks_of: Extract cluster / real host handling CMK-1816 Change-Id: I603771717330db9bb3408006e9c4673f07308ec0 Commit: 7a925be96158387bf1b8f4f69e9a2d22c6c0f25f https://github.com/tribe29/checkmk/commit/7a925be96158387bf1b8f4f69e9a2d22c… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/automations/check_mk.py Log Message: ----------- Host rename: Replace ancient rewrite with simple file rename Change-Id: Ie90b90f451b4c12853b8d02680b721bf16e8e64e Commit: fa4dea845a241de0502179b62a7dc79caae4f9d1 https://github.com/tribe29/checkmk/commit/fa4dea845a241de0502179b62a7dc79ca… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/automations/check_mk.py M tests/integration/cmk_base/test_automations.py M tests/unit/cmk_base/test_unit_automations.py Log Message: ----------- Remove ancient get-autochecks automation call Change-Id: I5670bb5dddf16c9475c11c7235d76530483a8829 Commit: 12396f91e0e5d0ba276b0e8668a33c7455540cec https://github.com/tribe29/checkmk/commit/12396f91e0e5d0ba276b0e8668a33c745… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/automations/check_mk.py M cmk_base/check_table.py M cmk_base/discovery.py M tests/integration/cmk_base/test_automations.py M tests/unit/cmk_base/test_autochecks.py Log Message: ----------- Spread use of DiscoveredService object Make autocheck persistance functions also work with the list of discovered service instead of different specific dict and list based structures that were all similar, but not exactly the same. CMK-1816 Change-Id: I311c39db9f8865b472b5da3acb709d9efec346d9 Commit: 8d1cc61996f0d70aa8d55e1a5e63ea48caa051b2 https://github.com/tribe29/checkmk/commit/8d1cc61996f0d70aa8d55e1a5e63ea48c… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/discovery.py Log Message: ----------- Simplify discovered services output calculation Change-Id: Ibad4a32d3860829048315e97bb54a05a7733ba20 Commit: d64db2291adff6886166d2b8e924ebfc14c0c2d9 https://github.com/tribe29/checkmk/commit/d64db2291adff6886166d2b8e924ebfc1… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/discovery.py A tests/unit/cmk_base/test_discovery.py Log Message: ----------- Make DiscoveredService comparable to others This prepares the way to cleanup all the different comparison data structures during discovered service processing, e.g. used for preventing duplicate services. CMK-1816 Change-Id: I9d2b589f6a674e54defc6acd6379d88dc9e79d59 Commit: 0ff1454a852b848f652c2a917959c5bab4c9ef10 https://github.com/tribe29/checkmk/commit/0ff1454a852b848f652c2a917959c5bab… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/discovery.py Log Message: ----------- Minor cleanup: Reduce nesting Change-Id: I3f01ecfc8bd0183822173731a0722a1c07a4917e Commit: 550bf8ccd0b15a8a6f9b3e64032d67439dcb6b9b https://github.com/tribe29/checkmk/commit/550bf8ccd0b15a8a6f9b3e64032d67439… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2019-07-15 (Mon, 15 Jul 2019) Changed paths: M cmk_base/check_table.py M cmk_base/discovery.py M tests/unit/cmk_base/test_autochecks.py Log Message: ----------- Autochecks: Use ast parsing instead of hand crafted text parsing This prepares for parsing more flexible data structures from the autocheck file while still being able to keep the logic that the check parameters are not resolved. CMK-1816 Change-Id: I95cb2deff63f1668253e8fe5671bbf5b9a11142f Compare: https://github.com/tribe29/checkmk/compare/3a103468446f...550bf8ccd0b1