[Monit] Deprecate the feature of monitoring the critical processes by Monit (#7676)
Signed-off-by: Yong Zhao yozhao@microsoft.com Why I did it Currently we leveraged the Supervisor to monitor the running status of critical processes in each container and it is more reliable and flexible than doing the monitoring by Monit. So we removed the functionality of monitoring the critical processes by Monit. How I did it I removed the script process_checker and corresponding Monit configuration entries of critical processes. How to verify it I verified this on the device str-7260cx3-acs-1.
This commit is contained in:
yozhao101
GitHub
parent
9d05077431
commit
1a3cab43ac
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for database container
|
||||
## process list:
|
||||
## redis_server
|
||||
###############################################################################
|
||||
check program database|redis_server with path "/usr/bin/process_checker database /usr/bin/redis-server"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -1,27 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for BGP container
|
||||
## process list:
|
||||
## zebra
|
||||
## fpmsyncd
|
||||
## bgpd
|
||||
## staticd
|
||||
## bgpcfgd
|
||||
## bgpmon
|
||||
###############################################################################
|
||||
check program bgp|zebra with path "/usr/bin/process_checker bgp /usr/lib/frr/zebra"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program bgp|fpmsyncd with path "/usr/bin/process_checker bgp fpmsyncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program bgp|bgpd with path "/usr/bin/process_checker bgp /usr/lib/frr/bgpd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program bgp|staticd with path "/usr/bin/process_checker bgp /usr/lib/frr/staticd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program bgp|bgpcfgd with path "/usr/bin/process_checker bgp /usr/bin/python3 /usr/local/bin/bgpcfgd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program bgp|bgpmon with path "/usr/bin/process_checker bgp /usr/bin/python3 /usr/local/bin/bgpmon"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -1,15 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for lldp container
|
||||
## process list:
|
||||
## lldpd
|
||||
## lldp-syncd
|
||||
## lldpmgrd
|
||||
###############################################################################
|
||||
check program lldp|lldpd_monitor with path "/usr/bin/process_checker lldp lldpd:"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program lldp|lldp_syncd with path "/usr/bin/process_checker lldp python3 -m lldp_syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program lldp|lldpmgrd with path "/usr/bin/process_checker lldp python3 /usr/bin/lldpmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -1,56 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for swss container
|
||||
## process list:
|
||||
## orchagent
|
||||
## portsyncd
|
||||
## neighsyncd
|
||||
## fdbsyncd
|
||||
## vrfmgrd
|
||||
## vlanmgrd
|
||||
## intfmgrd
|
||||
## portmgrd
|
||||
## buffermgrd
|
||||
## nbrmgrd
|
||||
## vxlanmgrd
|
||||
## coppmgrd
|
||||
## tunnelmgrd
|
||||
|
||||
##############################################################################
|
||||
check program swss|orchagent with path "/usr/bin/process_checker swss /usr/bin/orchagent -d /var/log/swss"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|portsyncd with path "/usr/bin/process_checker swss /usr/bin/portsyncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|neighsyncd with path "/usr/bin/process_checker swss /usr/bin/neighsyncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|fdbsyncd with path "/usr/bin/process_checker swss /usr/bin/fdbsyncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|vrfmgrd with path "/usr/bin/process_checker swss /usr/bin/vrfmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|vlanmgrd with path "/usr/bin/process_checker swss /usr/bin/vlanmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|intfmgrd with path "/usr/bin/process_checker swss /usr/bin/intfmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|portmgrd with path "/usr/bin/process_checker swss /usr/bin/portmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|buffermgrd with path "/usr/bin/process_checker swss /usr/bin/buffermgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|nbrmgrd with path "/usr/bin/process_checker swss /usr/bin/nbrmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|vxlanmgrd with path "/usr/bin/process_checker swss /usr/bin/vxlanmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|coppmgrd with path "/usr/bin/process_checker swss /usr/bin/coppmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program swss|tunnelmgrd with path "/usr/bin/process_checker swss /usr/bin/tunnelmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for sflow container
|
||||
## process list:
|
||||
## sflowmgrd
|
||||
###############################################################################
|
||||
check program sflow|sflowmgrd with path "/usr/bin/process_checker sflow /usr/bin/sflowmgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -1,11 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for snmp container
|
||||
## process list:
|
||||
## snmpd
|
||||
## snmpd_subagent
|
||||
###############################################################################
|
||||
check program snmp|snmpd with path "/usr/bin/process_checker snmp /usr/sbin/snmpd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program snmp|snmp_subagent with path "/usr/bin/process_checker snmp python3 -m sonic_ax_impl"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for restapi container
|
||||
## process list:
|
||||
## restapi
|
||||
###############################################################################
|
||||
check program restapi|restapi with path "/usr/bin/process_checker restapi /usr/sbin/go-server-server"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -1,14 +1,5 @@
|
||||
###############################################################################
|
||||
## Monit configuration for telemetry container
|
||||
## process list:
|
||||
## telemetry
|
||||
## dialout_client
|
||||
###############################################################################
|
||||
check program telemetry|telemetry with path "/usr/bin/process_checker telemetry /usr/sbin/telemetry"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program telemetry|dialout_client with path "/usr/bin/process_checker telemetry /usr/sbin/dialout_client_cli"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
|
||||
if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for teamd container
|
||||
## process list:
|
||||
## teamsyncd
|
||||
## teammgrd
|
||||
###############################################################################
|
||||
check program teamd|teamsyncd with path "/usr/bin/process_checker teamd /usr/bin/teamsyncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program teamd|teammgrd with path "/usr/bin/process_checker teamd /usr/bin/teammgrd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -330,8 +330,6 @@ sudo cp $IMAGE_CONFIGS/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
|
||||
sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc
|
||||
sudo cp $IMAGE_CONFIGS/monit/conf.d/* $FILESYSTEM_ROOT/etc/monit/conf.d/
|
||||
sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/conf.d/*
|
||||
sudo cp $IMAGE_CONFIGS/monit/process_checker $FILESYSTEM_ROOT/usr/bin/
|
||||
sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/process_checker
|
||||
sudo cp $IMAGE_CONFIGS/monit/container_checker $FILESYSTEM_ROOT/usr/bin/
|
||||
sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/container_checker
|
||||
sudo cp $IMAGE_CONFIGS/monit/memory_checker $FILESYSTEM_ROOT/usr/bin/
|
||||
|
||||
@ -1,98 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
import argparse
|
||||
import ast
|
||||
import sys
|
||||
import syslog
|
||||
|
||||
import psutil
|
||||
from sonic_py_common import multi_asic
|
||||
import swsssdk
|
||||
|
||||
|
||||
def check_process_existence(container_name, process_cmdline):
|
||||
"""
|
||||
@summary: Check whether the process in the specified container is running or not and
|
||||
an alerting message will written into syslog if it failed to run.
|
||||
"""
|
||||
config_db = swsssdk.ConfigDBConnector()
|
||||
config_db.connect()
|
||||
feature_table = config_db.get_table("FEATURE")
|
||||
|
||||
if container_name in feature_table:
|
||||
# We look into the 'FEATURE' table to verify whether the container is disabled or not.
|
||||
# If the container is diabled, we exit.
|
||||
if ("state" in feature_table[container_name]
|
||||
and feature_table[container_name]["state"] == "disabled"):
|
||||
sys.exit(0)
|
||||
else:
|
||||
# We leveraged the psutil library to help us check whether the process is running or not.
|
||||
# If the process entity is found in process tree and it is also in the 'running' or 'sleeping'
|
||||
# state, then it will be marked as 'running'.
|
||||
|
||||
# For given feature we get the host and network namespace instances it's processes should be running
|
||||
# based on it's scope and add it to expected set.
|
||||
|
||||
# From psutil we get number of running instances of the processes and add it to the the actual set
|
||||
|
||||
# Difference bwetween expected and actual set provides instances where the processes are not running
|
||||
# and will be logged as syslog message by monit
|
||||
|
||||
process_namespace_expected_set = set()
|
||||
process_namespace_found_set = set()
|
||||
|
||||
has_global_scope = ast.literal_eval(feature_table[container_name].get('has_global_scope', 'True'))
|
||||
has_per_asic_scope = ast.literal_eval(feature_table[container_name].get('has_per_asic_scope', 'False'))
|
||||
|
||||
if has_global_scope:
|
||||
process_namespace_expected_set.add(multi_asic.DEFAULT_NAMESPACE)
|
||||
|
||||
if has_per_asic_scope:
|
||||
process_namespace_expected_set.update(multi_asic.get_namespace_list())
|
||||
|
||||
for process in psutil.process_iter(["cmdline", "status", "pid"]):
|
||||
try:
|
||||
if ((' '.join(process.cmdline())).startswith(process_cmdline) and process.status() in ["running", "sleeping"]):
|
||||
process_namespace_found_set.add(multi_asic.get_current_namespace(process.info['pid']))
|
||||
except psutil.NoSuchProcess:
|
||||
pass
|
||||
|
||||
process_namespace_diff_set = process_namespace_expected_set.difference(process_namespace_found_set)
|
||||
|
||||
if process_namespace_diff_set:
|
||||
host_display_str = ""
|
||||
namespace_display_str = ""
|
||||
|
||||
for ns in process_namespace_diff_set:
|
||||
if ns == multi_asic.DEFAULT_NAMESPACE:
|
||||
host_display_str = " in host"
|
||||
else:
|
||||
if not namespace_display_str:
|
||||
namespace_display_str = " in namespace " + ns
|
||||
else:
|
||||
namespace_display_str += ", " + ns
|
||||
|
||||
join_str = " and" if host_display_str and namespace_display_str else ""
|
||||
|
||||
# If this script is run by Monit, then the following output will be appended to
|
||||
# Monit's syslog message.
|
||||
print("'{}' is not running{}{}{}".format(process_cmdline, host_display_str, join_str, namespace_display_str))
|
||||
sys.exit(1)
|
||||
else:
|
||||
syslog.syslog(syslog.LOG_ERR, "container '{}' is not included in SONiC image or the given container name is invalid!"
|
||||
.format(container_name))
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Check whether the process in the specified \
|
||||
container is running and an alerting message will be written into syslog if it \
|
||||
failed to run.", usage="/usr/bin/process_checker <container_name> <process_cmdline>")
|
||||
parser.add_argument("container_name", help="container name")
|
||||
parser.add_argument("process_cmdline", nargs=argparse.REMAINDER, help="process command line")
|
||||
args = parser.parse_args()
|
||||
|
||||
check_process_existence(args.container_name, ' '.join(args.process_cmdline))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@ -15,5 +15,3 @@ $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
|
||||
$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
|
||||
|
||||
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
|
||||
|
||||
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -20,4 +20,3 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /usr/share/sonic/device/x86_64-broadcom_commo
|
||||
$(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 += bcm_common:/usr/bin/bcm_common
|
||||
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
## dsserve
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program syncd|dsserve with path "/usr/bin/process_checker syncd /usr/bin/dsserve /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -23,4 +23,3 @@ $(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
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -17,4 +17,3 @@ $(DOCKER_SYNCD_CENTEC)_RUN_OPT += --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
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -17,4 +17,3 @@ $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
|
||||
$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
|
||||
|
||||
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
|
||||
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -14,4 +14,3 @@ $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
|
||||
$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
|
||||
|
||||
#$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
|
||||
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -18,4 +18,3 @@ $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
|
||||
|
||||
$(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
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -18,4 +18,3 @@ $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
|
||||
$(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
|
||||
|
||||
$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
|
||||
$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -21,4 +21,3 @@ $(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
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
###############################################################################
|
||||
## Monit configuration for syncd container
|
||||
## process list:
|
||||
## syncd
|
||||
## dsserve
|
||||
###############################################################################
|
||||
check program syncd|syncd with path "/usr/bin/process_checker syncd /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
|
||||
check program syncd|dsserve with path "/usr/bin/process_checker syncd /usr/bin/dsserve /usr/bin/syncd"
|
||||
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
|
||||
@ -26,6 +26,5 @@ $(DOCKER_DATABASE)_RUN_OPT += --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
|
||||
$(DOCKER_DATABASE)_FILES += $(SYSCTL_NET_CONFIG) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
||||
$(DOCKER_DATABASE)_FILES += $(UPDATE_CHASSISDB_CONFIG_SCRIPT)
|
||||
|
||||
@ -35,4 +35,3 @@ $(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 += TS:/usr/bin/TS
|
||||
$(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += monit_bgp:/etc/monit/conf.d
|
||||
|
||||
@ -32,5 +32,4 @@ $(DOCKER_LLDP)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:r
|
||||
|
||||
$(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl
|
||||
$(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli
|
||||
$(DOCKER_LLDP)_BASE_IMAGE_FILES += monit_lldp:/etc/monit/conf.d
|
||||
$(DOCKER_LLDP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
||||
|
||||
@ -35,5 +35,4 @@ $(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) $(ARP_UPDATE_VARS_TEMPLATE) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
||||
|
||||
@ -26,4 +26,3 @@ $(DOCKER_RESTAPI)_RUN_OPT += -v /etc/sonic/credentials:/etc/sonic/credentials:ro
|
||||
$(DOCKER_RESTAPI)_RUN_OPT += -p=8081:8081/tcp
|
||||
|
||||
$(DOCKER_RESTAPI)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
||||
$(DOCKER_RESTAPI)_BASE_IMAGE_FILES += monit_restapi:/etc/monit/conf.d
|
||||
|
||||
@ -33,5 +33,4 @@ $(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)
|
||||
|
||||
@ -31,4 +31,3 @@ $(DOCKER_SNMP)_RUN_OPT += --privileged -t
|
||||
$(DOCKER_SNMP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
|
||||
$(DOCKER_SNMP)_RUN_OPT += -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro
|
||||
$(DOCKER_SNMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
||||
$(DOCKER_SNMP)_BASE_IMAGE_FILES += monit_snmp:/etc/monit/conf.d
|
||||
|
||||
@ -30,5 +30,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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user