pphuchar · pull · Jan 11, 2020 · Jan 11, 2020
diff --git a/dockers/docker-database/base_image_files/monit_database 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 for 5 times within 5 cycles then alert
diff --git a/dockers/docker-fpm-frr/base_image_files/monit_bgp 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 for 5 times within 5 cycles then alert
+
+check process fpmsyncd matching "fpmsyncd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process bgpd matching "/usr/lib/frr/bgpd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process staticd matching "/usr/lib/frr/staticd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process bgpcfgd matching "python /usr/bin/bgpcfgd"
+    if does not exist for 5 times within 5 cycles then alert
diff --git a/dockers/docker-lldp-sv2/base_image_files/monit_lldp b/dockers/docker-lldp-sv2/base_image_files/monit_lldp
@@ -0,0 +1,15 @@
+###############################################################################
+## Monit configuration for lldp container
+## process list:
+##  lldpd
+##  lldp-syncd
+##  lldpmgrd
+###############################################################################
+check process lldpd_monitor matching "lldpd: "
+    if does not exist for 5 times within 5 cycles then alert
+
+check process lldp_syncd matching "python2 -m lldp_syncd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process lldpmgrd matching "python /usr/bin/lldpmgrd"
+    if does not exist for 5 times within 5 cycles then alert
diff --git a/dockers/docker-orchagent/base_image_files/monit_swss 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 for 5 times within 5 cycles then alert
+
+check process portsyncd matching "/usr/bin/portsyncd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process neighsyncd matching "/usr/bin/neighsyncd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process vrfmgrd matching "/usr/bin/vrfmgrd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process vlanmgrd matching "/usr/bin/vlanmgrd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process intfmgrd matching "/usr/bin/intfmgrd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process portmgrd matching "/usr/bin/portmgrd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process buffermgrd matching "/usr/bin/buffermgrd -l"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process nbrmgrd matching "/usr/bin/nbrmgrd"
+    if does not exist for 5 times within 5 cycles then alert
+
+check process vxlanmgrd matching "/usr/bin/vxlanmgrd"
+    if does not exist for 5 times within 5 cycles then alert
diff --git a/dockers/docker-sflow/base_image_files/monit_sflow 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 for 5 times within 5 cycles then alert
diff --git a/dockers/docker-snmp-sv2/base_image_files/monit_snmp 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 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
diff --git a/dockers/docker-sonic-telemetry/base_image_files/monit_telemetry 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 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
diff --git 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
diff --git a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd
@@ -0,0 +1,7 @@
+###############################################################################
+## Monit configuration for syncd container
+## process list:
+##  syncd
+###############################################################################
+check process syncd matching "/usr/bin/syncd --diag"
+    if does not exist for 5 times within 5 cycles then alert
diff --git 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
diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd 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 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
diff --git 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
diff --git a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd
@@ -0,0 +1,7 @@
+###############################################################################
+## Monit configuration for syncd container
+## process list:
+##  syncd
+###############################################################################
+check process syncd matching "/usr/bin/syncd --diag"
+    if does not exist for 5 times within 5 cycles then alert
diff --git 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
diff --git a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd
@@ -0,0 +1,7 @@
+###############################################################################
+## Monit configuration for syncd container
+## process list:
+##  syncd
+###############################################################################
+check process syncd matching "/usr/bin/syncd --diag"
+    if does not exist for 5 times within 5 cycles then alert
diff --git 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
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
@@ -0,0 +1,7 @@
+###############################################################################
+## Monit configuration for syncd container
+## process list:
+##  syncd
+###############################################################################
+check process syncd matching "/usr/bin/syncd --diag"
+    if does not exist for 5 times within 5 cycles then alert
diff --git 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
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
@@ -0,0 +1,7 @@
+###############################################################################
+## Monit configuration for syncd container
+## process list:
+##  syncd
+###############################################################################
+check process syncd matching "/usr/bin/syncd --diag"
+    if does not exist for 5 times within 5 cycles then alert
diff --git 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
diff --git a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd
@@ -0,0 +1,7 @@
+###############################################################################
+## Monit configuration for syncd container
+## process list:
+##  syncd
+###############################################################################
+check process syncd matching "/usr/bin/syncd --diag"
+    if does not exist for 5 times within 5 cycles then alert
diff --git 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
diff --git a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd
@@ -0,0 +1,7 @@
+###############################################################################
+## Monit configuration for syncd container
+## process list:
+##  syncd
+###############################################################################
+check process syncd matching "/usr/bin/syncd --diag"
+    if does not exist for 5 times within 5 cycles then alert
diff --git 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
diff --git a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd 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 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
diff --git 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
diff --git 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
diff --git 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)
diff --git 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)
diff --git 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)
diff --git 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
diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk
@@ -30,3 +30,4 @@ $(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_TELEMETRY)_RUN_OPT += --mount type=bind,source="/var/platform/",target="/mnt/platform/"
 
 $(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
+$(DOCKER_TELEMETRY)_BASE_IMAGE_FILES += monit_telemetry:/etc/monit/conf.d