From 040b2c6bf3dfcd406ca20a38ea666f3158d016c1 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:31:23 -0800 Subject: [PATCH 01/97] Add a monit config file for teamd container. Signed-off-by: Yong Zhao --- dockers/docker-teamd/base_image_files/monit_teamd | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 dockers/docker-teamd/base_image_files/monit_teamd diff --git a/dockers/docker-teamd/base_image_files/monit_teamd b/dockers/docker-teamd/base_image_files/monit_teamd new file mode 100644 index 000000000000..874c845c8b35 --- /dev/null +++ b/dockers/docker-teamd/base_image_files/monit_teamd @@ -0,0 +1,15 @@ +############################################################################### +## Monit configuration for teamd container +## process list: +## teamd +## teammgrd +## teamsyncd +############################################################################### +check process teamd matching "/usr/bin/teamd -r -t" + if does not exist then alert + +check process teammgrd matching "/usr/bin/teammgrd" + if does not exist then alert + +check process teamsyncd matching "/usr/bin/teamsyncd" + if does not exist then alert From bdb07dedcf4eae34098623b29997995d8803850b Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:32:45 -0800 Subject: [PATCH 02/97] Add a copy mechanism to put the monit config file in teamd container into base image. Signed-off-by: Yong Zhao --- rules/docker-teamd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk index 598eff97e8f1..c17f9e9f1ddf 100644 --- a/rules/docker-teamd.mk +++ b/rules/docker-teamd.mk @@ -29,4 +29,5 @@ $(DOCKER_TEAMD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_TEAMD)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_TEAMD)_BASE_IMAGE_FILES += teamdctl:/usr/bin/teamdctl +$(DOCKER_TEAMD)_BASE_IMAGE_FILES += monit_teamd:/etc/monit/conf.d $(DOCKER_TEAMD)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) From f29084e10385076aaf9a5bab63b96708b5c822e8 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:37:52 -0800 Subject: [PATCH 03/97] Add a monit config file for snmp container. Signed-off-by: Yong Zhao --- dockers/docker-snmp-sv2/base_image_files/monit_snmp | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dockers/docker-snmp-sv2/base_image_files/monit_snmp diff --git a/dockers/docker-snmp-sv2/base_image_files/monit_snmp b/dockers/docker-snmp-sv2/base_image_files/monit_snmp new file mode 100644 index 000000000000..d6f7d227366e --- /dev/null +++ b/dockers/docker-snmp-sv2/base_image_files/monit_snmp @@ -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 then alert + +check process snmpd_subagent matching "python3.6 -m sonic_ax_impl" + if does not exist then alert From 9be0f16dc69ca14c8f72765b2c651725882af957 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:39:11 -0800 Subject: [PATCH 04/97] Add a copy mechanism to put the monit config file of snmp container into the base image. Signed-off-by: Yong Zhao --- rules/docker-snmp-sv2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-snmp-sv2.mk b/rules/docker-snmp-sv2.mk index bd34f271b861..1f403b7a8c8a 100644 --- a/rules/docker-snmp-sv2.mk +++ b/rules/docker-snmp-sv2.mk @@ -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 From 712280ade6269f60b4dbeddfec49a97a7b497827 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:41:46 -0800 Subject: [PATCH 05/97] Add a monit config file for dhcp_relay container in the dir base_image_files. Signed-off-by: Yong Zhao --- dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay diff --git a/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay b/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay new file mode 100644 index 000000000000..edcff1a7bdbd --- /dev/null +++ b/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay @@ -0,0 +1,7 @@ +############################################################################### +## Monit configuration for DHCP_Relay container +## process list: +## dhcrealy +############################################################################### +check process dhcprelay matching "/usr/bin/dhcrelay" + if does not exist then alert From cf09064e42015d2b500295cfbb6068efe1aee742 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:42:38 -0800 Subject: [PATCH 06/97] Add a copy mechanism to put the monit config file of dhcp_relay container into base image under /etc/monit/conf.d. Signed-off-by: Yong Zhao --- rules/docker-dhcp-relay.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index 5aae24ee33b5..e63209692508 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -26,3 +26,4 @@ $(DOCKER_DHCP_RELAY)_CONTAINER_NAME = dhcp_relay $(DOCKER_DHCP_RELAY)_RUN_OPT += --net=host --privileged -t $(DOCKER_DHCP_RELAY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_DHCP_RELAY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) +$(DOCKER_DHCP_RELAY)_BASE_IMAGE_FILES += monit_dhcprelay:/etc/monit/conf.d From 47bd3cac750b1e33f8e48cc0729f2e79fd6e5cf4 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:44:53 -0800 Subject: [PATCH 07/97] Add a monit config file for router advertiser container. Signed-off-by: Yong Zhao --- .../docker-router-advertiser/base_image_files/monit_radv | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 dockers/docker-router-advertiser/base_image_files/monit_radv diff --git a/dockers/docker-router-advertiser/base_image_files/monit_radv b/dockers/docker-router-advertiser/base_image_files/monit_radv new file mode 100644 index 000000000000..3a63a687161e --- /dev/null +++ b/dockers/docker-router-advertiser/base_image_files/monit_radv @@ -0,0 +1,7 @@ +############################################################################### +## Monit configuration for router advertiser container +## process list: +## radv +############################################################################### +check process radv matching "/usr/bin/radv" + if does not exist then alert From 1e4832c9bbd0d3eb3c12b251dbfe75ffaaec3a14 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:46:02 -0800 Subject: [PATCH 08/97] Add a copy mechanism to put the monit config file of router advertiser contianer into base image. Signed-off-by: Yong Zhao --- rules/docker-router-advertiser.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk index 53e0d7600ec9..0c4a053fb936 100644 --- a/rules/docker-router-advertiser.mk +++ b/rules/docker-router-advertiser.mk @@ -26,3 +26,4 @@ $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --net=host --privileged -t $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_ROUTER_ADVERTISER)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) +$(DOCKER_ROUTER_ADVERTISER)_BASE_IMAGE_FILES += monit_radv:/etc/monit/conf.d From e1df7501d78337ad814d2aaf05cc2467b470ab31 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:48:27 -0800 Subject: [PATCH 09/97] [Docker-Pmon] Add a monit config file for pmon container. Signed-off-by: Yong Zhao --- .../base_image_files/monit_pmon | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 dockers/docker-platform-monitor/base_image_files/monit_pmon diff --git a/dockers/docker-platform-monitor/base_image_files/monit_pmon b/dockers/docker-platform-monitor/base_image_files/monit_pmon new file mode 100644 index 000000000000..50429ac28019 --- /dev/null +++ b/dockers/docker-platform-monitor/base_image_files/monit_pmon @@ -0,0 +1,23 @@ +############################################################################### +## Monit configuration for platform monitor container +## process list: +## ledd +## fancontrol +## psud +## syseepromd +## xcvrd +############################################################################### +check process ledd matching "/usr/bin/python /usr/bin/ledd" + if does not exist then alert + +check process fancontrol matching "/bin/bash /usr/sbin/fancontrol" + if does not exist then alert + +check process psud matching "/usr/bin/python /usr/bin/psud" + if does not exist then alert + +check process syseepromd matching "/usr/bin/python /usr/bin/syseepromd" + if does not exist then alert + +check process xcvrd matching "/usr/bin/python /usr/bin/xcvrd" + if does not exist then alert From 734eaacd528bd55742680403b41b07d8f665972a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:49:52 -0800 Subject: [PATCH 10/97] [Docker-Pmon] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-platform-monitor.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index 7a319e4bf120..753e832c430f 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -44,4 +44,5 @@ $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd +$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += monit_pmon:/etc/monit/conf.d $(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) From 78cea5756856fd4ad9a7f682e6c89e751ea8484a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:52:20 -0800 Subject: [PATCH 11/97] [Docker-lldp] Add a monit config file for lldp container. Signed-off-by: Yong Zhao --- .../base_image_files/monit_lldp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 dockers/docker-lldp-sv2/base_image_files/monit_lldp diff --git a/dockers/docker-lldp-sv2/base_image_files/monit_lldp b/dockers/docker-lldp-sv2/base_image_files/monit_lldp new file mode 100644 index 000000000000..86b7ce0f05fd --- /dev/null +++ b/dockers/docker-lldp-sv2/base_image_files/monit_lldp @@ -0,0 +1,18 @@ +############################################################################### +## Monit configuration for lldp container +## process list: +## lldpd +## lldp-syncd +## lldpmgrd +############################################################################### +check process lldpd_monitor matching "lldpd: monitor" + if does not exist then alert + +check process lldpd_connected matching "lldpd: connected" + if does not exist then alert + +check process lldp_syncd matching "python2 -m lldp_syncd" + if does not exist then alert + +check process lldpmgrd matching "python /usr/bin/lldpmgrd" + if does not exist then alert From 7ab41d20af0ea3401c06f72a84d8110d5db343c4 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:53:22 -0800 Subject: [PATCH 12/97] [Docker-lldp] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-lldp-sv2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-lldp-sv2.mk b/rules/docker-lldp-sv2.mk index 91acbe58ad82..8224239c1ced 100644 --- a/rules/docker-lldp-sv2.mk +++ b/rules/docker-lldp-sv2.mk @@ -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) From 7a32a3c5c4b99c575fa7bf203d87d45e64f37ae5 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:55:30 -0800 Subject: [PATCH 13/97] [Docker-bgp] Add a monit config file for BGP container. Signed-off-by: Yong Zhao --- .../docker-fpm-frr/base_image_files/monit_bgp | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 dockers/docker-fpm-frr/base_image_files/monit_bgp diff --git a/dockers/docker-fpm-frr/base_image_files/monit_bgp b/dockers/docker-fpm-frr/base_image_files/monit_bgp new file mode 100644 index 000000000000..88ede078d8bd --- /dev/null +++ b/dockers/docker-fpm-frr/base_image_files/monit_bgp @@ -0,0 +1,23 @@ +############################################################################### +## Monit configuration for BGP container +## process list: +## zebra +## fpmsyncd +## bgpd +## staticd +## bgpcfgd +############################################################################### +check process zebra matching "/usr/lib/frr/zebra" + if does not exist then alert + +check process fpmsyncd matching "fpmsyncd" + if does not exist then alert + +check process bgpd matching "/usr/lib/frr/bgpd" + if does not exist then alert + +check process staticd matching "/usr/lib/frr/staticd" + if does not exist then alert + +check process bgpcfgd matching "python /usr/bin/bgpcfgd" + if does not exist then alert From 00cef69b8c73dee66feb97bd58d386955a5b1866 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:56:30 -0800 Subject: [PATCH 14/97] [Docker-bgp] Add a copy mechanism to put monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-fpm-frr.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk index 1d158effe7ff..e833d360bec2 100644 --- a/rules/docker-fpm-frr.mk +++ b/rules/docker-fpm-frr.mk @@ -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 From 5834a5a26a02dde7100995fd0df8266b8dd03674 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:58:30 -0800 Subject: [PATCH 15/97] [Docker-swss] Add a monit config file for the swss container. Signed-off-by: Yong Zhao --- .../base_image_files/monit_swss | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 dockers/docker-orchagent/base_image_files/monit_swss diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss new file mode 100644 index 000000000000..a5f1350197ff --- /dev/null +++ b/dockers/docker-orchagent/base_image_files/monit_swss @@ -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 then alert + +check process portsyncd matching "/usr/bin/portsyncd" + if does not exist then alert + +check process neighsyncd matching "/usr/bin/neighsyncd" + if does not exist then alert + +check process vrfmgrd matching "/usr/bin/vrfmgrd" + if does not exist then alert + +check process vlanmgrd matching "/usr/bin/vlanmgrd" + if does not exist then alert + +check process intfmgrd matching "/usr/bin/intfmgrd" + if does not exist then alert + +check process portmgrd matching "/usr/bin/portmgrd" + if does not exist then alert + +check process buffermgrd matching "/usr/bin/buffermgrd -l" + if does not exist then alert + +check process nbrmgrd matching "/usr/bin/nbrmgrd" + if does not exist then alert + +check process vxlanmgrd matching "/usr/bin/vxlanmgrd" + if does not exist then alert From 0e02c2373493bb68de143094578d560390474fc3 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 17:59:29 -0800 Subject: [PATCH 16/97] [Docker-swss] Add a copy mechanism to put monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-orchagent.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk index 20536adc2520..0244138cbfe2 100644 --- a/rules/docker-orchagent.mk +++ b/rules/docker-orchagent.mk @@ -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) From f02c0cfb24c9297937278232e54e8fa65836099b Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:01:58 -0800 Subject: [PATCH 17/97] [Docker-syncd] Add a monit config file for syncd container on barefoot platform. Signed-off-by: Yong Zhao --- .../docker-syncd-bfn/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd diff --git a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From 5d63db8e6cbac2571fdeaa512c8b269e880b6e89 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:03:28 -0800 Subject: [PATCH 18/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image on barefoot. Signed-off-by: Yong Zhao --- platform/barefoot/docker-syncd-bfn.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/barefoot/docker-syncd-bfn.mk b/platform/barefoot/docker-syncd-bfn.mk index 6f3ed59ad285..3a5c693e2fa8 100644 --- a/platform/barefoot/docker-syncd-bfn.mk +++ b/platform/barefoot/docker-syncd-bfn.mk @@ -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 From 98770a81b4f4f2d74bef4fc4852706a4b029f205 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:05:32 -0800 Subject: [PATCH 19/97] [Docker-syncd] Add a monit config file for syncd container on broadcom. Signed-off-by: Yong Zhao --- .../docker-syncd-brcm/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From fa1933dae1f08fa445677535bdc6512221a0c1ee Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:06:40 -0800 Subject: [PATCH 20/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image on broadcom. Signed-off-by: Yong Zhao --- platform/broadcom/docker-syncd-brcm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk index 29727dbb2260..d3a6d67c5cbc 100644 --- a/platform/broadcom/docker-syncd-brcm.mk +++ b/platform/broadcom/docker-syncd-brcm.mk @@ -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 From 404473bb7d4eeefacd90c59ad4d8f5c235f4aa9b Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:10:06 -0800 Subject: [PATCH 21/97] [Docker-syncd] Add a monit config file for syncd container on cavium. Signed-off-by: Yong Zhao --- .../docker-syncd-cavm/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd diff --git a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From c015dd4710dce2e3d82bce36ac761a105813b9d1 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:11:28 -0800 Subject: [PATCH 22/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- platform/cavium/docker-syncd-cavm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/cavium/docker-syncd-cavm.mk b/platform/cavium/docker-syncd-cavm.mk index a136828dbff1..ad43d6f1196f 100644 --- a/platform/cavium/docker-syncd-cavm.mk +++ b/platform/cavium/docker-syncd-cavm.mk @@ -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 From 6050d83a5bda1dbd4e1ce1275c1376a09df2db5c Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:13:40 -0800 Subject: [PATCH 23/97] [Docker-centec] Add a monit config file for syncd container on centen platform. Signed-off-by: Yong Zhao --- .../docker-syncd-centec/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/centec/docker-syncd-centec/base_image_files/monit_syncd diff --git a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From 26c42d87567ee188f95e3a41f0f4b5383bacc030 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:14:51 -0800 Subject: [PATCH 24/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- platform/centec/docker-syncd-centec.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/centec/docker-syncd-centec.mk b/platform/centec/docker-syncd-centec.mk index 360690731a58..a0dbcc629dee 100644 --- a/platform/centec/docker-syncd-centec.mk +++ b/platform/centec/docker-syncd-centec.mk @@ -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 From 9c08ca26bb021d5d2e326ec8a2f6528f7f07a07b Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:13:40 -0800 Subject: [PATCH 25/97] [Docker-syncd] Add a monit config file for syncd container on centen platform. Signed-off-by: Yong Zhao --- .../docker-syncd-centec/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/centec/docker-syncd-centec/base_image_files/monit_syncd diff --git a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From 8ef1b9b60f23682237aa665217126f161307b6d6 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:14:51 -0800 Subject: [PATCH 26/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- platform/centec/docker-syncd-centec.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/centec/docker-syncd-centec.mk b/platform/centec/docker-syncd-centec.mk index 360690731a58..a0dbcc629dee 100644 --- a/platform/centec/docker-syncd-centec.mk +++ b/platform/centec/docker-syncd-centec.mk @@ -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 From beea9341a455e7efc9ef8fba18a0789938bd781f Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:19:07 -0800 Subject: [PATCH 27/97] [Docker-syncd] Add a monit config file for syncd container on marvell. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From 053c9145fede5624eeb2888adfee908c8a89956b Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 20 Dec 2019 18:20:00 -0800 Subject: [PATCH 28/97] [Docker-syncd] Add a copy mechanism to put the monit conifg file into the base image. Signed-off-by: Yong Zhao --- platform/marvell/docker-syncd-mrvl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/marvell/docker-syncd-mrvl.mk b/platform/marvell/docker-syncd-mrvl.mk index 5257bf5e68e7..97b7eab19895 100644 --- a/platform/marvell/docker-syncd-mrvl.mk +++ b/platform/marvell/docker-syncd-mrvl.mk @@ -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 From 7f2ed2fd91f4ed5640a45082cb4b9496e20acc6f Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:37:41 -0800 Subject: [PATCH 29/97] [Docker-syncd] Add a monit config file for syncd container on marvell-arm64. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd diff --git a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From 8d918c849e7c30c02f39ee5edb604eaab06433f3 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:38:54 -0800 Subject: [PATCH 30/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image on marvell-arm64. Signed-off-by: Yong Zhao --- platform/marvell-arm64/docker-syncd-mrvl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/marvell-arm64/docker-syncd-mrvl.mk b/platform/marvell-arm64/docker-syncd-mrvl.mk index e00769a59700..841e3b4b165f 100644 --- a/platform/marvell-arm64/docker-syncd-mrvl.mk +++ b/platform/marvell-arm64/docker-syncd-mrvl.mk @@ -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 From 9e0db12c48f0ce8156d04180e9a0b8fd752e2665 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:43:51 -0800 Subject: [PATCH 31/97] [Docker-syncd] Add a monit config file for syncd container on marvell-armhf. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd diff --git a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From ff2d408614c06151c1cf31379e9d868ed93a2832 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:44:56 -0800 Subject: [PATCH 32/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- platform/marvell-armhf/docker-syncd-mrvl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/marvell-armhf/docker-syncd-mrvl.mk b/platform/marvell-armhf/docker-syncd-mrvl.mk index e00769a59700..841e3b4b165f 100644 --- a/platform/marvell-armhf/docker-syncd-mrvl.mk +++ b/platform/marvell-armhf/docker-syncd-mrvl.mk @@ -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 From 7b0d48435c72b9f3df23a03a3ed6bc9647141957 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:46:42 -0800 Subject: [PATCH 33/97] [Docker-syncd] Add a monit config file for syncd container on mellanox. Signed-off-by: Yong Zhao --- .../docker-syncd-mlnx/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd diff --git a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From ead4de6c2503f349bee14f38e0dca2260d0dc2b4 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:50:04 -0800 Subject: [PATCH 34/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- platform/mellanox/docker-syncd-mlnx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk index db582e517bff..9bdc5a8ad8ec 100644 --- a/platform/mellanox/docker-syncd-mlnx.mk +++ b/platform/mellanox/docker-syncd-mlnx.mk @@ -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 From dd10b47eff419007c4df657dab9f39a941f15a41 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:57:10 -0800 Subject: [PATCH 35/97] [Docker-syncd] Add a monit config file for syncd container on nephos. Signed-off-by: Yong Zhao --- .../docker-syncd-nephos/base_image_files/monit_syncd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd diff --git a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd new file mode 100644 index 000000000000..37e80a8fde15 --- /dev/null +++ b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd @@ -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 then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From 82c14836eaacc6d574063f2d8c6aa9c67328f216 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sun, 22 Dec 2019 17:58:28 -0800 Subject: [PATCH 36/97] [Docker-syncd] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- platform/nephos/docker-syncd-nephos.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/nephos/docker-syncd-nephos.mk b/platform/nephos/docker-syncd-nephos.mk index 6829c91c67aa..67bad252870a 100644 --- a/platform/nephos/docker-syncd-nephos.mk +++ b/platform/nephos/docker-syncd-nephos.mk @@ -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 From 146c7650241e0f32b6a93797bb4a25986ee589d3 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 09:38:52 -0800 Subject: [PATCH 37/97] [Docker-sflow] Add a monit config file for sflow container. Signed-off-by: Yong Zhao --- dockers/docker-sflow/base_image_files/monit_sflow | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 dockers/docker-sflow/base_image_files/monit_sflow diff --git a/dockers/docker-sflow/base_image_files/monit_sflow b/dockers/docker-sflow/base_image_files/monit_sflow new file mode 100644 index 000000000000..2f2c0a72ca34 --- /dev/null +++ b/dockers/docker-sflow/base_image_files/monit_sflow @@ -0,0 +1,7 @@ +############################################################################### +## Monit configuration for sflow container +## process list: +## sflowmgrd +############################################################################### +check process sflowmgrd matching "/usr/bin/sflowmgrd" + if does not exist then alert From ced119c790976e65bbd40860a222a328307f1145 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 09:40:35 -0800 Subject: [PATCH 38/97] [Docker-sflow] Add a copy mechanism to put the monit conifg file into the base image. Signed-off-by: Yong Zhao --- rules/docker-sflow.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-sflow.mk b/rules/docker-sflow.mk index 94b568481885..449ff7c566f2 100644 --- a/rules/docker-sflow.mk +++ b/rules/docker-sflow.mk @@ -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) From ca1bdd8f1810160a1583f66834e622ec153b5eee Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 09:42:34 -0800 Subject: [PATCH 39/97] [Docker-telemetry] Add a monit config file for telemetry container. Signed-off-by: Yong Zhao --- .../base_image_files/monit_telemetry | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dockers/docker-sonic-telemetry/base_image_files/monit_telemetry diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry new file mode 100644 index 000000000000..d4b6fd25f32b --- /dev/null +++ b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry @@ -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 then alert + +check process dialout_clienty matching "/usr/sbin/dialout_client_cli -insecure -logtostderr" + if does not exist then alert From e39bbb6a4b2e200c781b3de5b9ed59ca68ac1fd2 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 09:43:44 -0800 Subject: [PATCH 40/97] [Docker-telemetry] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-telemetry.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk index defeb4d00821..c61fe86a3387 100644 --- a/rules/docker-telemetry.mk +++ b/rules/docker-telemetry.mk @@ -29,3 +29,4 @@ $(DOCKER_TELEMETRY)_RUN_OPT += --net=host --privileged -t $(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) +$(DOCKER_TELEMETRY)_BASE_IMAGE_FILES += monit_telemetry:/etc/monit/conf.d From b54e3a55d0073fe9444892fec750dd151b1f1495 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 09:46:23 -0800 Subject: [PATCH 41/97] [Docker-database] Add a monit config file for database container. Signed-off-by: Yong Zhao --- dockers/docker-database/base_image_files/monit_database | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 dockers/docker-database/base_image_files/monit_database diff --git a/dockers/docker-database/base_image_files/monit_database b/dockers/docker-database/base_image_files/monit_database new file mode 100644 index 000000000000..5cb833ba4211 --- /dev/null +++ b/dockers/docker-database/base_image_files/monit_database @@ -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 then alert From a7b117eb6fb8283653d877f4457578ef0acdfed7 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 09:47:25 -0800 Subject: [PATCH 42/97] [Docker-database] Add a copy mechanism to put the monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-database.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/docker-database.mk b/rules/docker-database.mk index 43dc2ed5d446..9ad6b0b36b45 100644 --- a/rules/docker-database.mk +++ b/rules/docker-database.mk @@ -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 From ff531d421c247c029165112bb8bbd05a2275011f Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:27:28 -0800 Subject: [PATCH 43/97] [Docker-Dhcprelay] Change a typo. Signed-off-by: Yong Zhao --- dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay b/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay index edcff1a7bdbd..07cf599fc7d5 100644 --- a/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay +++ b/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for DHCP_Relay container ## process list: -## dhcrealy +## dhcrelay ############################################################################### check process dhcprelay matching "/usr/bin/dhcrelay" if does not exist then alert From 1372e1766d4e5627b267d6d912d7b3865c9842b4 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:28:34 -0800 Subject: [PATCH 44/97] [Docker-Dhcprelay] Change the process name in monit config file to dhcrelay. Signed-off-by: Yong Zhao --- dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay b/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay index 07cf599fc7d5..3775e14fda41 100644 --- a/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay +++ b/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay @@ -3,5 +3,5 @@ ## process list: ## dhcrelay ############################################################################### -check process dhcprelay matching "/usr/bin/dhcrelay" +check process dhcrelay matching "/usr/bin/dhcrelay" if does not exist then alert From 16b91202dbe006728eddcb933a9b43db65dbae2a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:42:26 -0800 Subject: [PATCH 45/97] [Docker-syncd] There is no desserve process in syncd container on barefoot. Signed-off-by: Yong Zhao --- .../barefoot/docker-syncd-bfn/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd +++ b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From 5c42e5ded0161bbd0922fbcff5c43fe7fb36f8c3 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:45:33 -0800 Subject: [PATCH 46/97] [Docker-syncd] There is no process desserve in syncd container on cavium. Signed-off-by: Yong Zhao --- .../cavium/docker-syncd-cavm/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd +++ b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From 10f08c8c8056438b08e2048f19c6bec9a37f4431 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:46:56 -0800 Subject: [PATCH 47/97] [Docker-syncd] There is no process named desserve in syncd on centec. Signed-off-by: Yong Zhao --- .../centec/docker-syncd-centec/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd +++ b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From aae50a82aabae56799cfe438051acf3bb62e3c1a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:50:53 -0800 Subject: [PATCH 48/97] [Docker-syncd] There is no process named desserve in syncd on marvell. Signed-off-by: Yong Zhao --- .../marvell/docker-syncd-mrvl/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From 5fc5981848380af77e1ed7d957afce17763f9fee Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:55:04 -0800 Subject: [PATCH 49/97] [Docker-syncd] Should not delete the process desserve in syncd container on marvell. Signed-off-by: Yong Zhao --- .../marvell/docker-syncd-mrvl/base_image_files/monit_syncd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd index 6af1731ee6fa..37e80a8fde15 100644 --- a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd @@ -2,6 +2,10 @@ ## Monit configuration for syncd container ## process list: ## syncd +## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert + +check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" + if does not exist then alert From 7a52fde0156c3fcf5537c1518c3d9e7fa522e765 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:56:11 -0800 Subject: [PATCH 50/97] [Docker-syncd] Delete the process dsserve in syncd on marvell. Signed-off-by: Yong Zhao --- .../marvell/docker-syncd-mrvl/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From 66edffa5a3437f3422a3b43e4ee8e69d12dcf3d2 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:57:33 -0800 Subject: [PATCH 51/97] [Docker-syncd] Delete the process dsserve in syncd container on marvell-arm64. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From 7d89cd9a077164bcf104bff612625cd09b68baab Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 14:58:46 -0800 Subject: [PATCH 52/97] [Docker-syncd] Delete the process dsserve in syncd container on marvell-armhf. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From c93e83c8a0d9e6c1f067841287c5c09c92d7ab08 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 15:00:11 -0800 Subject: [PATCH 53/97] [Docker-syncd] Delete the process dsserve in syncd container on mellanox. Signed-off-by: Yong Zhao --- .../mellanox/docker-syncd-mlnx/base_image_files/monit_syncd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd index 37e80a8fde15..6af1731ee6fa 100644 --- a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd +++ b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd @@ -2,10 +2,6 @@ ## Monit configuration for syncd container ## process list: ## syncd -## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" if does not exist then alert - -check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" - if does not exist then alert From 54a6d6216d961ea9f6f6e2e7fafa2596590e73ef Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Mon, 23 Dec 2019 15:34:57 -0800 Subject: [PATCH 54/97] [Docker-Radv] Change the process name to radvd. Signed-off-by: Yong Zhao --- dockers/docker-router-advertiser/base_image_files/monit_radv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-router-advertiser/base_image_files/monit_radv b/dockers/docker-router-advertiser/base_image_files/monit_radv index 3a63a687161e..5bde9cbd4e39 100644 --- a/dockers/docker-router-advertiser/base_image_files/monit_radv +++ b/dockers/docker-router-advertiser/base_image_files/monit_radv @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for router advertiser container ## process list: -## radv +## radvd ############################################################################### -check process radv matching "/usr/bin/radv" +check process radvd matching "/usr/sbin/radvd" if does not exist then alert From 59a60e09b6a48559b4035ee6dcc5cd3c385b0592 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 2 Jan 2020 17:57:02 -0800 Subject: [PATCH 55/97] [Docker-telemetry] Correct a typo in monit_telemetry. Signed-off-by: Yong Zhao --- dockers/docker-sonic-telemetry/base_image_files/monit_telemetry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry index d4b6fd25f32b..3981b85ed0c8 100644 --- a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry +++ b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry @@ -7,5 +7,5 @@ check process telemetry matching "/usr/sbin/telemetry -logtostderr --insecure" if does not exist then alert -check process dialout_clienty matching "/usr/sbin/dialout_client_cli -insecure -logtostderr" +check process dialout_client matching "/usr/sbin/dialout_client_cli -insecure -logtostderr" if does not exist then alert From fb3cdd5694349c4c97093a714871ee7644326bc6 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:07:48 -0800 Subject: [PATCH 56/97] [Docker-teamd] Delete the monit config file for teamd. Signed-off-by: Yong Zhao --- dockers/docker-teamd/base_image_files/monit_teamd | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 dockers/docker-teamd/base_image_files/monit_teamd diff --git a/dockers/docker-teamd/base_image_files/monit_teamd b/dockers/docker-teamd/base_image_files/monit_teamd deleted file mode 100644 index 874c845c8b35..000000000000 --- a/dockers/docker-teamd/base_image_files/monit_teamd +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -## Monit configuration for teamd container -## process list: -## teamd -## teammgrd -## teamsyncd -############################################################################### -check process teamd matching "/usr/bin/teamd -r -t" - if does not exist then alert - -check process teammgrd matching "/usr/bin/teammgrd" - if does not exist then alert - -check process teamsyncd matching "/usr/bin/teamsyncd" - if does not exist then alert From 5b962c61aabdb0b48838393dd1b12049b2f2b67c Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:10:02 -0800 Subject: [PATCH 57/97] [Docker-teamd] Delete the mechanism to copy the monit config file into base image. Signed-off-by: Yong Zhao --- rules/docker-teamd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk index c17f9e9f1ddf..598eff97e8f1 100644 --- a/rules/docker-teamd.mk +++ b/rules/docker-teamd.mk @@ -29,5 +29,4 @@ $(DOCKER_TEAMD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_TEAMD)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_TEAMD)_BASE_IMAGE_FILES += teamdctl:/usr/bin/teamdctl -$(DOCKER_TEAMD)_BASE_IMAGE_FILES += monit_teamd:/etc/monit/conf.d $(DOCKER_TEAMD)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) From d4590ec9941a7d03ec4abcaecc6b43d5823ad9f4 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:12:47 -0800 Subject: [PATCH 58/97] [Docker-dhcprelay] Delete the monit config file for dhcp_relay container. Signed-off-by: Yong Zhao --- dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay diff --git a/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay b/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay deleted file mode 100644 index 3775e14fda41..000000000000 --- a/dockers/docker-dhcp-relay/base_image_files/monit_dhcprelay +++ /dev/null @@ -1,7 +0,0 @@ -############################################################################### -## Monit configuration for DHCP_Relay container -## process list: -## dhcrelay -############################################################################### -check process dhcrelay matching "/usr/bin/dhcrelay" - if does not exist then alert From 9bdafd36334e6e0a0ba1fccff7ef416c4a3651c0 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:13:49 -0800 Subject: [PATCH 59/97] [Docker-dhcprelay] Delete the mechanism to copy the monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-dhcp-relay.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index e63209692508..5aae24ee33b5 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -26,4 +26,3 @@ $(DOCKER_DHCP_RELAY)_CONTAINER_NAME = dhcp_relay $(DOCKER_DHCP_RELAY)_RUN_OPT += --net=host --privileged -t $(DOCKER_DHCP_RELAY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_DHCP_RELAY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -$(DOCKER_DHCP_RELAY)_BASE_IMAGE_FILES += monit_dhcprelay:/etc/monit/conf.d From 950cc9a7cb6e8d152a34050513cf4ab13de0ccbb Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:15:38 -0800 Subject: [PATCH 60/97] [Docker-radv] Delete the monit config file foe radv container. Signed-off-by: Yong Zhao --- .../docker-router-advertiser/base_image_files/monit_radv | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 dockers/docker-router-advertiser/base_image_files/monit_radv diff --git a/dockers/docker-router-advertiser/base_image_files/monit_radv b/dockers/docker-router-advertiser/base_image_files/monit_radv deleted file mode 100644 index 5bde9cbd4e39..000000000000 --- a/dockers/docker-router-advertiser/base_image_files/monit_radv +++ /dev/null @@ -1,7 +0,0 @@ -############################################################################### -## Monit configuration for router advertiser container -## process list: -## radvd -############################################################################### -check process radvd matching "/usr/sbin/radvd" - if does not exist then alert From d3ce225688675e75a48253f46a35fb082d83a3be Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:16:25 -0800 Subject: [PATCH 61/97] [Docker-radv] Delete the mechanism to copy the monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-router-advertiser.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk index 0c4a053fb936..53e0d7600ec9 100644 --- a/rules/docker-router-advertiser.mk +++ b/rules/docker-router-advertiser.mk @@ -26,4 +26,3 @@ $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += --net=host --privileged -t $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro $(DOCKER_ROUTER_ADVERTISER)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -$(DOCKER_ROUTER_ADVERTISER)_BASE_IMAGE_FILES += monit_radv:/etc/monit/conf.d From 58110791b42bde133759fef6407aad855cb981c3 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:35:39 -0800 Subject: [PATCH 62/97] [Docker-bgp] change the monit config file for BGP container such that monit only generates alert if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- dockers/docker-fpm-frr/base_image_files/monit_bgp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dockers/docker-fpm-frr/base_image_files/monit_bgp b/dockers/docker-fpm-frr/base_image_files/monit_bgp index 88ede078d8bd..d18f59021ddf 100644 --- a/dockers/docker-fpm-frr/base_image_files/monit_bgp +++ b/dockers/docker-fpm-frr/base_image_files/monit_bgp @@ -8,16 +8,16 @@ ## bgpcfgd ############################################################################### check process zebra matching "/usr/lib/frr/zebra" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process fpmsyncd matching "fpmsyncd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process bgpd matching "/usr/lib/frr/bgpd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process staticd matching "/usr/lib/frr/staticd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process bgpcfgd matching "python /usr/bin/bgpcfgd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 9b193a59f58a1f0025570c3c94d53f40da040f03 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:43:40 -0800 Subject: [PATCH 63/97] [Docker-snmp] Change the monit config file for snmp container such that monit only generates alret if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- dockers/docker-snmp-sv2/base_image_files/monit_snmp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dockers/docker-snmp-sv2/base_image_files/monit_snmp b/dockers/docker-snmp-sv2/base_image_files/monit_snmp index d6f7d227366e..f968702d7513 100644 --- a/dockers/docker-snmp-sv2/base_image_files/monit_snmp +++ b/dockers/docker-snmp-sv2/base_image_files/monit_snmp @@ -5,7 +5,7 @@ ## snmpd_subagent ############################################################################### check process snmpd matching "/usr/sbin/snmpd -f" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert -check process snmpd_subagent matching "python3.6 -m sonic_ax_impl" - if does not exist 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 From ac607df856d35420c4c4bbc9ced8497a6e35778a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:46:51 -0800 Subject: [PATCH 64/97] [Docker-pmon] Change the monit config file for pmon container such that monit only generates alert if the processes are not running for 5 minutes. Signed-off-by: Yong Zhao --- .../base_image_files/monit_pmon | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dockers/docker-platform-monitor/base_image_files/monit_pmon b/dockers/docker-platform-monitor/base_image_files/monit_pmon index 50429ac28019..f892cbf48f88 100644 --- a/dockers/docker-platform-monitor/base_image_files/monit_pmon +++ b/dockers/docker-platform-monitor/base_image_files/monit_pmon @@ -8,16 +8,16 @@ ## xcvrd ############################################################################### check process ledd matching "/usr/bin/python /usr/bin/ledd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process fancontrol matching "/bin/bash /usr/sbin/fancontrol" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process psud matching "/usr/bin/python /usr/bin/psud" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process syseepromd matching "/usr/bin/python /usr/bin/syseepromd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process xcvrd matching "/usr/bin/python /usr/bin/xcvrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 0090fe26012c4ece068659424f11c66e32e8028b Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:50:50 -0800 Subject: [PATCH 65/97] [Docker-lldp] Change the monit config file for lldp container such that monit only generates alerts if some processes are not running for 5 minutes. Signed-off-by: Yong Zhao --- dockers/docker-lldp-sv2/base_image_files/monit_lldp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dockers/docker-lldp-sv2/base_image_files/monit_lldp b/dockers/docker-lldp-sv2/base_image_files/monit_lldp index 86b7ce0f05fd..ec1457f46826 100644 --- a/dockers/docker-lldp-sv2/base_image_files/monit_lldp +++ b/dockers/docker-lldp-sv2/base_image_files/monit_lldp @@ -6,13 +6,10 @@ ## lldpmgrd ############################################################################### check process lldpd_monitor matching "lldpd: monitor" - if does not exist then alert - -check process lldpd_connected matching "lldpd: connected" - if does not exist then alert + 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 then alert + if does not exist for 5 times within 5 cycles then alert check process lldpmgrd matching "python /usr/bin/lldpmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 5f8210ddf4751428d32891d759952e115f90cd8a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:57:43 -0800 Subject: [PATCH 66/97] [Docker-pmon] Delete the monit config file for pmon container since some of processes are not running depended on the type of box. Signed-off-by: Yong Zhao --- .../base_image_files/monit_pmon | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 dockers/docker-platform-monitor/base_image_files/monit_pmon diff --git a/dockers/docker-platform-monitor/base_image_files/monit_pmon b/dockers/docker-platform-monitor/base_image_files/monit_pmon deleted file mode 100644 index f892cbf48f88..000000000000 --- a/dockers/docker-platform-monitor/base_image_files/monit_pmon +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################### -## Monit configuration for platform monitor container -## process list: -## ledd -## fancontrol -## psud -## syseepromd -## xcvrd -############################################################################### -check process ledd matching "/usr/bin/python /usr/bin/ledd" - if does not exist for 5 times within 5 cycles then alert - -check process fancontrol matching "/bin/bash /usr/sbin/fancontrol" - if does not exist for 5 times within 5 cycles then alert - -check process psud matching "/usr/bin/python /usr/bin/psud" - if does not exist for 5 times within 5 cycles then alert - -check process syseepromd matching "/usr/bin/python /usr/bin/syseepromd" - if does not exist for 5 times within 5 cycles then alert - -check process xcvrd matching "/usr/bin/python /usr/bin/xcvrd" - if does not exist for 5 times within 5 cycles then alert From 15b66f42e4d44f06851fbde51e269a114a038481 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 16:59:04 -0800 Subject: [PATCH 67/97] [Docker-pmon] Delete the copy mechanism to copy the monit config file into the base image. Signed-off-by: Yong Zhao --- rules/docker-platform-monitor.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index 753e832c430f..7a319e4bf120 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -44,5 +44,4 @@ $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd -$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += monit_pmon:/etc/monit/conf.d $(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) From 96efdde4a9d9e8b441fba7aa644e9f891d3f82ed Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:08:50 -0800 Subject: [PATCH 68/97] [Docker-lldp] Change the matching name for the process lldpd. Signed-off-by: Yong Zhao --- dockers/docker-lldp-sv2/base_image_files/monit_lldp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-lldp-sv2/base_image_files/monit_lldp b/dockers/docker-lldp-sv2/base_image_files/monit_lldp index ec1457f46826..7921abc95cf4 100644 --- a/dockers/docker-lldp-sv2/base_image_files/monit_lldp +++ b/dockers/docker-lldp-sv2/base_image_files/monit_lldp @@ -5,7 +5,7 @@ ## lldp-syncd ## lldpmgrd ############################################################################### -check process lldpd_monitor matching "lldpd: monitor" +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" From 8475baba145cb3937a997f7acb7727ec926dd845 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:12:42 -0800 Subject: [PATCH 69/97] [Docker-swss] Change the monit config file for swss container such that monit only generates alerts if the processes are not running for 5 minutes. Signed-off-by: Yong Zhao --- .../base_image_files/monit_swss | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss index a5f1350197ff..f52e0c6cfd11 100644 --- a/dockers/docker-orchagent/base_image_files/monit_swss +++ b/dockers/docker-orchagent/base_image_files/monit_swss @@ -13,31 +13,31 @@ ## vxlanmgrd ############################################################################### check process orchagent matching "/usr/bin/orchagent -d /var/log/swss" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process portsyncd matching "/usr/bin/portsyncd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process neighsyncd matching "/usr/bin/neighsyncd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process vrfmgrd matching "/usr/bin/vrfmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process vlanmgrd matching "/usr/bin/vlanmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process intfmgrd matching "/usr/bin/intfmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process portmgrd matching "/usr/bin/portmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process buffermgrd matching "/usr/bin/buffermgrd -l" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process nbrmgrd matching "/usr/bin/nbrmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert check process vxlanmgrd matching "/usr/bin/vxlanmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 3cdbb229cece650dbe41d696ef12ab74510911e1 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:18:50 -0800 Subject: [PATCH 70/97] [Docker-syncd] Change the monit config file for syncd container on barefoot such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd index 6af1731ee6fa..4057acc04bd6 100644 --- a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd +++ b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + if does not exist for 5 times within 5 cyclesthen alert From 311a8ffabab5f263b134a6f1417e75da652896fe Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:20:45 -0800 Subject: [PATCH 71/97] [Docker-syncd] Correct a typo in monit config file. Signed-off-by: Yong Zhao --- platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd index 4057acc04bd6..4cdbf068e2e8 100644 --- a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd +++ b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cyclesthen alert + if does not exist for 5 times within 5 cycles then alert From a2b79a49b1d4f2f8beb9c43b88c745e3ee3f3121 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:23:31 -0800 Subject: [PATCH 72/97] [Docker-syncd] Change the monit config file for syncd container on broadcom such that monit only generates alerts if the processes are not running for 5 minutes. Signed-off-by: Yong Zhao --- .../broadcom/docker-syncd-brcm/base_image_files/monit_syncd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd index 37e80a8fde15..7e094e6cb0c8 100644 --- a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd +++ b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd @@ -5,7 +5,7 @@ ## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + 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 then alert + if does not exist for 5 times within 5 cycles then alert From d534cdac1c62f174fcd59473ab3972cc3d713015 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:26:16 -0800 Subject: [PATCH 73/97] [Docker-syncd] Change the monit config file for syncd container on cavium such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd index 6af1731ee6fa..4cdbf068e2e8 100644 --- a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd +++ b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From cfe2a3db41f9cd6d74880facce1e9c4cd7eb5cf0 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:28:25 -0800 Subject: [PATCH 74/97] [Docker-syncd] Change the monit config file for syncd container such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- .../centec/docker-syncd-centec/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd index 6af1731ee6fa..4cdbf068e2e8 100644 --- a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd +++ b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From df6b42540cacbc5103d582f793427ec0cd12bc5d Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:30:48 -0800 Subject: [PATCH 75/97] [Docker-syncd] Change the monit config file for syncd container on marvell such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd index 6af1731ee6fa..4cdbf068e2e8 100644 --- a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From a6c8b8c9d66ac9ccc85cc0a37d606c2b76ffffa9 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:33:00 -0800 Subject: [PATCH 76/97] [Docker-syncd] Change the monit config file for syncd container on marvell-arm64 such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd index 6af1731ee6fa..4cdbf068e2e8 100644 --- a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 329b6ef81d5e6f6fe97791064c2ba5392445fff3 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:43:11 -0800 Subject: [PATCH 77/97] [Docker-syncd] Change the monit config file for syncd container on marvell-armhf such that monit will generate alert if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd index 6af1731ee6fa..4cdbf068e2e8 100644 --- a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From da3b15dd0b5945280db7e68e6642bd11d4bdb09a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:45:37 -0800 Subject: [PATCH 78/97] [Docker-syncd] Change the monit config file for syncd container on mellanox such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- .../mellanox/docker-syncd-mlnx/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd index 6af1731ee6fa..4cdbf068e2e8 100644 --- a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd +++ b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd @@ -4,4 +4,4 @@ ## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 8cc829169a978056af675af0ad9032a2946dddc2 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:47:28 -0800 Subject: [PATCH 79/97] [Docker-sycnd] Change the monit config file for syncd container such that monit only generates alerts if the processes are not running for 5 minutes. Signed-off-by: Yong Zhao --- .../nephos/docker-syncd-nephos/base_image_files/monit_syncd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd index 37e80a8fde15..7e094e6cb0c8 100644 --- a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd +++ b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd @@ -5,7 +5,7 @@ ## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist then alert + 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 then alert + if does not exist for 5 times within 5 cycles then alert From e943f01e4dd7faf75f48d38efb0c46d87fcdf1e5 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:49:53 -0800 Subject: [PATCH 80/97] [Docker-sflow] Change the monit config file for sflow container such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- dockers/docker-sflow/base_image_files/monit_sflow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-sflow/base_image_files/monit_sflow b/dockers/docker-sflow/base_image_files/monit_sflow index 2f2c0a72ca34..c80575e65238 100644 --- a/dockers/docker-sflow/base_image_files/monit_sflow +++ b/dockers/docker-sflow/base_image_files/monit_sflow @@ -4,4 +4,4 @@ ## sflowmgrd ############################################################################### check process sflowmgrd matching "/usr/bin/sflowmgrd" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 19cf640ce8b5fe019eaf9b4ebcdb5213315fba18 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:51:55 -0800 Subject: [PATCH 81/97] [Docker-telemetry] Change the monit config file for telemetry container such that monit only generates alerts if the processes are not running for 5 minutes. Signed-off-by: Yong Zhao --- .../docker-sonic-telemetry/base_image_files/monit_telemetry | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry index 3981b85ed0c8..cc7aa3e7cb55 100644 --- a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry +++ b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry @@ -5,7 +5,7 @@ ## dialout_client ############################################################################### check process telemetry matching "/usr/sbin/telemetry -logtostderr --insecure" - if does not exist then alert + 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 then alert + if does not exist for 5 times within 5 cycles then alert From 6af79635dd9fd6355334f6ec8074329d46cc6a5a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 17:53:18 -0800 Subject: [PATCH 82/97] [Docker-database] Change the monit config file for database container such that monit only generates alerts if the process is not running for 5 minutes. Signed-off-by: Yong Zhao --- dockers/docker-database/base_image_files/monit_database | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-database/base_image_files/monit_database b/dockers/docker-database/base_image_files/monit_database index 5cb833ba4211..c6d675d3cfcd 100644 --- a/dockers/docker-database/base_image_files/monit_database +++ b/dockers/docker-database/base_image_files/monit_database @@ -4,4 +4,4 @@ ## redis_server ############################################################################### check process redis_server matching "/usr/bin/redis-server" - if does not exist then alert + if does not exist for 5 times within 5 cycles then alert From 8ea4b10e19f85459833827c2f60a831f9b074af7 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:16:04 -0800 Subject: [PATCH 83/97] [Docker-database] Use 4 spaces to replace 2 spaces in monit config file. Signed-off-by: Yong Zhao --- dockers/docker-database/base_image_files/monit_database | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-database/base_image_files/monit_database b/dockers/docker-database/base_image_files/monit_database index c6d675d3cfcd..c5508922864e 100644 --- a/dockers/docker-database/base_image_files/monit_database +++ b/dockers/docker-database/base_image_files/monit_database @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for database container ## process list: -## redis_server +## redis_server ############################################################################### check process redis_server matching "/usr/bin/redis-server" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert From 3c4fc4690fdc82966596cf4b71f06696381f60a9 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:19:06 -0800 Subject: [PATCH 84/97] [Docker-bgp] Use 4 spcess to replace 2 spaces in monit config file. Signed-off-by: Yong Zhao --- .../docker-fpm-frr/base_image_files/monit_bgp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dockers/docker-fpm-frr/base_image_files/monit_bgp b/dockers/docker-fpm-frr/base_image_files/monit_bgp index d18f59021ddf..df568a84c043 100644 --- a/dockers/docker-fpm-frr/base_image_files/monit_bgp +++ b/dockers/docker-fpm-frr/base_image_files/monit_bgp @@ -1,23 +1,23 @@ ############################################################################### ## Monit configuration for BGP container ## process list: -## zebra -## fpmsyncd -## bgpd -## staticd -## bgpcfgd +## zebra +## fpmsyncd +## bgpd +## staticd +## bgpcfgd ############################################################################### check process zebra matching "/usr/lib/frr/zebra" - if does not exist for 5 times within 5 cycles then alert + 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 + 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 + 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 + 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 + if does not exist for 5 times within 5 cycles then alert From 1c685bbf31e24a264e0b6ced0f73d905a49c26c8 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:21:28 -0800 Subject: [PATCH 85/97] [Docker-lldp] Use 4 spaces to replace 2 spaces in monit config file. Signed-off-by: Yong Zhao --- dockers/docker-lldp-sv2/base_image_files/monit_lldp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dockers/docker-lldp-sv2/base_image_files/monit_lldp b/dockers/docker-lldp-sv2/base_image_files/monit_lldp index 7921abc95cf4..200c52c7d332 100644 --- a/dockers/docker-lldp-sv2/base_image_files/monit_lldp +++ b/dockers/docker-lldp-sv2/base_image_files/monit_lldp @@ -1,15 +1,15 @@ ############################################################################### ## Monit configuration for lldp container ## process list: -## lldpd -## lldp-syncd -## lldpmgrd +## lldpd +## lldp-syncd +## lldpmgrd ############################################################################### check process lldpd_monitor matching "lldpd: " - if does not exist for 5 times within 5 cycles then alert + 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 + 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 + if does not exist for 5 times within 5 cycles then alert From 645de7bc86bbdabff6e283bae73e73e131d9a909 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:24:14 -0800 Subject: [PATCH 86/97] [Docker-swss] Use 4 spaces to replace 2 space in monit config file. Signed-off-by: Yong Zhao --- .../base_image_files/monit_swss | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dockers/docker-orchagent/base_image_files/monit_swss b/dockers/docker-orchagent/base_image_files/monit_swss index f52e0c6cfd11..5928dbd4ddb0 100644 --- a/dockers/docker-orchagent/base_image_files/monit_swss +++ b/dockers/docker-orchagent/base_image_files/monit_swss @@ -1,43 +1,43 @@ ############################################################################### ## Monit configuration for swss container ## process list: -## orchagent -## portsyncd -## neighsyncd -## vrfmgrd -## vlanmgrd -## intfmgrd -## portmgrd -## buffermgrd -## nbrmgrd -## vxlanmgrd +## 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + if does not exist for 5 times within 5 cycles then alert From a8f54908a0718be6f87c93a2d8e6f989bc1c1af4 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:25:40 -0800 Subject: [PATCH 87/97] [Docker-sflow] Use 4 spaces to replace 2 spaces in monit config file. Signed-off-by: Yong Zhao --- dockers/docker-sflow/base_image_files/monit_sflow | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-sflow/base_image_files/monit_sflow b/dockers/docker-sflow/base_image_files/monit_sflow index c80575e65238..d041f81001ea 100644 --- a/dockers/docker-sflow/base_image_files/monit_sflow +++ b/dockers/docker-sflow/base_image_files/monit_sflow @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for sflow container ## process list: -## sflowmgrd +## sflowmgrd ############################################################################### check process sflowmgrd matching "/usr/bin/sflowmgrd" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert From 2e8f43ec1d638d69ec3110ff2719f632bf38a88e Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:26:56 -0800 Subject: [PATCH 88/97] [Docker-snmp] Use 4 spaces to replace 2 spaces in monit config file. Signed-off-by: Yong Zhao --- dockers/docker-snmp-sv2/base_image_files/monit_snmp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dockers/docker-snmp-sv2/base_image_files/monit_snmp b/dockers/docker-snmp-sv2/base_image_files/monit_snmp index f968702d7513..811f9d14b3d4 100644 --- a/dockers/docker-snmp-sv2/base_image_files/monit_snmp +++ b/dockers/docker-snmp-sv2/base_image_files/monit_snmp @@ -1,11 +1,11 @@ ############################################################################### ## Monit configuration for snmp container ## process list: -## snmpd -## snmpd_subagent +## snmpd +## snmpd_subagent ############################################################################### check process snmpd matching "/usr/sbin/snmpd -f" - if does not exist for 5 times within 5 cycles then alert + 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 + if does not exist for 5 times within 5 cycles then alert From f12f9251f51a0a04017309ca15f247d2773793a6 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:28:00 -0800 Subject: [PATCH 89/97] [Docker-telemetry] Use 4 spaces to replace 2 spaces in monit config file. Signed-off-by: Yong Zhao --- .../base_image_files/monit_telemetry | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry index cc7aa3e7cb55..555822c57f80 100644 --- a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry +++ b/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry @@ -1,11 +1,11 @@ ############################################################################### ## Monit configuration for telemetry container ## process list: -## telemetry -## dialout_client +## telemetry +## dialout_client ############################################################################### check process telemetry matching "/usr/sbin/telemetry -logtostderr --insecure" - if does not exist for 5 times within 5 cycles then alert + 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 + if does not exist for 5 times within 5 cycles then alert From e6ca253a16a1d38bc2472b1c35649644da522729 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:29:27 -0800 Subject: [PATCH 90/97] [Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file on barefoot. Signed-off-by: Yong Zhao --- .../barefoot/docker-syncd-bfn/base_image_files/monit_syncd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd index 4cdbf068e2e8..9cc5891c7c32 100644 --- a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd +++ b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd +## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert From 270dec7d85b3f6faa3bc738a480e5ccaf879baef Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:30:30 -0800 Subject: [PATCH 91/97] [Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file on broadcom. Signed-off-by: Yong Zhao --- .../docker-syncd-brcm/base_image_files/monit_syncd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd index 7e094e6cb0c8..3f8bc50007d7 100644 --- a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd +++ b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd @@ -1,11 +1,11 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd -## dsserve +## syncd +## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + 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 + if does not exist for 5 times within 5 cycles then alert From 7ee5bf4088f5d8cb39412b98ef82400956a48771 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:31:58 -0800 Subject: [PATCH 92/97] [Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file on cavium. Signed-off-by: Yong Zhao --- .../cavium/docker-syncd-cavm/base_image_files/monit_syncd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd index 4cdbf068e2e8..9cc5891c7c32 100644 --- a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd +++ b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd +## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert From 8507b1b9cbcd5101aa07061194ba1f84a9cc2e3a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:32:58 -0800 Subject: [PATCH 93/97] [Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file on centec. Signed-off-by: Yong Zhao --- .../centec/docker-syncd-centec/base_image_files/monit_syncd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd index 4cdbf068e2e8..9cc5891c7c32 100644 --- a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd +++ b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd +## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert From c13b1ced8bb599cf024e36ffb491224437f769d2 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:35:17 -0800 Subject: [PATCH 94/97] [Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file on marvell. Signed-off-by: Yong Zhao --- .../docker-syncd-mrvl/base_image_files/monit_syncd | 4 ++-- .../docker-syncd-mrvl/base_image_files/monit_syncd | 4 ++-- .../marvell/docker-syncd-mrvl/base_image_files/monit_syncd | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd index 4cdbf068e2e8..9cc5891c7c32 100644 --- a/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell-arm64/docker-syncd-mrvl/base_image_files/monit_syncd @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd +## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert diff --git a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd index 4cdbf068e2e8..9cc5891c7c32 100644 --- a/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell-armhf/docker-syncd-mrvl/base_image_files/monit_syncd @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd +## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd index 4cdbf068e2e8..9cc5891c7c32 100644 --- a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd +## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert From a130980b08c847fb9d0a8a1d9e3f5ed37e55292c Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:36:55 -0800 Subject: [PATCH 95/97] [Docker-syncd] Use 4 spaces to replace 2 spaces in the monit config file on mellanox. Signed-off-by: Yong Zhao --- .../mellanox/docker-syncd-mlnx/base_image_files/monit_syncd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd index 4cdbf068e2e8..9cc5891c7c32 100644 --- a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd +++ b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd +## syncd ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + if does not exist for 5 times within 5 cycles then alert From 8db56f69e47c7e4c155de0af084bc99579a5e16c Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Jan 2020 18:37:56 -0800 Subject: [PATCH 96/97] [Docker-syncd] Use 4 spaces to repalce 2 spaces in the monit config file on nephos. Signed-off-by: Yong Zhao --- .../docker-syncd-nephos/base_image_files/monit_syncd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd index 7e094e6cb0c8..3f8bc50007d7 100644 --- a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd +++ b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd @@ -1,11 +1,11 @@ ############################################################################### ## Monit configuration for syncd container ## process list: -## syncd -## dsserve +## syncd +## dsserve ############################################################################### check process syncd matching "/usr/bin/syncd --diag" - if does not exist for 5 times within 5 cycles then alert + 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 + if does not exist for 5 times within 5 cycles then alert From c849b588fb7756b06c9eaf01f11fb2b4fda40b0b Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Sat, 4 Jan 2020 15:35:34 -0800 Subject: [PATCH 97/97] [Docker-bgp] Remove the trailing extra spaces in monit config file. Signed-off-by: Yong Zhao --- dockers/docker-fpm-frr/base_image_files/monit_bgp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-fpm-frr/base_image_files/monit_bgp b/dockers/docker-fpm-frr/base_image_files/monit_bgp index df568a84c043..5b943ea7c0bb 100644 --- a/dockers/docker-fpm-frr/base_image_files/monit_bgp +++ b/dockers/docker-fpm-frr/base_image_files/monit_bgp @@ -1,7 +1,7 @@ ############################################################################### ## Monit configuration for BGP container ## process list: -## zebra +## zebra ## fpmsyncd ## bgpd ## staticd