From 763dd4da78091e21a17bcf937a816df30eeadf48 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 13:57:35 -0800 Subject: [PATCH 1/9] [Docker-syncd] Change the process name of syncd in the monit config file such that this name is universal for all platforms not specific for a vendor. 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 9cc5891c7c32..3079618990ed 100644 --- a/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd +++ b/platform/barefoot/docker-syncd-bfn/base_image_files/monit_syncd @@ -3,5 +3,5 @@ ## process list: ## syncd ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert From 3c874751a97af5079e77277b6863bff2a13b23b9 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:00:57 -0800 Subject: [PATCH 2/9] [Docker-syncd] Change the process name of syncd in the monit config file such that it is universal not specific for a vendor. Signed-off-by: Yong Zhao --- .../broadcom/docker-syncd-brcm/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8bc50007d7..0b9ec741cd57 100644 --- a/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd +++ b/platform/broadcom/docker-syncd-brcm/base_image_files/monit_syncd @@ -4,7 +4,7 @@ ## syncd ## dsserve ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd" From ba2c9c4419f5875f2a8eac1f009be782b49f28b5 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:02:19 -0800 Subject: [PATCH 3/9] [Docker-syncd] Change the full process name of syncd in the monit config file such that it is universal. 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 9cc5891c7c32..3079618990ed 100644 --- a/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd +++ b/platform/cavium/docker-syncd-cavm/base_image_files/monit_syncd @@ -3,5 +3,5 @@ ## process list: ## syncd ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert From dcdc0a55620f9ee67a55a53cf9a6a286856e8fca Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:03:51 -0800 Subject: [PATCH 4/9] [Docker-syncd] Change the full process name im the monit config file such that it is universal for all the platforms. 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 9cc5891c7c32..3079618990ed 100644 --- a/platform/centec/docker-syncd-centec/base_image_files/monit_syncd +++ b/platform/centec/docker-syncd-centec/base_image_files/monit_syncd @@ -3,5 +3,5 @@ ## process list: ## syncd ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert From fdac1dfec28cfb0e3b281d696f110c897d78513a Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:05:10 -0800 Subject: [PATCH 5/9] [Docker-syncd] Change the full process name of syncd in the monit config file such that it is universal for all platforms. 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 9cc5891c7c32..3079618990ed 100644 --- a/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd +++ b/platform/marvell/docker-syncd-mrvl/base_image_files/monit_syncd @@ -3,5 +3,5 @@ ## process list: ## syncd ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert From 3d211717b21722fb435bab9e1cf21166f59ff402 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:06:12 -0800 Subject: [PATCH 6/9] [Docker-syncd]Change the full process name in the monit config file such that it is universal for all platforms. 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 9cc5891c7c32..3079618990ed 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 @@ -3,5 +3,5 @@ ## process list: ## syncd ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert From a5e0536eb6c577b35368b9034fd7c7a4baa3ac15 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:07:14 -0800 Subject: [PATCH 7/9] [Docker-syncd] Change the full process name of syncd in the monit config file such that it is universal for all platforms. 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 9cc5891c7c32..3079618990ed 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 @@ -3,5 +3,5 @@ ## process list: ## syncd ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert From d8a57e1cb7b7ff9092e2b1bc1f7cee348ac8d2c6 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:08:24 -0800 Subject: [PATCH 8/9] [Docker-syncd] Change the full process name of syncd in the monit config file such that it is universal for all the platforms. 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 9cc5891c7c32..3079618990ed 100644 --- a/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd +++ b/platform/mellanox/docker-syncd-mlnx/base_image_files/monit_syncd @@ -3,5 +3,5 @@ ## process list: ## syncd ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert From 1cbc5f750e10c4ac4635b7720d890a37aad43943 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Thu, 16 Jan 2020 14:09:24 -0800 Subject: [PATCH 9/9] [Docker-syncd] Change the full process name of syncd in the monit config file such that it is universal for all platforms. Signed-off-by: Yong Zhao --- .../nephos/docker-syncd-nephos/base_image_files/monit_syncd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f8bc50007d7..0b9ec741cd57 100644 --- a/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd +++ b/platform/nephos/docker-syncd-nephos/base_image_files/monit_syncd @@ -4,7 +4,7 @@ ## syncd ## dsserve ############################################################################### -check process syncd matching "/usr/bin/syncd --diag" +check process syncd matching "/usr/bin/syncd" if does not exist for 5 times within 5 cycles then alert check process dsserve matching "/usr/bin/dsserve /usr/bin/syncd"