[maas] Update MAAS plugin to collect logs for version 3.5+ #3340
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Congratulations! One of the builds has completed. 🍾 You can install the built RPMs by following these steps:
Please note that the RPMs should be used only in a testing environment. |
arif-ali
requested changes
Aug 23, 2023
sos/report/plugins/maas.py
Outdated
| @@ -62,13 +68,25 @@ def _is_snap_installed(self): | |||
| return maas_pkg['pkg_manager'] == 'snap' | |||
| return False | |||
|
|
|||
| def check_enabled(self): | |||
| return super().check_enabled() or self.is_service("snap.maas.pebble") | |||
There was a problem hiding this comment.
if the maas snap is there, then the packages tuple will cover this already, so we shouldn't need the extra check here. The packages tuple checks or both debs and snaps for Ubuntu platforms
There was a problem hiding this comment.
Awesome, thanks! I added a commit with a fix, should I squash it?
There was a problem hiding this comment.
yes please, squash the commits
In MAAS 3.5, system journal is used by all the services, therefore the log size is significantly increased compared to the previous MAAS versions. For snap this means that `journalctl` might need a long time to collect and filter the log files before outputting them. This sometimes leads to `maas` plugin timeouts with 3.5 snap, as `sos` performs automatic log collection for services listed in `services` tuple without any filters other than unit name, unless explicitly specified by user. We want the plugin to work without additional params, so we service declaration for 3.5 snap is ommitted. Logs are collected via `add_journal` call with a sane default limit to avoid timeouts. Signed-off-by: Igor Brovtsin <[email protected]>
TurboTurtle
approved these changes
Aug 24, 2023
arif-ali
approved these changes
Aug 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In MAAS 3.5, multiple services are introduced, and supervisor is replaced by Pebble in snap. This PR updates the
maasplugin to collect the logs for new services.Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines