fix(sos): add cloud-init-main and cloud-init-network service names#17025
fix(sos): add cloud-init-main and cloud-init-network service names#17025jonathanbrenes wants to merge 1 commit intomicrosoft:tomls/base/mainfrom
Conversation
jonathanbrenes
requested review from
christopherco,
ddstreetmicrosoft and
reubeno
as code owners
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Backports upstream sosreport/sos#4314 via a patch overlay so the cloud_init sos plugin collects service/journal data on distros using cloud-init’s >= 24.3 single-process service names.
Changes:
- Added a new sos component overlay entry to apply an additional patch.
- Introduced a patch updating the
cloud_initplugin to includecloud-init-mainandcloud-init-networkservice names.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| base/comps/sos/sos.comp.toml | Registers a new patch overlay to apply the cloud-init service-name fix. |
| base/comps/sos/cloud_init-add-cloud-init-main-and-network-services.patch | Adds the upstream patch that expands the services tuple to include new cloud-init unit names. |
jonathanbrenes
force-pushed
the
fix/sos-cloud-init-services
branch
2 times, most recently
from
4310595 to
1c84c68
Compare
ddstreetmicrosoft
left a comment
ddstreetmicrosoft
left a comment
There was a problem hiding this comment.
LGTM other than removing the parts that change fluidsynth
| # Do not edit manually; changes may be overwritten. | ||
|
|
||
|
|
||
| Summary: Real-time software synthesizer |
There was a problem hiding this comment.
issue: please don't update the fluidsynth package here, you can ignore the pr check warning for this particular package.
There was a problem hiding this comment.
I removed the fluidsynth references
| plugin_name = 'cloud_init' | ||
| packages = ('cloud-init',) | ||
| - services = ('cloud-init',) | ||
| + services = ('cloud-init', 'cloud-init-main', 'cloud-init-network') |
There was a problem hiding this comment.
suggestion(non-blocking): you might want to also add cloud-init-local.service (upstream and to azl).
There was a problem hiding this comment.
suggestion(non-blocking): you might want to also add
cloud-init-local.service(upstream and to azl).
cloud-init-local.service has been added as well. I will push the same PR for the mainstream sos project
There was a problem hiding this comment.
I went back to the cloud-init project and I found there are more services. I included them all. This is the PR on the public repository sosreport/sos#4318
jonathanbrenes
force-pushed
the
fix/sos-cloud-init-services
branch
from
1c84c68 to
545a681
Compare
🔒❌ Lock files are out of dateFIX: — run this and commit the result: azldev component update -p fluidsynth -p opencryptoki -p python-s3transfer -p sos -p subunitOr download the fix patch and apply it: gh run download 25392460659 -R microsoft/azurelinux -n locks-patch
git apply locks.patchChanged components (5)
|
jonathanbrenes
force-pushed
the
fix/sos-cloud-init-services
branch
from
545a681 to
cde5e78
Compare
| plugin_name = 'cloud_init' | ||
| packages = ('cloud-init',) | ||
| - services = ('cloud-init',) | ||
| + services = ('cloud-init', 'cloud-config', 'cloud-final', |
There was a problem hiding this comment.
it looks like you just hand-edited the upstream patch included here.
please keep this PR to only the commit that has been merged upstream, and open a new PR for the additional upstream commit (so it can wait for the upstream PR getting merged)
There was a problem hiding this comment.
I reverted the changed and I created a new PR on the upstream to add the other units sosreport/sos#4318 I will commit another PR once the upstream is approved
Backport upstream sosreport/sos#4314 as a patch overlay. cloud-init >= 24.3 renamed cloud-init.service to cloud-init-network.service and added cloud-init-main.service. The sos cloud_init plugin needs all three service names to collect status and journal logs on affected distros.
jonathanbrenes
force-pushed
the
fix/sos-cloud-init-services
branch
from
cde5e78 to
25eb878
Compare
Summary
Backport upstream sosreport/sos#4314 as a patch overlay.
cloud-init 24.3 introduced a "single process optimization" (canonical/cloud-init#5489) that renamed
cloud-init.servicetocloud-init-network.serviceand added a newcloud-init-main.serviceas the primary single-process service.Distros shipping cloud-init >= 24.3 no longer have a
cloud-init.serviceunit. The soscloud_initplugin only listedcloud-init.service, so it failed to collect service status and journal logs for the new service names.Changes
cloud_init-add-cloud-init-main-and-network-services.patchto thesoscomponentcloud-init-mainandcloud-init-networkto theservicestuple (backward-compatible — sos skips services that don't exist)References