[checkmk-commits] [tribe29/checkmk] 484d61: Clarify passing of FecherMessage for checking

Branch: refs/heads/master Home: https://github.com/tribe29/checkmk Commit: 484d6145817e2757f64b3c197109db4afb9cc763 https://github.com/tribe29/checkmk/commit/484d6145817e2757f64b3c197109db4af… Author: Mathias Laurin <mathias.laurin(a)tribe29.com> Date: 2022-03-23 (Wed, 23 Mar 2022) Changed paths: M cmk/base/agent_based/checking/__init__.py M cmk/base/core_nagios.py Log Message: ----------- Clarify passing of FecherMessage for checking One can see from the signatures of `commandline_checking()` and `active_check_checking()` that the only difference between the two functions is that `active_check_checking` takes the `Sequence[FetcherMessage]` but `commandline_checking` does not. Therefore, we make the argument non-optional for `active_check_checking` and call the other function if the data is not ready yet. This clarifies the call stack with regard to sources and `fetcher_messages`. CMK-10076 Change-Id: I52740876a16e2dfa2e8b58882f935a008cc6673f Commit: b1a1dbe88b79e789d2ae87fb154b69239d9fccbc https://github.com/tribe29/checkmk/commit/b1a1dbe88b79e789d2ae87fb154b69239… Author: Mathias Laurin <mathias.laurin(a)tribe29.com> Date: 2022-03-23 (Wed, 23 Mar 2022) Changed paths: M cmk/base/agent_based/discovery/__init__.py M cmk/base/modes/check_mk.py Log Message: ----------- Split active_check_discovery This is consistent with checking and clarifies the path of `Sequence[FetcherMessage]`. That is, the data has been fetched for the active_check_discovery path; it must be fetched with commandline_check_discovery. CMK-10076 Change-Id: Ide821de5089d5f9a67d7ceaffeb7cb7700ee8b93 Commit: c9990d4df259c997fb04a66dfaa13c6e9f7609df https://github.com/tribe29/checkmk/commit/c9990d4df259c997fb04a66dfaa13c6e9… Author: Mathias Laurin <mathias.laurin(a)tribe29.com> Date: 2022-03-23 (Wed, 23 Mar 2022) Changed paths: M cmk/base/agent_based/discovery/__init__.py Log Message: ----------- discovery: Make sure to pass the sources *with* the data In most cases, the sources are known from the beginning. It is easier to keep them around than trying to guess what they were and perform some sanity check later in the call stack. CMK-10076 Change-Id: I6c4e515e5b5944fbf09d6064e4f57785f331be26 Commit: b048b80fa762bf182661a324db93557b20688330 https://github.com/tribe29/checkmk/commit/b048b80fa762bf182661a324db93557b2… Author: Mathias Laurin <mathias.laurin(a)tribe29.com> Date: 2022-03-23 (Wed, 23 Mar 2022) Changed paths: M cmk/base/agent_based/checking/__init__.py Log Message: ----------- Fix signature to _timing_results The CPUTracker **must** be finished before the call to `_timing_results()`. So let us make sure of that by passing the Snapshot instead of the CPUTracker to that function. CMK-10076 Change-Id: I382afc64b4527ddfce0cf4151160783a92561c03 Commit: 913bebafe6469951333207fb7669ee718729c292 https://github.com/tribe29/checkmk/commit/913bebafe6469951333207fb7669ee718… Author: Mathias Laurin <mathias.laurin(a)tribe29.com> Date: 2022-03-23 (Wed, 23 Mar 2022) Changed paths: M cmk/base/agent_based/checking/__init__.py Log Message: ----------- Fix duration being counted twice In the case where `fetcher_messages` is `()` and sources were configured, `make_broker()` calls `fetch_all()` and tracks the duration of each call to `source.fetch()`. These durations were then added to the time tracker in the caller in `_timing_results()` resulting in them being counted twice. CMK-10076 Change-Id: Iaf0d169dd67bb71991d2d8f7363e613712034413 Commit: b393a576c7dcfeafc594b6e9618a46435adcbfa5 https://github.com/tribe29/checkmk/commit/b393a576c7dcfeafc594b6e9618a46435… Author: Mathias Laurin <mathias.laurin(a)tribe29.com> Date: 2022-03-23 (Wed, 23 Mar 2022) Changed paths: M cmk/base/agent_based/checking/__init__.py Log Message: ----------- checking: Make sure to pass the sources *with* the data CMK-10076 Change-Id: I3338920e06641b64c68b56230bbfeb6fef78e969 Compare: https://github.com/tribe29/checkmk/compare/55ac85f344d9...b393a576c7dc