matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
ba02209141
sonic-buildimage/dockers/docker-snmp/supervisord.conf

60 lines
1.4 KiB
Plaintext
Raw Normal View History

SNMP/LLDP Containers: Sonic V2 Support (#41) * Adding support for V2 in SNMP/LLDP (-sv2 postfix) * Fixes for V1 containers: logging * Fixes for V1 LLDP: limit LLDP to Front-panel or MGMT interfaces.
2016-10-25 20:52:13 -05:00
[supervisord]
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
logfile_maxbytes=1MB
logfile_backups=2
SNMP/LLDP Containers: Sonic V2 Support (#41) * Adding support for V2 in SNMP/LLDP (-sv2 postfix) * Fixes for V1 containers: logging * Fixes for V1 LLDP: limit LLDP to Front-panel or MGMT interfaces.
2016-10-25 20:52:13 -05:00
nodaemon=true
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
[eventlistener:dependent-startup]
[supervisor] Install vanilla package once again, install Python 3 version in Buster container (#5546) **- Why I did it** We were building a custom version of Supervisor because I had added patches to prevent hangs and crashes if the system clock ever rolled backward. Those changes were merged into the upstream Supervisor repo as of version 3.4.0 (http://supervisord.org/changes.html#id9), therefore, we should be able to simply install the vanilla package via pip. This will also allow us to easily move to Python 3, as Python 3 support was added in version 4.0.0. **- How I did it** - Remove Makefiles and patches for building supervisor package from source - Install Python 3 supervisor package version 4.2.1 in Buster base container - Also install Python 3 version of supervisord-dependent-startup in Buster base container - Debian package installed binary in `/usr/bin/`, but pip package installs in `/usr/local/bin/`, so rather than update all absolute paths, I changed all references to simply call `supervisord` and let the system PATH find the executable to prevent future need for changes just in case we ever need to switch back to build a Debian package, then we won't need to modify these again. - Install Python 2 supervisor package >= 3.4.0 in Stretch and Jessie base containers
2020-11-20 01:41:32 -06:00
command=python3 -m supervisord_dependent_startup
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
autostart=true
autorestart=unexpected
startretries=0
exitcodes=0,3
events=PROCESS_STATE
[dockers][supervisor] Increase event buffer size for dependent-startup (#5247) When stopping the swss, pmon or bgp containers, log messages like the following can be seen: ``` Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,061 ERRO pool dependent-startup event buffer overflowed, discarding event 34 Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,063 ERRO pool dependent-startup event buffer overflowed, discarding event 35 Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,064 ERRO pool dependent-startup event buffer overflowed, discarding event 36 Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,066 ERRO pool dependent-startup event buffer overflowed, discarding event 37 ``` This is due to the number of programs in the container managed by supervisor, all generating events at the same time. The default event queue buffer size in supervisor is 10. This patch increases that value in all containers in order to eliminate these errors. As more programs are added to the containers, we may need to further adjust these values. I increased all buffer sizes to 25 except for containers with more programs or templated supervisor.conf files which allow for a variable number of programs. In these cases I increased the buffer size to 50. One final exception is the swss container, where the buffer fills up to ~50, so I increased this buffer to 100. Resolves https://github.com/Azure/sonic-buildimage/issues/5241
2020-09-09 01:36:38 -05:00
buffer_size=50
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
[Services] Restart SNMP service upon unexpected critical process exit. (#3650) Signed-off-by: Yong Zhao <yozhao@microsoft.com>
2019-10-22 16:41:12 -05:00
[eventlistener:supervisor-proc-exit-listener]
[Service] Enable/disable container auto-restart based on configuration. (#4073)
2020-02-07 14:34:07 -06:00
command=/usr/bin/supervisor-proc-exit-listener --container-name snmp
[Services] Restart SNMP service upon unexpected critical process exit. (#3650) Signed-off-by: Yong Zhao <yozhao@microsoft.com>
2019-10-22 16:41:12 -05:00
events=PROCESS_STATE_EXITED
autostart=true
autorestart=unexpected
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
[program:rsyslogd]
command=/usr/sbin/rsyslogd -n -iNONE
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
priority=1
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
autostart=false
autorestart=unexpected
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
dependent_startup=true
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
[program:start]
command=/usr/bin/start.sh
priority=1
autostart=true
autorestart=false
startsecs=0
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
SNMP/LLDP Containers: Sonic V2 Support (#41) * Adding support for V2 in SNMP/LLDP (-sv2 postfix) * Fixes for V1 containers: logging * Fixes for V1 LLDP: limit LLDP to Front-panel or MGMT interfaces.
2016-10-25 20:52:13 -05:00
[program:snmpd]
Revert "Remove snmpd hw_fsys module, remove disk monitoring which is not in use" (#1665) * Revert "[swss]: update swss submodule (#1664)" This reverts commit c74be37ae016bbe4d64f711b38a3bd4edae767db. * Revert "Remove snmpd hw_fsys module, remove disk monitoring which are not in use (#1663)" This reverts commit 3d61df9d757e33524a26349865f21c8b0df5b10f.
2018-05-01 20:32:49 -05:00
command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw -p /run/snmpd.pid
Remove Arista-specific service ACL solution; All platforms now use caclmgrd (#2202)
2018-10-29 12:25:18 -05:00
priority=3
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
autostart=false
[dockers]: Disable autorestart on all supervisor processes inside containers (#580)
2017-05-09 19:37:08 -05:00
autorestart=false
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
dependent_startup=true
dependent_startup_wait_for=start:exited
SNMP/LLDP Containers: Sonic V2 Support (#41) * Adding support for V2 in SNMP/LLDP (-sv2 postfix) * Fixes for V1 containers: logging * Fixes for V1 LLDP: limit LLDP to Front-panel or MGMT interfaces.
2016-10-25 20:52:13 -05:00
[program:snmp-subagent]
Convert docker-snmp-sv2 to buster (#4529) * Fix libsnmp-base compilation failure * Convert docker-snmp-sv2 to buster * Define install_python3_wheels * Address review comments * Address review comments * Advance snmpagent submodule * Bump net-snmp to the Buster version * Revert "Fix libsnmp-base compilation failure" * use azure storage url
2020-05-14 12:23:37 -05:00
command=/usr/bin/env python3 -m sonic_ax_impl
Remove Arista-specific service ACL solution; All platforms now use caclmgrd (#2202)
2018-10-29 12:25:18 -05:00
priority=4
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
autostart=false
[dockers]: Disable autorestart on all supervisor processes inside containers (#580)
2017-05-09 19:37:08 -05:00
autorestart=false
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-snmp-sv2]: use service dependency in supervisord to start services Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-05-16 14:03:35 -05:00
dependent_startup=true
dependent_startup_wait_for=snmpd:running
Reference in New Issue Copy Permalink