[Monit] Use the string '/usr/bin/syncd' in Monit configuration files …

…to match the syncd process. Signed-off-by: Yong Zhao <[email protected]>
sonic-net · Sep 18, 2020 · e4c0824 · e4c0824
1 parent 9ecb61d
commit e4c0824
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/files/image_config/monit/process_checker b/files/image_config/monit/process_checker
@@ -35,7 +35,7 @@ def check_process_existence(container_name, process_name, process_cmdline):
                 if process.name() == "process_checker":
                     continue
 
-                if ((process_name == process.name() or process_cmdline in ' '.join(process.cmdline()))
+                if ((process_name == process.name() or (' '.join(process.cmdline())).startswith(process_cmdline))
                         and process.status() in ["running", "sleeping"]):
                     is_running = True
                     break

diff --git 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 program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 for 5 times within 5 cycles then alert
diff --git 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 program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 for 5 times within 5 cycles then alert
 
 check program syncd|dsserve with path "/usr/bin/process_checker syncd dsserve /usr/bin/dsserve /usr/bin/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
@@ -3,5 +3,5 @@
 ## process list:
 ##  syncd
 ###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 for 5 times within 5 cycles then alert
diff --git 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 program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 for 5 times within 5 cycles then alert
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
@@ -3,5 +3,5 @@
 ## process list:
 ##  syncd
 ###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 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
@@ -3,5 +3,5 @@
 ## process list:
 ##  syncd
 ###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 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
@@ -3,5 +3,5 @@
 ## process list:
 ##  syncd
 ###############################################################################
-check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 for 5 times within 5 cycles then alert
diff --git 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 program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 for 5 times within 5 cycles then alert
diff --git 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 program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd --diag"
+check program syncd|syncd with path "/usr/bin/process_checker syncd syncd /usr/bin/syncd"
     if status != 0 for 5 times within 5 cycles then alert
 
 check program syncd|dsserve with path "/usr/bin/process_checker syncd dsserve /usr/bin/dsserve /usr/bin/syncd"