Skip to content

skip frr_bmp container from monit#22588

Merged
kperumalbfn merged 1 commit intosonic-net:masterfrom
FengPan-Frank:monitskip
May 13, 2025
Merged

skip frr_bmp container from monit#22588
kperumalbfn merged 1 commit intosonic-net:masterfrom
FengPan-Frank:monitskip

Conversation

@FengPan-Frank
Copy link
Contributor

@FengPan-Frank FengPan-Frank commented May 9, 2025

Why I did it

frr_bmp is only feature switch used for bgpd to start as "/usr/lib/frr/bgpd -A 127.0.0.1 -M bmp", so that bmp container later rollout could work, thus is should be skipped from container check.

Work item tracking
  • Microsoft ADO (number only):30807821

How I did it

skip container check from monit.

How to verify it

before fix
image

after fix, the error log disappears.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

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)

@FengPan-Frank FengPan-Frank requested a review from lguohan as a code owner May 9, 2025 23:49
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@FengPan-Frank FengPan-Frank requested a review from qiluo-msft May 9, 2025 23:50
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@qiluo-msft
Copy link
Collaborator

Please update "How to verify it" in PR description

@qiluo-msft
Copy link
Collaborator

lgtm.

@StormLiangMS
Copy link
Contributor

hi @FengPan-Frank could you help to clarify why we don't capture this in nightly?

@FengPan-Frank
Copy link
Contributor Author

hi @FengPan-Frank could you help to clarify why we don't capture this in nightly?

Hi @StormLiangMS previously we were trading-off on using frr_bmp first or using bmp feature as one time enablement, thus for not missing last image update window, refer https://github.com/sonic-net/sonic-buildimage/pull/22148/files feature switch implementation supports either of them, as a result of that existing mgmt test overwrite golden_config test with bmp feature switch was not broken. I add one more test for frr_bmp feature switch sonic-net/sonic-mgmt#18346

@kperumalbfn kperumalbfn merged commit ba0bd66 into sonic-net:master May 13, 2025
19 checks passed
@kperumalbfn
Copy link
Contributor

@FengPan-Frank We could add this to 202411, let me know.

@FengPan-Frank
Copy link
Contributor Author

@FengPan-Frank We could add this to 202411, let me know.

Thanks @kperumalbfn. Yes please add this into 202411

@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202411: #22603

@mssonicbld
Copy link
Collaborator

@FengPan-Frank cherry pick PR didn't pass PR checker. Please check!!!
#22603

qiluo-msft pushed a commit to sonic-net/sonic-mgmt that referenced this pull request May 27, 2025
…h to block regression (#18615)

Approach
What is the motivation for this PR?
Add monit test case with disable bmp but enable frr_bmp feature switch to block regression

How did you do it?
Add one more test for monit syslog checking and disable bmp in advance which reflects real production config.

How did you verify/test it?
New test case passed without issue

Used old image which does not have monit fix sonic-net/sonic-buildimage#22588 it broke the test case

With new image all test verification with frr_bmp enable + bmp disable are also passed, result could be found https://dev.azure.com/mssonic/build/_build/results?buildId=859705&view=results
bachalla pushed a commit to bachalla/sonic-mgmt that referenced this pull request Jun 2, 2025
…h to block regression (sonic-net#18615)

Approach
What is the motivation for this PR?
Add monit test case with disable bmp but enable frr_bmp feature switch to block regression

How did you do it?
Add one more test for monit syslog checking and disable bmp in advance which reflects real production config.

How did you verify/test it?
New test case passed without issue

Used old image which does not have monit fix sonic-net/sonic-buildimage#22588 it broke the test case

With new image all test verification with frr_bmp enable + bmp disable are also passed, result could be found https://dev.azure.com/mssonic/build/_build/results?buildId=859705&view=results
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to msft-202412: Azure/sonic-buildimage-msft#1212

qiluo-msft pushed a commit to sonic-net/sonic-mgmt that referenced this pull request Jun 13, 2025
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes #18753
nissampa pushed a commit to nissampa/sonic-mgmt_dpu_test that referenced this pull request Aug 7, 2025
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
…h to block regression (sonic-net#18615)

Approach
What is the motivation for this PR?
Add monit test case with disable bmp but enable frr_bmp feature switch to block regression

How did you do it?
Add one more test for monit syslog checking and disable bmp in advance which reflects real production config.

How did you verify/test it?
New test case passed without issue

Used old image which does not have monit fix sonic-net/sonic-buildimage#22588 it broke the test case

With new image all test verification with frr_bmp enable + bmp disable are also passed, result could be found https://dev.azure.com/mssonic/build/_build/results?buildId=859705&view=results

Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\$SystemLogRateLimit/\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753

Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 16, 2025
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
…h to block regression (sonic-net#18615)

Approach
What is the motivation for this PR?
Add monit test case with disable bmp but enable frr_bmp feature switch to block regression

How did you do it?
Add one more test for monit syslog checking and disable bmp in advance which reflects real production config.

How did you verify/test it?
New test case passed without issue

Used old image which does not have monit fix sonic-net/sonic-buildimage#22588 it broke the test case

With new image all test verification with frr_bmp enable + bmp disable are also passed, result could be found https://dev.azure.com/mssonic/build/_build/results?buildId=859705&view=results

Signed-off-by: Aharon Malkin <amalkin@nvidia.com>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753

Signed-off-by: Aharon Malkin <amalkin@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
…h to block regression (sonic-net#18615)

Approach
What is the motivation for this PR?
Add monit test case with disable bmp but enable frr_bmp feature switch to block regression

How did you do it?
Add one more test for monit syslog checking and disable bmp in advance which reflects real production config.

How did you verify/test it?
New test case passed without issue

Used old image which does not have monit fix sonic-net/sonic-buildimage#22588 it broke the test case

With new image all test verification with frr_bmp enable + bmp disable are also passed, result could be found https://dev.azure.com/mssonic/build/_build/results?buildId=859705&view=results

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753
qiluo-msft pushed a commit to qiluo-msft/sonic-buildimage that referenced this pull request Jan 26, 2026
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
…h to block regression (sonic-net#18615)

Approach
What is the motivation for this PR?
Add monit test case with disable bmp but enable frr_bmp feature switch to block regression

How did you do it?
Add one more test for monit syslog checking and disable bmp in advance which reflects real production config.

How did you verify/test it?
New test case passed without issue

Used old image which does not have monit fix sonic-net/sonic-buildimage#22588 it broke the test case

With new image all test verification with frr_bmp enable + bmp disable are also passed, result could be found https://dev.azure.com/mssonic/build/_build/results?buildId=859705&view=results

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
test_posttest.py::test_recover_rsyslog_rate_limit iterates over the results of show feature status and executes the following commands:

docker exec -i frr_bmp sed -i 's/^#\\$SystemLogRateLimit/\\$SystemLogRateLimit/g' /etc/rsyslog.conf
docker exec -i frr_bmp supervisorctl restart rsyslogd
frr_bmp shows up in show feature status but it isn't a real docker container so we should skip it.
Similar PR: sonic-net/sonic-buildimage#22588

Summary:
Fixes sonic-net#18753

Signed-off-by: Yael Tzur <ytzur@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants