-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Share image for gnmi and telemetry #16863
Merged
+334
−30
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
1545579
Add missing script
ganglyu 482a400
Use gnmi container instead of telemetry container
ganglyu 4cd5b85
Fix script permission
ganglyu 142afde
Fix gnmi container
ganglyu a6990dd
Fix dependency and gnmi script
ganglyu 9ba720e
disable telemetry
ganglyu c617c96
Fix mk file
ganglyu 5c52201
Fix build error for db migrator
ganglyu 6940bec
Update rsyslog conf to fix test_monitoring_critical_processes
ganglyu 60e3c69
Do not modify minigraph parser
ganglyu fa8e6b6
Fix container checker for multi asic
ganglyu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %} | ||
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} | ||
|
||
ARG docker_container_name | ||
ARG image_version | ||
|
||
## Make apt-get non-interactive | ||
ENV DEBIAN_FRONTEND=noninteractive | ||
|
||
# Pass the image_version to container | ||
ENV IMAGE_VERSION=$image_version | ||
|
||
RUN apt-get update | ||
|
||
{% if docker_sonic_gnmi_debs.strip() -%} | ||
# Copy locally-built Debian package dependencies | ||
{{ copy_files("debs/", docker_sonic_gnmi_debs.split(' '), "/debs/") }} | ||
|
||
# Install locally-built Debian packages and implicitly install their dependencies | ||
{{ install_debian_packages(docker_sonic_gnmi_debs.split(' ')) }} | ||
{%- endif %} | ||
|
||
RUN apt-get clean -y && \ | ||
apt-get autoclean - && \ | ||
apt-get autoremove -y && \ | ||
rm -rf /debs | ||
|
||
COPY ["start.sh", "gnmi-native.sh", "dialout.sh", "/usr/bin/"] | ||
COPY ["telemetry_vars.j2", "/usr/share/sonic/templates/"] | ||
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] | ||
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] | ||
COPY ["critical_processes", "/etc/supervisor"] | ||
|
||
ENTRYPOINT ["/usr/local/bin/supervisord"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
############################################################################### | ||
## Monit configuration for telemetry container | ||
############################################################################### | ||
check program container_memory_gnmi with path "/usr/bin/memory_checker gnmi 419430400" | ||
if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service gnmi" repeat every 2 cycles |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
program:gnmi-native |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#!/usr/bin/env bash | ||
|
||
# Start with default config | ||
export CVL_SCHEMA_PATH=/usr/sbin/schema | ||
exec /usr/sbin/dialout_client_cli -insecure -logtostderr -v 2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
#!/usr/bin/env bash | ||
|
||
EXIT_TELEMETRY_VARS_FILE_NOT_FOUND=1 | ||
INCORRECT_TELEMETRY_VALUE=2 | ||
TELEMETRY_VARS_FILE=/usr/share/sonic/templates/telemetry_vars.j2 | ||
|
||
if [ ! -f "$TELEMETRY_VARS_FILE" ]; then | ||
echo "Telemetry vars template file not found" | ||
exit $EXIT_TELEMETRY_VARS_FILE_NOT_FOUND | ||
fi | ||
|
||
# Try to read telemetry and certs config from ConfigDB. | ||
# Use default value if no valid config exists | ||
TELEMETRY_VARS=$(sonic-cfggen -d -t $TELEMETRY_VARS_FILE) | ||
TELEMETRY_VARS=${TELEMETRY_VARS//[\']/\"} | ||
X509=$(echo $TELEMETRY_VARS | jq -r '.x509') | ||
GNMI=$(echo $TELEMETRY_VARS | jq -r '.gnmi') | ||
CERTS=$(echo $TELEMETRY_VARS | jq -r '.certs') | ||
|
||
TELEMETRY_ARGS=" -logtostderr" | ||
export CVL_SCHEMA_PATH=/usr/sbin/schema | ||
|
||
if [ -n "$CERTS" ]; then | ||
SERVER_CRT=$(echo $CERTS | jq -r '.server_crt') | ||
SERVER_KEY=$(echo $CERTS | jq -r '.server_key') | ||
if [ -z $SERVER_CRT ] || [ -z $SERVER_KEY ]; then | ||
TELEMETRY_ARGS+=" --insecure" | ||
else | ||
TELEMETRY_ARGS+=" --server_crt $SERVER_CRT --server_key $SERVER_KEY " | ||
fi | ||
|
||
CA_CRT=$(echo $CERTS | jq -r '.ca_crt') | ||
if [ ! -z $CA_CRT ]; then | ||
TELEMETRY_ARGS+=" --ca_crt $CA_CRT" | ||
fi | ||
elif [ -n "$X509" ]; then | ||
SERVER_CRT=$(echo $X509 | jq -r '.server_crt') | ||
SERVER_KEY=$(echo $X509 | jq -r '.server_key') | ||
if [ -z $SERVER_CRT ] || [ -z $SERVER_KEY ]; then | ||
TELEMETRY_ARGS+=" --insecure" | ||
else | ||
TELEMETRY_ARGS+=" --server_crt $SERVER_CRT --server_key $SERVER_KEY " | ||
fi | ||
|
||
CA_CRT=$(echo $X509 | jq -r '.ca_crt') | ||
if [ ! -z $CA_CRT ]; then | ||
TELEMETRY_ARGS+=" --ca_crt $CA_CRT" | ||
fi | ||
else | ||
TELEMETRY_ARGS+=" --noTLS" | ||
fi | ||
|
||
# If no configuration entry exists for TELEMETRY, create one default port | ||
if [ -z "$GNMI" ]; then | ||
PORT=8080 | ||
else | ||
PORT=$(echo $GNMI | jq -r '.port') | ||
fi | ||
TELEMETRY_ARGS+=" --port $PORT" | ||
|
||
CLIENT_AUTH=$(echo $GNMI | jq -r '.client_auth') | ||
if [ -z $CLIENT_AUTH ] || [ $CLIENT_AUTH == "false" ]; then | ||
TELEMETRY_ARGS+=" --allow_no_client_auth" | ||
fi | ||
|
||
LOG_LEVEL=$(echo $GNMI | jq -r '.log_level') | ||
if [[ $LOG_LEVEL =~ ^[0-9]+$ ]]; then | ||
TELEMETRY_ARGS+=" -v=$LOG_LEVEL" | ||
else | ||
TELEMETRY_ARGS+=" -v=2" | ||
fi | ||
|
||
# Enable ZMQ for SmartSwitch | ||
LOCALHOST_SUBTYPE=`sonic-db-cli CONFIG_DB hget localhost "subtype"` | ||
if [[ x"${LOCALHOST_SUBTYPE}" == x"SmartSwitch" ]]; then | ||
TELEMETRY_ARGS+=" -zmq_address=tcp://127.0.0.1:8100" | ||
fi | ||
|
||
# Server will handle threshold connections consecutively | ||
THRESHOLD_CONNECTIONS=$(echo $GNMI | jq -r '.threshold') | ||
if [[ $THRESHOLD_CONNECTIONS =~ ^[0-9]+$ ]]; then | ||
TELEMETRY_ARGS+=" --threshold $THRESHOLD_CONNECTIONS" | ||
else | ||
if [ -z "$GNMI" ] || [[ $THRESHOLD_CONNECTIONS == "null" ]]; then | ||
TELEMETRY_ARGS+=" --threshold 100" | ||
else | ||
echo "Incorrect threshold value, expecting positive integers" >&2 | ||
exit $INCORRECT_TELEMETRY_VALUE | ||
fi | ||
fi | ||
|
||
# Close idle connections after certain duration (in seconds) | ||
IDLE_CONN_DURATION=$(echo $GNMI | jq -r '.idle_conn_duration') | ||
if [[ $IDLE_CONN_DURATION =~ ^[0-9]+$ ]]; then | ||
TELEMETRY_ARGS+=" --idle_conn_duration $IDLE_CONN_DURATION" | ||
else | ||
if [ -z "$GNMI" ] || [[ $IDLE_CONN_DURATION == "null" ]]; then | ||
TELEMETRY_ARGS+=" --idle_conn_duration 5" | ||
else | ||
echo "Incorrect idle_conn_duration value, expecting positive integers" >&2 | ||
exit $INCORRECT_TELEMETRY_VALUE | ||
fi | ||
fi | ||
|
||
exec /usr/sbin/telemetry ${TELEMETRY_ARGS} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#!/usr/bin/env bash | ||
|
||
if [ "${RUNTIME_OWNER}" == "" ]; then | ||
RUNTIME_OWNER="kube" | ||
fi | ||
|
||
CTR_SCRIPT="/usr/share/sonic/scripts/container_startup.py" | ||
if test -f ${CTR_SCRIPT} | ||
then | ||
${CTR_SCRIPT} -f gnmi -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION} | ||
fi | ||
|
||
mkdir -p /var/sonic | ||
echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status | ||
|
||
TZ=$(cat /etc/timezone) | ||
rm -rf /etc/localtime | ||
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
[supervisord] | ||
logfile_maxbytes=1MB | ||
logfile_backups=2 | ||
nodaemon=true | ||
|
||
[eventlistener:dependent-startup] | ||
command=python3 -m supervisord_dependent_startup | ||
autostart=true | ||
autorestart=unexpected | ||
startretries=0 | ||
exitcodes=0,3 | ||
events=PROCESS_STATE | ||
buffer_size=1024 | ||
|
||
[eventlistener:supervisor-proc-exit-listener] | ||
command=/usr/bin/supervisor-proc-exit-listener --container-name gnmi | ||
events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING | ||
autostart=true | ||
autorestart=false | ||
buffer_size=1024 | ||
|
||
[program:rsyslogd] | ||
command=/usr/sbin/rsyslogd -n -iNONE | ||
priority=1 | ||
autostart=false | ||
autorestart=true | ||
stdout_logfile=syslog | ||
stderr_logfile=syslog | ||
dependent_startup=true | ||
|
||
[program:start] | ||
command=/usr/bin/start.sh | ||
priority=2 | ||
autostart=false | ||
autorestart=false | ||
startsecs=0 | ||
stdout_logfile=syslog | ||
stderr_logfile=syslog | ||
dependent_startup=true | ||
dependent_startup_wait_for=rsyslogd:running | ||
|
||
[program:gnmi-native] | ||
command=/usr/bin/gnmi-native.sh | ||
priority=3 | ||
autostart=false | ||
autorestart=false | ||
stdout_logfile=syslog | ||
stderr_logfile=syslog | ||
dependent_startup=true | ||
dependent_startup_wait_for=start:exited | ||
|
||
[program:dialout] | ||
command=/usr/bin/dialout.sh | ||
priority=4 | ||
autostart=false | ||
autorestart=false | ||
stdout_logfile=syslog | ||
stderr_logfile=syslog | ||
dependent_startup=true | ||
dependent_startup_wait_for=gnmi-native:running |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"certs": {% if "certs" in GNMI.keys() %}{{ GNMI["certs"] }}{% else %}""{% endif %}, | ||
"gnmi" : {% if "gnmi" in GNMI.keys() %}{{ GNMI["gnmi"] }}{% else %}""{% endif %}, | ||
"x509" : {% if "x509" in DEVICE_METADATA.keys() %}{{ DEVICE_METADATA["x509"] }}{% else %}""{% endif %} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
[Unit] | ||
Description=GNMI container | ||
Requires=database.service | ||
After=database.service swss.service syncd.service | ||
Before=ntp-config.service | ||
BindsTo=sonic.target | ||
After=sonic.target | ||
StartLimitIntervalSec=1200 | ||
StartLimitBurst=3 | ||
|
||
[Service] | ||
User={{ sonicadmin_user }} | ||
ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start | ||
ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait | ||
ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop | ||
RestartSec=30 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
service_mgmt.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have we already added GNMI table to config_db?