23 Jan
2024
23 Jan
'24
11:35 a.m.
Branch: refs/heads/2.2.0
Home: https://github.com/Checkmk/checkmk
Commit: de2169f3b30166e89c4f826a9a646034e8e91c32
https://github.com/Checkmk/checkmk/commit/de2169f3b30166e89c4f826a9a646034e…
Author: Lars Michelsen <lm(a)checkmk.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
A .werks/15721
M omd/packages/omd/omdlib/contexts.py
M tests/unit/omdlib/test_site_context.py
Log Message:
-----------
15721 FIX Fix wrong edition reported via livestatus in enterprise sites running the
Nagios core
This change fixes a bug in the Nagios Core edition detection logic which could occur when
using the
Nagios core with another edition than the Raw Edition. This is a rare use case, but can
happen
temporarily during the migration from the Raw Edition to an Enterprise Edition.
The bug manifests itself by reporting the wrong edition via the livestatus interface. This
can be
observed with the following query:
```
lq "GET status\nColumns: edition"
```
The edition column was introduced in 2.2.0.
Change-Id: I1d068a40e8624ff9c96d08b472e2496d7b5deaaa
Commit: 06cada725fa4effdb60a328fc4ebcee01ff25e9c
https://github.com/Checkmk/checkmk/commit/06cada725fa4effdb60a328fc4ebcee01…
Author: Lars Michelsen <lm(a)checkmk.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
M omd/packages/omd/omdlib/main.py
Log Message:
-----------
Differentiate between old replacements and new replacements
Since the replacements contain the edition, an information derived from
the OMD version, the replacement macros now need to be treated
differently for computing the old version skel files and the new version
skel files.
Previously the same replacements were used to compute the content of
old and new version skel files, which lead to incorrect results during
updates.
So far, only the file etc/mk-livestatus/nagios.cfg is using the
macro "###EDITION###", so only this file is affected by that issue.
The result of the problem was that etc/mk-livestatus/nagios.cfg was not
rewritten with the new edition information when updating from a raw
edition to an enterprise edition.
Change-Id: I14fcbca9758634b9a8541bb1a0724424acbd2b5a
Commit: dbeb09403e177be10dfab1e836102c3cffae29d0
https://github.com/Checkmk/checkmk/commit/dbeb09403e177be10dfab1e836102c3cf…
Author: Lars Michelsen <lm(a)checkmk.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
M omd/packages/omd/omdlib/main.py
Log Message:
-----------
Extend #15721 to fix files created by previous 2.2.0 versions
Change-Id: I9031ed0113ddcf7cceea21c95a6f3d2fb28c1c73
Commit: c890df3ce8cacd5d07aab3f5b5be5f92b9b858d3
https://github.com/Checkmk/checkmk/commit/c890df3ce8cacd5d07aab3f5b5be5f92b…
Author: Lars Michelsen <lm(a)checkmk.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
M omd/packages/omd/omdlib/contexts.py
M omd/packages/omd/omdlib/main.py
M omd/packages/omd/omdlib/skel_permissions.py
M tests/unit/omdlib/test_omdlib_skel_permissions.py
Log Message:
-----------
Cleanup: Get rid of read_skel_permissions
The function was caching once loaded permissions on module scope. By propagating
the loaded permissions through the calls stack, we can prevent loading the
skell permissions too often without such caching approach.
Change-Id: I55d76ce0f870107d9f83d8698e251e9463587d2e
Commit: 5b7b1bab7dd3ae38c4f66536e385daf964ae9f8f
https://github.com/Checkmk/checkmk/commit/5b7b1bab7dd3ae38c4f66536e385daf96…
Author: Lars Michelsen <lm(a)checkmk.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
A .werks/15722
M omd/packages/omd/omdlib/main.py
Log Message:
-----------
15722 FIX omd update: Fix setting world read permissions on etc and local files
Starting with 2.2.0 (see #15062), we use a umask of 0077 to prevent
files and directories owned by the site user from being world readable.
However, when updating from the CRE to a non CRE edition, some files and
directories were still set to be world readable during 'omd update'.
This is now in line with the other files.
Change-Id: I59561c44027bffc23dde045c3e19447cd7c8a09e
Compare: https://github.com/Checkmk/checkmk/compare/4a358cf1fcb5...5b7b1bab7dd3