18 Jul
2019
18 Jul
'19
2:10 p.m.
Branch: refs/heads/master
Home: https://github.com/tribe29/checkmk
Commit: 606dba9cc59c822ed37db3010bd9dc7d3591279e
https://github.com/tribe29/checkmk/commit/606dba9cc59c822ed37db3010bd9dc7d3…
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: 2b2c871b56ffbb743ae069ccdfa2184e3ad57613
https://github.com/tribe29/checkmk/commit/2b2c871b56ffbb743ae069ccdfa2184e3…
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: e5bf421f94a2d424b5acd3b084895549580e945c
https://github.com/tribe29/checkmk/commit/e5bf421f94a2d424b5acd3b0848955495…
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: 77dbcf76e9054de7b1b661ab538f4667cc53cc1b
https://github.com/tribe29/checkmk/commit/77dbcf76e9054de7b1b661ab538f4667c…
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: 500d03fc94d75f049b141a6325e02ceb541c8207
https://github.com/tribe29/checkmk/commit/500d03fc94d75f049b141a6325e02ceb5…
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: 0aff9cebd0f4968f4f8b902b2e8a1ef45298e70e
https://github.com/tribe29/checkmk/commit/0aff9cebd0f4968f4f8b902b2e8a1ef45…
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: 7c7e779bf9f522455a00842ce19c4597ba4c569a
https://github.com/tribe29/checkmk/commit/7c7e779bf9f522455a00842ce19c4597b…
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: f07aac94e6d3a4dbe5894315bcb0090e77bae311
https://github.com/tribe29/checkmk/commit/f07aac94e6d3a4dbe5894315bcb0090e7…
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: 265938f853efd2081b10a7f23757b4a0bd5e5226
https://github.com/tribe29/checkmk/commit/265938f853efd2081b10a7f23757b4a0b…
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: 1a3710917792927905f0bbaf47efe510adef3dc6
https://github.com/tribe29/checkmk/commit/1a3710917792927905f0bbaf47efe510a…
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: a50f3b8ff76b7ee9dea5cc4014e174a1fdbf60dd
https://github.com/tribe29/checkmk/commit/a50f3b8ff76b7ee9dea5cc4014e174a1f…
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: a7b2242cf2bf9db499bfa8ca78c990695030eca9
https://github.com/tribe29/checkmk/commit/a7b2242cf2bf9db499bfa8ca78c990695…
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: fe399891442a61630a1dbca7be53ba29d7ffef05
https://github.com/tribe29/checkmk/commit/fe399891442a61630a1dbca7be53ba29d…
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: 7770b2d443a2ae6e6e0550c1a790ef05e912b96b
https://github.com/tribe29/checkmk/commit/7770b2d443a2ae6e6e0550c1a790ef05e…
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: 84ff916603b18c323123f476622671758bd8b0d6
https://github.com/tribe29/checkmk/commit/84ff916603b18c323123f476622671758…
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: 96382c6429c43a5967f9cb1f92f81f66df2d72ef
https://github.com/tribe29/checkmk/commit/96382c6429c43a5967f9cb1f92f81f66d…
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: f683d2418452964b21e8d55cf685b37f55ed6286
https://github.com/tribe29/checkmk/commit/f683d2418452964b21e8d55cf685b37f5…
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: 1b048029a173c22d898c40e2573db8ee96cb155c
https://github.com/tribe29/checkmk/commit/1b048029a173c22d898c40e2573db8ee9…
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: d14113e6a64497abe003c590bde601beaff16e9d
https://github.com/tribe29/checkmk/commit/d14113e6a64497abe003c590bde601bea…
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: 832f89a356eb54018b06f0a53bf198e939df5e5b
https://github.com/tribe29/checkmk/commit/832f89a356eb54018b06f0a53bf198e93…
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: 4642c3ab35abb4043847693e71fcf310a87806e2
https://github.com/tribe29/checkmk/commit/4642c3ab35abb4043847693e71fcf310a…
Author: Lars Michelsen <lm(a)tribe29.com>
Date: 2019-07-18 (Thu, 18 Jul 2019)
Changed paths:
M cmk_base/core_nagios.py
M tests/integration/cmk_base/test_automations.py
M tests/integration/cmk_base/test_check_variables.py
Log Message:
-----------
Fix issues in recent commits
Change-Id: If883db13cb6718aab17f9a24713e77918edfed39
Compare: https://github.com/tribe29/checkmk/compare/a26284630fab...4642c3ab35ab