Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Services] Allow monit system tool to monitor the critical processes status running in various SONiC containers. #3940

Merged
merged 99 commits into from
Jan 11, 2020
Merged

[Services] Allow monit system tool to monitor the critical processes status running in various SONiC containers. #3940

Show file tree
Hide file tree
Changes from 98 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
040b2c6
Add a monit config file for teamd container.
yozhao101 Dec 21, 2019
bdb07de
Add a copy mechanism to put the monit config file in teamd container
yozhao101 Dec 21, 2019
f29084e
Add a monit config file for snmp container.
yozhao101 Dec 21, 2019
9be0f16
Add a copy mechanism to put the monit config file of snmp container into
yozhao101 Dec 21, 2019
712280a
Add a monit config file for dhcp_relay container in the dir
yozhao101 Dec 21, 2019
cf09064
Add a copy mechanism to put the monit config file of dhcp_relay
yozhao101 Dec 21, 2019
47bd3ca
Add a monit config file for router advertiser container.
yozhao101 Dec 21, 2019
1e4832c
Add a copy mechanism to put the monit config file of router advertiser
yozhao101 Dec 21, 2019
e1df750
[Docker-Pmon] Add a monit config file for pmon container.
yozhao101 Dec 21, 2019
734eaac
[Docker-Pmon] Add a copy mechanism to put the monit config file into the
yozhao101 Dec 21, 2019
78cea57
[Docker-lldp] Add a monit config file for lldp container.
yozhao101 Dec 21, 2019
7ab41d2
[Docker-lldp] Add a copy mechanism to put the monit config file into the
yozhao101 Dec 21, 2019
7a32a3c
[Docker-bgp] Add a monit config file for BGP container.
yozhao101 Dec 21, 2019
00cef69
[Docker-bgp] Add a copy mechanism to put monit config file into the base
yozhao101 Dec 21, 2019
5834a5a
[Docker-swss] Add a monit config file for the swss container.
yozhao101 Dec 21, 2019
0e02c23
[Docker-swss] Add a copy mechanism to put monit config file into the
yozhao101 Dec 21, 2019
f02c0cf
[Docker-syncd] Add a monit config file for syncd container on barefoot
yozhao101 Dec 21, 2019
5d63db8
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 21, 2019
98770a8
[Docker-syncd] Add a monit config file for syncd container on broadcom.
yozhao101 Dec 21, 2019
fa1933d
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 21, 2019
404473b
[Docker-syncd] Add a monit config file for syncd container on cavium.
yozhao101 Dec 21, 2019
c015dd4
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 21, 2019
6050d83
[Docker-centec] Add a monit config file for syncd container on centen
yozhao101 Dec 21, 2019
26c42d8
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 21, 2019
9c08ca2
[Docker-syncd] Add a monit config file for syncd container on centen
yozhao101 Dec 21, 2019
8ef1b9b
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 21, 2019
beea934
[Docker-syncd] Add a monit config file for syncd container on marvell.
yozhao101 Dec 21, 2019
053c914
[Docker-syncd] Add a copy mechanism to put the monit conifg file into
yozhao101 Dec 21, 2019
68b45eb
Merge branch 'check_proc_stats' of github.com:/Azure/sonic-buildimage…
yozhao101 Dec 21, 2019
7f2ed2f
[Docker-syncd] Add a monit config file for syncd container on
yozhao101 Dec 23, 2019
8d918c8
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 23, 2019
9e0db12
[Docker-syncd] Add a monit config file for syncd container on
yozhao101 Dec 23, 2019
ff2d408
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 23, 2019
7b0d484
[Docker-syncd] Add a monit config file for syncd container on mellanox.
yozhao101 Dec 23, 2019
ead4de6
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 23, 2019
dd10b47
[Docker-syncd] Add a monit config file for syncd container on nephos.
yozhao101 Dec 23, 2019
82c1483
[Docker-syncd] Add a copy mechanism to put the monit config file into
yozhao101 Dec 23, 2019
146c765
[Docker-sflow] Add a monit config file for sflow container.
yozhao101 Dec 23, 2019
ced119c
[Docker-sflow] Add a copy mechanism to put the monit conifg file into
yozhao101 Dec 23, 2019
ca1bdd8
[Docker-telemetry] Add a monit config file for telemetry container.
yozhao101 Dec 23, 2019
e39bbb6
[Docker-telemetry] Add a copy mechanism to put the monit config file
yozhao101 Dec 23, 2019
b54e3a5
[Docker-database] Add a monit config file for database container.
yozhao101 Dec 23, 2019
a7b117e
[Docker-database] Add a copy mechanism to put the monit config file into
yozhao101 Dec 23, 2019
ff531d4
[Docker-Dhcprelay] Change a typo.
yozhao101 Dec 23, 2019
1372e17
[Docker-Dhcprelay] Change the process name in monit config file to
yozhao101 Dec 23, 2019
16b9120
[Docker-syncd] There is no desserve process in syncd container on
yozhao101 Dec 23, 2019
5c42e5d
[Docker-syncd] There is no process desserve in syncd container on
yozhao101 Dec 23, 2019
10f08c8
[Docker-syncd] There is no process named desserve in syncd on centec.
yozhao101 Dec 23, 2019
aae50a8
[Docker-syncd] There is no process named desserve in syncd on marvell.
yozhao101 Dec 23, 2019
5fc5981
[Docker-syncd] Should not delete the process desserve in syncd container
yozhao101 Dec 23, 2019
7a52fde
[Docker-syncd] Delete the process dsserve in syncd on marvell.
yozhao101 Dec 23, 2019
66edffa
[Docker-syncd] Delete the process dsserve in syncd container on
yozhao101 Dec 23, 2019
7d89cd9
[Docker-syncd] Delete the process dsserve in syncd container on
yozhao101 Dec 23, 2019
c93e83c
[Docker-syncd] Delete the process dsserve in syncd container on
yozhao101 Dec 23, 2019
54a6d62
[Docker-Radv] Change the process name to radvd.
yozhao101 Dec 23, 2019
59a60e0
[Docker-telemetry] Correct a typo in monit_telemetry.
yozhao101 Jan 3, 2020
fb3cdd5
[Docker-teamd] Delete the monit config file for teamd.
yozhao101 Jan 4, 2020
5b962c6
[Docker-teamd] Delete the mechanism to copy the monit config file into
yozhao101 Jan 4, 2020
d4590ec
[Docker-dhcprelay] Delete the monit config file for dhcp_relay
yozhao101 Jan 4, 2020
9bdafd3
[Docker-dhcprelay] Delete the mechanism to copy the monit config file
yozhao101 Jan 4, 2020
950cc9a
[Docker-radv] Delete the monit config file foe radv container.
yozhao101 Jan 4, 2020
d3ce225
[Docker-radv] Delete the mechanism to copy the monit config file into
yozhao101 Jan 4, 2020
5811079
[Docker-bgp] change the monit config file for BGP container such that
yozhao101 Jan 4, 2020
9b193a5
[Docker-snmp] Change the monit config file for snmp container such that
yozhao101 Jan 4, 2020
ac607df
[Docker-pmon] Change the monit config file for pmon container such that
yozhao101 Jan 4, 2020
0090fe2
[Docker-lldp] Change the monit config file for lldp container such that
yozhao101 Jan 4, 2020
5f8210d
[Docker-pmon] Delete the monit config file for pmon container since some
yozhao101 Jan 4, 2020
15b66f4
[Docker-pmon] Delete the copy mechanism to copy the monit config file
yozhao101 Jan 4, 2020
96efdde
[Docker-lldp] Change the matching name for the process lldpd.
yozhao101 Jan 4, 2020
8475bab
[Docker-swss] Change the monit config file for swss container such that
yozhao101 Jan 4, 2020
3cdbb22
[Docker-syncd] Change the monit config file for syncd container on
yozhao101 Jan 4, 2020
311a8ff
[Docker-syncd] Correct a typo in monit config file.
yozhao101 Jan 4, 2020
a2b79a4
[Docker-syncd] Change the monit config file for syncd container on
yozhao101 Jan 4, 2020
d534cda
[Docker-syncd] Change the monit config file for syncd container on
yozhao101 Jan 4, 2020
cfe2a3d
[Docker-syncd] Change the monit config file for syncd container such
yozhao101 Jan 4, 2020
df6b425
[Docker-syncd] Change the monit config file for syncd container on
yozhao101 Jan 4, 2020
a6c8b8c
[Docker-syncd] Change the monit config file for syncd container on
yozhao101 Jan 4, 2020
329b6ef
[Docker-syncd] Change the monit config file for syncd container on
yozhao101 Jan 4, 2020
da3b15d
[Docker-syncd] Change the monit config file for syncd container on
yozhao101 Jan 4, 2020
8cc8291
[Docker-sycnd] Change the monit config file for syncd container such
yozhao101 Jan 4, 2020
e943f01
[Docker-sflow] Change the monit config file for sflow container such
yozhao101 Jan 4, 2020
19cf640
[Docker-telemetry] Change the monit config file for telemetry container
yozhao101 Jan 4, 2020
6af7963
[Docker-database] Change the monit config file for database container
yozhao101 Jan 4, 2020
8ea4b10
[Docker-database] Use 4 spaces to replace 2 spaces in monit config file.
yozhao101 Jan 4, 2020
ed78d5b
Merge branch 'master' into check_proc_stats
yozhao101 Jan 4, 2020
3c4fc46
[Docker-bgp] Use 4 spcess to replace 2 spaces in monit config file.
yozhao101 Jan 4, 2020
1c685bb
[Docker-lldp] Use 4 spaces to replace 2 spaces in monit config file.
yozhao101 Jan 4, 2020
645de7b
[Docker-swss] Use 4 spaces to replace 2 space in monit config file.
yozhao101 Jan 4, 2020
a8f5490
[Docker-sflow] Use 4 spaces to replace 2 spaces in monit config file.
yozhao101 Jan 4, 2020
2e8f43e
[Docker-snmp] Use 4 spaces to replace 2 spaces in monit config file.
yozhao101 Jan 4, 2020
f12f925
[Docker-telemetry] Use 4 spaces to replace 2 spaces in monit config
yozhao101 Jan 4, 2020
e6ca253
[Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file
yozhao101 Jan 4, 2020
270dec7
[Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file
yozhao101 Jan 4, 2020
7ee5bf4
[Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file
yozhao101 Jan 4, 2020
8507b1b
[Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file
yozhao101 Jan 4, 2020
c13b1ce
[Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file
yozhao101 Jan 4, 2020
a130980
[Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file
yozhao101 Jan 4, 2020
8db56f6
[Docker-syncd] Use 4 spaces to repalce 2 spaces in the monit config file
yozhao101 Jan 4, 2020
c849b58
[Docker-bgp] Remove the trailing extra spaces in monit config file.
yozhao101 Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dockers/docker-database/base_image_files/monit_database
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for database container
## process list:
## redis_server
###############################################################################
check process redis_server matching "/usr/bin/redis-server"
if does not exist for 5 times within 5 cycles then alert
23 changes: 23 additions & 0 deletions dockers/docker-fpm-frr/base_image_files/monit_bgp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
###############################################################################
## Monit configuration for BGP container
## process list:
## zebra
jleveque marked this conversation as resolved.
Show resolved Hide resolved
## fpmsyncd
## bgpd
## staticd
## bgpcfgd
###############################################################################
check process zebra matching "/usr/lib/frr/zebra"
if does not exist for 5 times within 5 cycles then alert

check process fpmsyncd matching "fpmsyncd"
if does not exist for 5 times within 5 cycles then alert

check process bgpd matching "/usr/lib/frr/bgpd"
if does not exist for 5 times within 5 cycles then alert

check process staticd matching "/usr/lib/frr/staticd"
if does not exist for 5 times within 5 cycles then alert

check process bgpcfgd matching "python /usr/bin/bgpcfgd"
if does not exist for 5 times within 5 cycles then alert
15 changes: 15 additions & 0 deletions dockers/docker-lldp-sv2/base_image_files/monit_lldp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
###############################################################################
## Monit configuration for lldp container
## process list:
## lldpd
## lldp-syncd
## lldpmgrd
###############################################################################
check process lldpd_monitor matching "lldpd: "
if does not exist for 5 times within 5 cycles then alert

check process lldp_syncd matching "python2 -m lldp_syncd"
if does not exist for 5 times within 5 cycles then alert

check process lldpmgrd matching "python /usr/bin/lldpmgrd"
if does not exist for 5 times within 5 cycles then alert
43 changes: 43 additions & 0 deletions dockers/docker-orchagent/base_image_files/monit_swss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
###############################################################################
## Monit configuration for swss container
## process list:
## orchagent
## portsyncd
## neighsyncd
## vrfmgrd
## vlanmgrd
## intfmgrd
## portmgrd
## buffermgrd
## nbrmgrd
## vxlanmgrd
###############################################################################
check process orchagent matching "/usr/bin/orchagent -d /var/log/swss"
if does not exist for 5 times within 5 cycles then alert

check process portsyncd matching "/usr/bin/portsyncd"
if does not exist for 5 times within 5 cycles then alert

check process neighsyncd matching "/usr/bin/neighsyncd"
if does not exist for 5 times within 5 cycles then alert

check process vrfmgrd matching "/usr/bin/vrfmgrd"
if does not exist for 5 times within 5 cycles then alert

check process vlanmgrd matching "/usr/bin/vlanmgrd"
if does not exist for 5 times within 5 cycles then alert

check process intfmgrd matching "/usr/bin/intfmgrd"
if does not exist for 5 times within 5 cycles then alert

check process portmgrd matching "/usr/bin/portmgrd"
if does not exist for 5 times within 5 cycles then alert

check process buffermgrd matching "/usr/bin/buffermgrd -l"
if does not exist for 5 times within 5 cycles then alert

check process nbrmgrd matching "/usr/bin/nbrmgrd"
if does not exist for 5 times within 5 cycles then alert

check process vxlanmgrd matching "/usr/bin/vxlanmgrd"
if does not exist for 5 times within 5 cycles then alert
7 changes: 7 additions & 0 deletions dockers/docker-sflow/base_image_files/monit_sflow
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for sflow container
## process list:
## sflowmgrd
###############################################################################
check process sflowmgrd matching "/usr/bin/sflowmgrd"
if does not exist for 5 times within 5 cycles then alert
11 changes: 11 additions & 0 deletions dockers/docker-snmp-sv2/base_image_files/monit_snmp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
###############################################################################
## Monit configuration for snmp container
## process list:
## snmpd
## snmpd_subagent
###############################################################################
check process snmpd matching "/usr/sbin/snmpd -f"
if does not exist for 5 times within 5 cycles then alert

check process snmp_subagent matching "python3.6 -m sonic_ax_impl"
if does not exist for 5 times within 5 cycles then alert
11 changes: 11 additions & 0 deletions dockers/docker-sonic-telemetry/base_image_files/monit_telemetry
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
###############################################################################
## Monit configuration for telemetry container
## process list:
## telemetry
## dialout_client
###############################################################################
check process telemetry matching "/usr/sbin/telemetry -logtostderr --insecure"
if does not exist for 5 times within 5 cycles then alert

check process dialout_client matching "/usr/sbin/dialout_client_cli -insecure -logtostderr"
if does not exist for 5 times within 5 cycles then alert
2 changes: 1 addition & 1 deletion platform/barefoot/docker-syncd-bfn.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSAIREDIS_DBG)

$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot

$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
7 changes: 7 additions & 0 deletions platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert
1 change: 1 addition & 0 deletions platform/broadcom/docker-syncd-brcm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd

$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
11 changes: 11 additions & 0 deletions platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
## dsserve
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert

check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd"
if does not exist for 5 times within 5 cycles then alert
1 change: 1 addition & 0 deletions platform/cavium/docker-syncd-cavm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ $(DOCKER_SYNCD_CAVM)_CONTAINER_NAME = syncd
$(DOCKER_SYNCD_CAVM)_RUN_OPT += --net=host --privileged -t
$(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
$(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_SYNCD_CAVM)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
7 changes: 7 additions & 0 deletions platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert
1 change: 1 addition & 0 deletions platform/centec/docker-syncd-centec.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ $(DOCKER_SYNCD_CENTEC)_RUN_OPT += --net=host --privileged -t
$(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
$(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
$(DOCKER_SYNCD_CENTEC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_SYNCD_CENTEC)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
7 changes: 7 additions & 0 deletions platform/centec/docker-syncd-centec/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert
1 change: 1 addition & 0 deletions platform/marvell-arm64/docker-syncd-mrvl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSAIREDIS_DBG)

$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
7 changes: 7 additions & 0 deletions platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert
1 change: 1 addition & 0 deletions platform/marvell-armhf/docker-syncd-mrvl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
$(LIBSAIREDIS_DBG)

$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
7 changes: 7 additions & 0 deletions platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert
1 change: 1 addition & 0 deletions platform/marvell/docker-syncd-mrvl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \

$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
7 changes: 7 additions & 0 deletions platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert
2 changes: 1 addition & 1 deletion platform/mellanox/docker-syncd-mlnx.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ $(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(MLNX_SDK_DBG_DEBS) $(MLNX_SAI_DBGSYM)
endif

$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot

$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
7 changes: 7 additions & 0 deletions platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert
2 changes: 1 addition & 1 deletion platform/nephos/docker-syncd-nephos.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd

$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += npx_diag:/usr/bin/npx_diag

$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
11 changes: 11 additions & 0 deletions platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
###############################################################################
## Monit configuration for syncd container
## process list:
## syncd
## dsserve
###############################################################################
check process syncd matching "/usr/bin/syncd --diag"
if does not exist for 5 times within 5 cycles then alert

check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd"
if does not exist for 5 times within 5 cycles then alert
1 change: 1 addition & 0 deletions rules/docker-database.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ $(DOCKER_DATABASE)_RUN_OPT += --net=host --privileged -t
$(DOCKER_DATABASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

$(DOCKER_DATABASE)_BASE_IMAGE_FILES += redis-cli:/usr/bin/redis-cli
$(DOCKER_DATABASE)_BASE_IMAGE_FILES += monit_database:/etc/monit/conf.d
1 change: 1 addition & 0 deletions rules/docker-fpm-frr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh
$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSA:/usr/bin/TSA
$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSB:/usr/bin/TSB
$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += TSC:/usr/bin/TSC
$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += monit_bgp:/etc/monit/conf.d
1 change: 1 addition & 0 deletions rules/docker-lldp-sv2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ $(DOCKER_LLDP_SV2)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

$(DOCKER_LLDP_SV2)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl
$(DOCKER_LLDP_SV2)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli
$(DOCKER_LLDP_SV2)_BASE_IMAGE_FILES += monit_lldp:/etc/monit/conf.d
$(DOCKER_LLDP_SV2)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
1 change: 1 addition & 0 deletions rules/docker-orchagent.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw

$(DOCKER_ORCHAGENT)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
$(DOCKER_ORCHAGENT)_BASE_IMAGE_FILES += monit_swss:/etc/monit/conf.d
$(DOCKER_ORCHAGENT)_FILES += $(ARP_UPDATE_SCRIPT) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
1 change: 1 addition & 0 deletions rules/docker-sflow.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ $(DOCKER_SFLOW)_RUN_OPT += -v /host/warmboot:/var/warmboot

$(DOCKER_SFLOW)_BASE_IMAGE_FILES += psample:/usr/bin/psample
$(DOCKER_SFLOW)_BASE_IMAGE_FILES += sflowtool:/usr/bin/sflowtool
$(DOCKER_SFLOW)_BASE_IMAGE_FILES += monit_sflow:/etc/monit/conf.d
$(DOCKER_SFLOW)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
1 change: 1 addition & 0 deletions rules/docker-snmp-sv2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ $(DOCKER_SNMP_SV2)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
# mount Arista platform python libraries to support corresponding platforms SNMP power status query
$(DOCKER_SNMP_SV2)_RUN_OPT += -v /usr/lib/python3/dist-packages/arista:/usr/lib/python3/dist-packages/arista:ro
$(DOCKER_SNMP_SV2)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
$(DOCKER_SNMP_SV2)_BASE_IMAGE_FILES += monit_snmp:/etc/monit/conf.d
1 change: 1 addition & 0 deletions rules/docker-telemetry.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ $(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_TELEMETRY)_RUN_OPT += --mount type=bind,source="/var/platform/",target="/mnt/platform/"

$(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
$(DOCKER_TELEMETRY)_BASE_IMAGE_FILES += monit_telemetry:/etc/monit/conf.d