[action] [PR:21979] Fix auditd container monit startup issue#22012
Merged
mssonicbld merged 1 commit intosonic-net:202411from Mar 28, 2025
Merged
[action] [PR:21979] Fix auditd container monit startup issue#22012mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld merged 1 commit intosonic-net:202411from
Conversation
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
new added auditd container failed to be launched due to monit blocker.
##### Work item tracking
- Microsoft ADO **(number only)**:31121982
#### How I did it
Skip the unexpected container check logic
#### How to verify it
Verify via auditd image
<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
Collaborator
Author
|
Original PR: #21979 |
11 tasks
Collaborator
Author
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Gfrom2016
pushed a commit
to Gfrom2016/sonic-buildimage
that referenced
this pull request
Apr 5, 2025
…-net#960) Code sync sonic-net/sonic-buildimage:202411 => 202412 ``` * 875852e (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250330:2343 - Merge remote-tracking branch 'base/202411' into code-sync-202412 |\ | * e523d51 (base/202411) mssonicbld 250329:0401 - Fix auditd container monit startup issue (sonic-net#22012) | * 0615c4a mssonicbld 250329:0325 - [installer] Add CSTATE configuration for the AMD CPU. (sonic-net#22060) | * 606ff68 mssonicbld 250328:1601 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22159) | * fb36404 Aravind-Subbaroyan 250326:1714 - Update cisco-8000.ini (sonic-net#22154) | * 869a801 mssonicbld 250325:1901 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#22127) | * 81af0af mssonicbld 250325:1601 - [chassis][multi-asic]: Add support for vendor LC ip range for macvlan ip (sonic-net#22125) | * a4f5972 sschlafman 250321:1508 - [202411] Add new T1 Mellanox-SN4280-O8C40 SKU for 202411 (sonic-net#22103) | * b945441 mssonicbld 250322:0516 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (sonic-net#22090) | * cac6efb Dror Prital 250321:1846 - [202411][Mellanox] Update SDK/FW Version to 4.7.2214/2014.2214 (sonic-net#22097) | * 855e80d Zhijian Li 250322:0213 - [202411] Revert "Mount the /tmp directory as tmpfs" (sonic-net#22080) ```
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Why I did it
new added auditd container failed to be launched due to monit blocker.
Work item tracking
How I did it
Skip the unexpected container check logic
How to verify it
Verify via auditd image
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)