Skip to content

Commit e523d51

Browse files
authored
Fix auditd container monit startup issue (sonic-net#22012)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log 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)
1 parent 0615c4a commit e523d51

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

files/image_config/monit/container_checker

-5
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,6 @@ def main():
216216
print("Expected containers not running: " + ", ".join(not_running_containers))
217217
sys.exit(3)
218218

219-
unexpected_running_containers = current_running_containers.difference(expected_running_containers)
220-
if unexpected_running_containers:
221-
print("Unexpected running containers: " + ", ".join(unexpected_running_containers))
222-
sys.exit(4)
223-
224219

225220
if __name__ == "__main__":
226221
main()

0 commit comments

Comments
 (0)