18 Jul
2019
18 Jul
'19
12:10 p.m.
Branch: refs/heads/1.6.0
Home: https://github.com/tribe29/checkmk
Commit: 129c9d8c904b0be81505b609b9e863b26816347f
https://github.com/tribe29/checkmk/commit/129c9d8c904b0be81505b609b9e863b26…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/autochecks.py
M cmk_base/check_table.py
M cmk_base/check_utils.py
M cmk_base/discovery.py
M tests/integration/cmk_base/test_automations.py
M tests/unit/cmk_base/test_autochecks.py
Log Message:
-----------
Move some discovery related things around
* Moved DiscoveredService class to check_utils
* Moved parse_autochecks_file to autochecks module
CMK-1816
Change-Id: I03c5148e30321ab9b352b47e11efda74ebf5a956
Commit: 65ece4be8781d6606345163cb197448b97dc7ab3
https://github.com/tribe29/checkmk/commit/65ece4be8781d6606345163cb197448b9…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/autochecks.py
M cmk_base/automations/check_mk.py
M cmk_base/discovery.py
M cmk_base/modes/check_mk.py
M tests/unit/cmk_base/test_autochecks.py
Log Message:
-----------
Move autocheck related functions to cmk_base.autochecks
CMK-1816
Change-Id: Ibc08b0b6ef1bd31d9972fcd62a85d3052828d378
Commit: 479ba65b4da8a36fd57f2592054ddc9971174b8c
https://github.com/tribe29/checkmk/commit/479ba65b4da8a36fd57f2592054ddc997…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/check_api.py
M cmk_base/check_api_utils.py
M cmk_base/check_utils.py
M cmk_base/discovered_labels.py
M cmk_base/discovery.py
M tests/unit/cmk_base/test_discovered_labels.py
M tests/unit/cmk_base/test_discovery.py
Log Message:
-----------
Discovery functions can now produce service labels
Instead of producing a two element tuple of <tt>(item, parameters)</tt>
to create a new servuce the discovery functions can now provide objects
like this:
C+:
Service(
item="Interface 213",
parameters=None,
service_labels=ServiceLabels(
ServiceLabel(u"check_type", u"network_interface"),
ServiceLabel(u"interface_type", u"uplink"),
)
)
C-:
These objects can be returned / yielded like the tuples before. Both,
the parameters and the service_labels are optional arguments.
This feature is not complete yet. In the next steps the autocheck format
needs to be changed to be more flexible. Then the service labels can be
persisted in the autocheck files and read from them for the core config
creation.
CMK-1816
Change-Id: Ie2ce6704a7742f7f6ff21424b3c3bb7b749357b8
Commit: cd6a9eddbb30f25f8e034317ffb31bdb7f5c7bec
https://github.com/tribe29/checkmk/commit/cd6a9eddbb30f25f8e034317ffb31bdb7…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/autochecks.py
M cmk_base/discovery.py
M tests/unit/cmk_base/test_autochecks.py
Log Message:
-----------
Make autocheck format more flexible
The autocheck entry format has now been changed to be dictionary
based. This makes it possible to extend the data associated with a
service in a more flexible way.
The old autocheck format can still be read. New autochecks will be
written in the new format.
In the next steps we add the discovered service labels as new field
to the autochecks.
CMK-1816
Change-Id: I85c6b561d58eb807430e8a167a7468847d95862f
Commit: d85091b5db49d344c35fd44d8a7be9d690dda51b
https://github.com/tribe29/checkmk/commit/d85091b5db49d344c35fd44d8a7be9d69…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/autochecks.py
M tests/unit/cmk_base/test_autochecks.py
Log Message:
-----------
Write service labels to autochecks
The service_label attribute now holds the disccovered service
labels of a service.
The labels currently already loaded with the autochecks, but not
processed through the system in all cases. This will be added in
the next step
CMK-1816
Change-Id: Ic627123eca981ceb38d7cbaab5f2dc0bab45aeb9
Commit: 79ae6990f7c6a1af194fb8f6960a5750efdb706e
https://github.com/tribe29/checkmk/commit/79ae6990f7c6a1af194fb8f6960a5750e…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/autochecks.py
M cmk_base/automations/check_mk.py
M cmk_base/check_table.py
M cmk_base/check_utils.py
M cmk_base/config.py
M tests/unit/cmk_base/test_autochecks.py
M tests/unit/cmk_base/test_check_table.py
Log Message:
-----------
Propagate autocheck information a bit further
The read_autochecks_of function, the one which resolves the effective
check parameters for later checking, now returns a list of Service
objects instead of tuples.
These objects contain more information about the service as the tuple
before. It already contains the service description and the service
labels.
This is just the first step. We need to continue with this. All places
that work with CheckTable at the moment need to be changed to use this
structure.
CMK-1816
Change-Id: I1a9d3c885374fa4aef8ea075bf3baa2263efc94a
Commit: b7dfcdea55ba34679a20f1caa80b04aab4a9bc3d
https://github.com/tribe29/checkmk/commit/b7dfcdea55ba34679a20f1caa80b04aab…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/check_table.py
Log Message:
-----------
Change CheckTable calculation to use the Service objects
* Static check definitions are now also represented by Service
* Renamed _handle_entry to _handle_service
* Use the service objects in _handle_service
CMK-1816
Change-Id: Ib8041d2fe3399224b213edc961a53cbefdde9d66
Commit: 1f15add3c43df5ff0d2d672714595d1db11b238a
https://github.com/tribe29/checkmk/commit/1f15add3c43df5ff0d2d672714595d1db…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/check_table.py
Log Message:
-----------
Extract clustered services handling
CMK-1816
Change-Id: Ib883dfd2aeead907d0714084a66e67361f1ea60e
Commit: 4ec5230519512bf15867e4257705f686490b6c48
https://github.com/tribe29/checkmk/commit/4ec5230519512bf15867e4257705f6864…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/check_table.py
M cmk_base/check_utils.py
M cmk_base/core_nagios.py
M cmk_base/discovery.py
M tests/unit/cmk_base/test_check_table.py
Log Message:
-----------
Remove service dependency handling from check table
The service dependencies are only relevant for the Nagios core
and currently need to be handled in two situations:
a) The check table needs to be sorted by them
b) They need to be written to the nagios config
It is not necessary to transport them with the check table.
CMK-1816
Change-Id: Ie96661a6c0746e1a512955b892da67b9f105b4a6
Commit: a2e338c1ccaba973f69ddefa3ff57d44883e9d33
https://github.com/tribe29/checkmk/commit/a2e338c1ccaba973f69ddefa3ff57d448…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/check_table.py
M cmk_base/dump_host.py
Log Message:
-----------
Make get_sorted_check_table private
CMK-1816
Change-Id: I3d1adbb17bc1d8bc58d79e62832f9b6181637372
Commit: 36f5ceb93a7e0aa8428873b869388fa3b8f92b4a
https://github.com/tribe29/checkmk/commit/36f5ceb93a7e0aa8428873b869388fa3b…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/check_table.py
M cmk_base/checking.py
Log Message:
-----------
Make get_precompiled_check_table work with Service objects
CMK-1816
Change-Id: I86fd6e016e3dad38e05f28d1a28f4199a7411962
Commit: e4635918b00f32d5260e69fabfe58a90d541891f
https://github.com/tribe29/checkmk/commit/e4635918b00f32d5260e69fabfe58a90d…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/automations/check_mk.py
M cmk_base/check_table.py
M cmk_base/check_utils.py
M cmk_base/core_nagios.py
M cmk_base/discovery.py
M cmk_base/dump_host.py
M tests/unit/cmk_base/test_check_table.py
Log Message:
-----------
Use Service objects as CheckTable values
CMK-1816
Change-Id: I95c31ec044618aee8bad047618cee87954256576
Commit: 50302dea1963d5709f0150eea36b51eee8295a23
https://github.com/tribe29/checkmk/commit/50302dea1963d5709f0150eea36b51eee…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/core_nagios.py
Log Message:
-----------
Cleanup redundant config.get_final_service_description call
CMK-1816
Change-Id: Ifa0928c4ad4ba741cbec37df12f829e6999bab11
Commit: 1c7b9e7f212bb3c344d3a78d77cafcf2e77f1b33
https://github.com/tribe29/checkmk/commit/1c7b9e7f212bb3c344d3a78d77cafcf2e…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/core_config.py
M cmk_base/core_nagios.py
M tests/unit/cmk_base/test_core_config.py
Log Message:
-----------
Hand over Service objects to get_cmk_passive_service_attributes
CMK-1816
Change-Id: I25ca01a6e1a91a47d2b9a625052a23d906248481
Commit: 18db66b37582e4924f53e2b15bf38697a441548f
https://github.com/tribe29/checkmk/commit/18db66b37582e4924f53e2b15bf38697a…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/autochecks.py
Log Message:
-----------
Fix autocheck non ASCII character handling
Change-Id: I77bab5142735c0438b2aa50317e2f22d2acea5b0
Commit: cec9d04ac426143bdfbd2a25625bfff07423bc68
https://github.com/tribe29/checkmk/commit/cec9d04ac426143bdfbd2a25625bfff07…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk/utils/labels.py
M cmk/utils/paths.py
M cmk_base/automations/check_mk.py
M cmk_base/config.py
M cmk_base/core_config.py
M tests/integration/cmk/utils/test_paths.py
M tests/unit/cmk/utils/test_labels.py
M tests/unit/cmk_base/test_config.py
M tests/unit/cmk_base/test_discovered_labels.py
Log Message:
-----------
Export discovered service labels to core
* The first approach, storing discovered service labels
in a dedicated service labels file per host, has been removed.
* The autochecks are a better place to store all information
related to the discovered services. This way we have all discovered
service related information in a single place. The labels are
now available in the check table.
* One drawback is that the labels_of_service and label_sources_of_service,
which previously could calculate the effective labels on their own
now need to accept the discovered labels as parameters because they
are already available to the call site through the check table.
CMK-1816
Change-Id: Ie6a0d9b21bb6d3d6fe7e5b2e9c131d96d64c885d
Commit: 9b1312cd1136b55a253d6f0e0199f4bbf6e49e72
https://github.com/tribe29/checkmk/commit/9b1312cd1136b55a253d6f0e0199f4bbf…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/autochecks.py
M cmk_base/check_utils.py
M cmk_base/discovery.py
M tests/unit/cmk_base/test_autochecks.py
M tests/unit/cmk_base/test_discovery.py
Log Message:
-----------
Some DiscoveredService class cleanup
* Remove redundant slot declaration
* Renamed the paramstr property to something more meaningful.
We need to stick with this unresolved parameter stuff at least for the
current check API. With the check API rework in 1.7 we'll clean up
this stuff.
CMK-1816
Change-Id: I7415b26d249e6fb0638020acfd4ea32d14e9a3a5
Commit: b05dd8893cc4ab08e3990d1d99304b334fbc42d0
https://github.com/tribe29/checkmk/commit/b05dd8893cc4ab08e3990d1d99304b334…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/automations/check_mk.py
M cmk_base/discovery.py
Log Message:
-----------
Minor cleanups
Change-Id: If55bb796fdb4c6c4f217f8bef2094ee9ce6b814d
Commit: d45a00dea1d9ad338bff12a3758896fe8e233b99
https://github.com/tribe29/checkmk/commit/d45a00dea1d9ad338bff12a3758896fe8…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk/gui/wato/pages/services.py
M cmk_base/automations/check_mk.py
M cmk_base/discovery.py
Log Message:
-----------
Optionally show discovered labels on service discovery page
CMK-1816
Change-Id: I28f4ad9b41c7979181da497c6dd94b825cda9219
Commit: 96443b22999a740fad66b3fd5bfd608dcccc360c
https://github.com/tribe29/checkmk/commit/96443b22999a740fad66b3fd5bfd608dc…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
A .werks/7978
Log Message:
-----------
7978 Service labels can now be discovered
The discovery functions of Checkmk checks can now produce a collection of
service labels together with the discovered services. This makes it possible
for the check developer to mark the services of the discovered services which
can then be grouped together in a flexible way.
The discovered service labels can be listed on the service discovery page of
WATO by enabling them with the button "Show discovered labels".
These labels are attributes of the discovered service and will be handled exactly
like them. They are discovered in one step and applied to the running
configuration in the same way. The cluster handling is also equal.
How make my checks produce service labels?
Instead of producing a two element tuple of <tt>(item, parameters)</tt> to
create a new service the discovery functions can now provide objects like this:
C+:
Service(
item="Interface 213",
parameters=None,
service_labels=ServiceLabels(
ServiceLabel(u"check_type", u"network_interface"),
ServiceLabel(u"interface_type", u"uplink"),
)
)
C-:
These objects can be returned / yielded like the tuples before. Both,
the parameters and the service_labels are optional arguments.
Change-Id: I89112f4cce0e29c2e54349354485ae10a859da70
Commit: 81922b5ebcc27e806214721d8e4dc4c52ba09276
https://github.com/tribe29/checkmk/commit/81922b5ebcc27e806214721d8e4dc4c52…
Author: Sven Panne <sven.panne(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M livestatus/src/TableStatus.cc
Log Message:
-----------
Added livestatus_overflows/livestatus_overflows_rate columns to NEB's status table.
The NEB queues accepted connections, so we never have overflows here.
Nevertheless, we provide these columns for consistency with CMC, always
returning zero.
CMK-2333
Change-Id: I862407abbd07a88414f3274cff99d935ad574d5f
Compare: https://github.com/tribe29/checkmk/compare/4f5f72735235...81922b5ebcc2