From b5271637c1befc7b68c288d3f73e87b9c3188d8c Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Fri, 23 Mar 2018 12:19:06 -0700 Subject: [PATCH 1/2] SONiC system telemetry Support Signed-off-by: Jipan Yang --- .gitignore | 1 + Makefile | 3 +- dockers/docker-sonic-telemetry/Dockerfile.j2 | 31 +++++++++++ dockers/docker-sonic-telemetry/dialout.sh | 6 +++ dockers/docker-sonic-telemetry/start.sh | 11 ++++ .../docker-sonic-telemetry/supervisord.conf | 36 +++++++++++++ dockers/docker-sonic-telemetry/telemetry.sh | 51 +++++++++++++++++++ files/build_templates/telemetry.service.j2 | 13 +++++ .../logrotate/logrotate.d/rsyslog | 1 + .../rsyslog/rsyslog.d/00-sonic.conf | 6 +++ rules/config | 9 ++-- rules/docker-telemetry.mk | 15 ++++++ rules/telemetry.mk | 5 ++ slave.mk | 11 ++-- src/telemetry/Makefile | 20 ++++++++ src/telemetry/debian/changelog | 5 ++ src/telemetry/debian/compat | 1 + src/telemetry/debian/control | 12 +++++ src/telemetry/debian/files | 1 + src/telemetry/debian/rules | 3 ++ src/telemetry/debian/telemetry.dirs | 1 + src/telemetry/debian/telemetry.init.d | 14 +++++ src/telemetry/debian/telemetry.service | 14 +++++ 23 files changed, 261 insertions(+), 9 deletions(-) create mode 100644 dockers/docker-sonic-telemetry/Dockerfile.j2 create mode 100755 dockers/docker-sonic-telemetry/dialout.sh create mode 100755 dockers/docker-sonic-telemetry/start.sh create mode 100644 dockers/docker-sonic-telemetry/supervisord.conf create mode 100755 dockers/docker-sonic-telemetry/telemetry.sh create mode 100644 files/build_templates/telemetry.service.j2 create mode 100644 rules/docker-telemetry.mk create mode 100644 rules/telemetry.mk create mode 100644 src/telemetry/Makefile create mode 100644 src/telemetry/debian/changelog create mode 100644 src/telemetry/debian/compat create mode 100644 src/telemetry/debian/control create mode 100644 src/telemetry/debian/files create mode 100644 src/telemetry/debian/rules create mode 100644 src/telemetry/debian/telemetry.dirs create mode 100644 src/telemetry/debian/telemetry.init.d create mode 100644 src/telemetry/debian/telemetry.service diff --git a/.gitignore b/.gitignore index b75083ce4d57..74998573e491 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ dockers/docker-router-advertiser/Dockerfile dockers/docker-snmp-sv2/Dockerfile dockers/docker-teamd/Dockerfile dockers/docker-sonic-mgmt/Dockerfile +dockers/docker-sonic-telemetry/Dockerfile platform/*/docker-syncd-*/Dockerfile platform/*/docker-syncd-*-rpc/Dockerfile platform/vs/docker-sonic-vs/Dockerfile diff --git a/Makefile b/Makefile index ed0c853e22df..6471f7f757b9 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,8 @@ SONIC_BUILD_INSTRUCTION := make \ USERNAME=$(USERNAME) \ SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \ HTTP_PROXY=$(http_proxy) \ - HTTPS_PROXY=$(https_proxy) + HTTPS_PROXY=$(https_proxy) \ + ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY) .PHONY: sonic-slave-build sonic-slave-bash init reset diff --git a/dockers/docker-sonic-telemetry/Dockerfile.j2 b/dockers/docker-sonic-telemetry/Dockerfile.j2 new file mode 100644 index 000000000000..bbb15db69aaa --- /dev/null +++ b/dockers/docker-sonic-telemetry/Dockerfile.j2 @@ -0,0 +1,31 @@ +FROM docker-config-engine + +## Make apt-get non-interactive +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update + +RUN apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4 + +## Install redis-tools dependencies +## TODO: implicitly install dependencies +RUN apt-get -y install libjemalloc1 + +COPY \ +{% for deb in docker_sonic_telemetry_debs.split(' ') -%} +debs/{{ deb }}{{' '}} +{%- endfor -%} +debs/ + +RUN dpkg -i \ +{% for deb in docker_sonic_telemetry_debs.split(' ') -%} +debs/{{ deb }}{{' '}} +{%- endfor %} + +COPY ["start.sh", "telemetry.sh", "dialout.sh", "/usr/bin/"] +COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] + +RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y +RUN rm -rf /debs + +ENTRYPOINT ["/usr/bin/supervisord"] diff --git a/dockers/docker-sonic-telemetry/dialout.sh b/dockers/docker-sonic-telemetry/dialout.sh new file mode 100755 index 000000000000..8683e8edae8e --- /dev/null +++ b/dockers/docker-sonic-telemetry/dialout.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# Start with default config + +exec /usr/sbin/dialout_client_cli -insecure -logtostderr -v 2 + diff --git a/dockers/docker-sonic-telemetry/start.sh b/dockers/docker-sonic-telemetry/start.sh new file mode 100755 index 000000000000..b307e387d557 --- /dev/null +++ b/dockers/docker-sonic-telemetry/start.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +mkdir -p /var/sonic +echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status + +rm -f /var/run/rsyslogd.pid + +supervisorctl start rsyslogd + +supervisorctl start telemetry +supervisorctl start dialout diff --git a/dockers/docker-sonic-telemetry/supervisord.conf b/dockers/docker-sonic-telemetry/supervisord.conf new file mode 100644 index 000000000000..dcd8a9eb1e80 --- /dev/null +++ b/dockers/docker-sonic-telemetry/supervisord.conf @@ -0,0 +1,36 @@ +[supervisord] +logfile_maxbytes=1MB +logfile_backups=2 +nodaemon=true + +[program:start.sh] +command=/usr/bin/start.sh +priority=1 +autostart=true +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog + +[program:rsyslogd] +command=/usr/sbin/rsyslogd -n +priority=2 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog + +[program:telemetry] +command=/usr/bin/telemetry.sh +priority=3 +autostart=false +autorestart=true +stdout_logfile=syslog +stderr_logfile=syslog + +[program:dialout] +command=/usr/bin/dialout.sh +priority=4 +autostart=false +autorestart=true +stdout_logfile=syslog +stderr_logfile=syslog diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh new file mode 100755 index 000000000000..053b1dae6ead --- /dev/null +++ b/dockers/docker-sonic-telemetry/telemetry.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +# Try to read telemetry and x509 config from ConfigDB. +# Use default value if no valid config exists +X509=`sonic-cfggen -d -v "DEVICE_METADATA['x509']"` +TELEMETRY=`sonic-cfggen -d -v 'TELEMETRY.keys() | join(" ") if TELEMETRY'` + +TELEMETRY_ARGS=" -logtostderr" + +if [ ! -z $X509 ]; then + SERVER_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_crt']"` + SERVER_KEY=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['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 +else + TELEMETRY_ARGS+=" --insecure" +fi + +if [ ! -z $X509 ]; then + CA_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['ca_crt']"` + if [ ! -z $CA_CRT ]; then + TELEMETRY_ARGS+=" --ca_crt $CA_CRT" + fi +fi + +# If no configuration entry exists for TELEMETRY, create one default port +if [ -z $TELEMETRY ]; then + redis-cli -n 4 hset "TELEMETRY|gnmi" port 8080 +fi + +PORT=`sonic-cfggen -d -v "TELEMETRY['gnmi']['port']"` +TELEMETRY_ARGS+=" --port $PORT" + +CLIENT_AUTH=`sonic-cfggen -d -v "TELEMETRY['gnmi']['client_auth']"` +if [ -z $CLIENT_AUTH ] || [ $CLIENT_AUTH == "false" ]; then + TELEMETRY_ARGS+=" --allow_no_client_auth" +fi + +LOG_LEVEL=`sonic-cfggen -d -v "TELEMETRY['gnmi']['log_level']"` +if [ ! -z $LOG_LEVEL ]; then + TELEMETRY_ARGS+=" -v=$LOG_LEVEL" +else + TELEMETRY_ARGS+=" -v=2" +fi + +exec /usr/sbin/telemetry ${TELEMETRY_ARGS} + + diff --git a/files/build_templates/telemetry.service.j2 b/files/build_templates/telemetry.service.j2 new file mode 100644 index 000000000000..5f2e81ed95ea --- /dev/null +++ b/files/build_templates/telemetry.service.j2 @@ -0,0 +1,13 @@ +[Unit] +Description=Telemetry container +Requires=swss.service +After=swss.service + +[Service] +User={{ sonicadmin_user }} +ExecStartPre=/usr/bin/{{docker_container_name}}.sh start +ExecStart=/usr/bin/{{docker_container_name}}.sh attach +ExecStop=/usr/bin/{{docker_container_name}}.sh stop + +[Install] +WantedBy=multi-user.target diff --git a/files/image_config/logrotate/logrotate.d/rsyslog b/files/image_config/logrotate/logrotate.d/rsyslog index ba550dcd242b..ed54c62082f9 100644 --- a/files/image_config/logrotate/logrotate.d/rsyslog +++ b/files/image_config/logrotate/logrotate.d/rsyslog @@ -31,6 +31,7 @@ /var/log/cron.log /var/log/syslog /var/log/teamd.log +/var/log/telemetry.log /var/log/quagga/bgpd.log /var/log/quagga/zebra.log /var/log/swss/sairedis.rec diff --git a/files/image_config/rsyslog/rsyslog.d/00-sonic.conf b/files/image_config/rsyslog/rsyslog.d/00-sonic.conf index bc0bbbaf1e61..6e4be4bb6022 100644 --- a/files/image_config/rsyslog/rsyslog.d/00-sonic.conf +++ b/files/image_config/rsyslog/rsyslog.d/00-sonic.conf @@ -19,3 +19,9 @@ if $programname contains "teamd_" then { /var/log/teamd.log stop } + +## telemetry rules +if $msg startswith " telemetry" or ($msg startswith " dialout" )then { + /var/log/telemetry.log + stop +} \ No newline at end of file diff --git a/rules/config b/rules/config index 49eb8d57e984..86d106637de2 100644 --- a/rules/config +++ b/rules/config @@ -27,12 +27,12 @@ DEFAULT_USERNAME = admin DEFAULT_PASSWORD = YourPaSsWoRd # ENABLE_DHCP_GRAPH_SERVICE - specify the source of minigraph to generate configuration file. -# If set to y SONiC will get the minigraph from graph service. Graph service URL need to be +# If set to y SONiC will get the minigraph from graph service. Graph service URL need to be # passed through DHCP option 225. # If not set (default behavior) the default minigraph built into the image will be used. # ENABLE_DHCP_GRAPH_SERVICE = y -# SHUTDOWN_BGP_ON_START - if set to y all bgp sessions will be in admin down state when +# SHUTDOWN_BGP_ON_START - if set to y all bgp sessions will be in admin down state when # bgp service starts. # SHUTDOWN_BGP_ON_START = y @@ -52,6 +52,9 @@ SONIC_ROUTING_STACK = quagga # ENABLE_SYNCD_RPC - build docker-syncd with rpc packages for testing purposes. # Uncomment to enable: # ENABLE_SYNCD_RPC = y - + # Enable Origanization Extensions - Specific to the deployment scenarios of the Organization ENABLE_ORGANIZATION_EXTENSIONS = y + +# ENABLE_SYSTEM_TELEMETRY - build docker-sonic-telemetry for system telemetry support +# ENABLE_SYSTEM_TELEMETRY = y diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk new file mode 100644 index 000000000000..5bb75c11d810 --- /dev/null +++ b/rules/docker-telemetry.mk @@ -0,0 +1,15 @@ +# docker image for telemetry agent + +DOCKER_TELEMETRY = docker-sonic-telemetry.gz +$(DOCKER_TELEMETRY)_PATH = $(DOCKERS_PATH)/docker-sonic-telemetry +$(DOCKER_TELEMETRY)_DEPENDS += $(REDIS_TOOLS) $(TELEMETRY) +$(DOCKER_TELEMETRY)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) +SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY) +ifeq ($(ENABLE_SYSTEM_TELEMETRY), y) +SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_TELEMETRY) +endif + +$(DOCKER_TELEMETRY)_CONTAINER_NAME = telemetry +$(DOCKER_TELEMETRY)_RUN_OPT += --net=host --privileged -t +$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro + diff --git a/rules/telemetry.mk b/rules/telemetry.mk new file mode 100644 index 000000000000..1b48d3cf2f6d --- /dev/null +++ b/rules/telemetry.mk @@ -0,0 +1,5 @@ +# telemetry package + +TELEMETRY = telemetry_0.1_amd64.deb +$(TELEMETRY)_SRC_PATH = $(SRC_PATH)/telemetry +SONIC_DPKG_DEBS += $(TELEMETRY) diff --git a/slave.mk b/slave.mk index 7e842a7a608e..7430f3a80d10 100644 --- a/slave.mk +++ b/slave.mk @@ -12,8 +12,8 @@ GUID = $(shell id -g) .SECONDEXPANSION: -SPACE := -SPACE += +SPACE := +SPACE += ############################################################################### ## General definitions @@ -107,6 +107,7 @@ $(info "ENABLE_SYNCD_RPC" : "$(ENABLE_SYNCD_RPC)") $(info "ENABLE_ORGANIZATION_EXTENSIONS" : "$(ENABLE_ORGANIZATION_EXTENSIONS)") $(info "HTTP_PROXY" : "$(HTTP_PROXY)") $(info "HTTPS_PROXY" : "$(HTTPS_PROXY)") +$(info "ENABLE_SYSTEM_TELEMETRY" : "$(ENABLE_SYSTEM_TELEMETRY)") $(info ) ############################################################################### @@ -441,7 +442,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ export image_type="$($*_IMAGE_TYPE)" export sonicadmin_user="$(USERNAME)" export sonic_asic_platform="$(CONFIGURED_PLATFORM)" - export enable_organization_extensions="$(ENABLE_ORGANIZATION_EXTENSIONS)" + export enable_organization_extensions="$(ENABLE_ORGANIZATION_EXTENSIONS)" export enable_dhcp_graph_service="$(ENABLE_DHCP_GRAPH_SERVICE)" export shutdown_bgp_on_start="$(SHUTDOWN_BGP_ON_START)" export enable_pfcwd_on_start="$(ENABLE_PFCWD_ON_START)" @@ -451,7 +452,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ export config_engine_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE))" export swsssdk_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SWSSSDK_PY2))" export platform_common_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))" - + $(foreach docker, $($*_DOCKERS),\ export docker_image="$(docker)" export docker_image_name="$(basename $(docker))" @@ -472,7 +473,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ j2 -f env files/initramfs-tools/union-mount.j2 onie-image.conf > files/initramfs-tools/union-mount j2 -f env files/initramfs-tools/arista-convertfs.j2 onie-image.conf > files/initramfs-tools/arista-convertfs - $(if $($*_DOCKERS), + $(if $($*_DOCKERS), j2 files/build_templates/sonic_debian_extension.j2 > sonic_debian_extension.sh chmod +x sonic_debian_extension.sh, ) diff --git a/src/telemetry/Makefile b/src/telemetry/Makefile new file mode 100644 index 000000000000..5559a4dd8ad1 --- /dev/null +++ b/src/telemetry/Makefile @@ -0,0 +1,20 @@ +export GOPATH=/tmp/go + +INSTALL := /usr/bin/install + +all: telemetry + +telemetry: + /usr/local/go/bin/go get -v github.com/jipanyang/sonic-telemetry/telemetry + /usr/local/go/bin/go get -v github.com/jipanyang/sonic-telemetry/dialout/dialout_client_cli + +install: + $(INSTALL) -D ${GOPATH}/bin/telemetry $(DESTDIR)/usr/sbin/telemetry + $(INSTALL) -D ${GOPATH}/bin/dialout_client_cli $(DESTDIR)/usr/sbin/dialout_client_cli + +deinstall: + rm $(DESTDIR)/usr/sbin/telemetry + rm $(DESTDIR)/usr/sbin/dialout_client_cli + +clean: + rm -fr ${GOPATH} diff --git a/src/telemetry/debian/changelog b/src/telemetry/debian/changelog new file mode 100644 index 000000000000..4f9c6a2d18c7 --- /dev/null +++ b/src/telemetry/debian/changelog @@ -0,0 +1,5 @@ +telemetry (0.1) UNRELEASED; urgency=low + + * Initial release. + + -- Jipan Yang Thu, 18 Jan 2018 15:45:03 -0800 diff --git a/src/telemetry/debian/compat b/src/telemetry/debian/compat new file mode 100644 index 000000000000..ec635144f600 --- /dev/null +++ b/src/telemetry/debian/compat @@ -0,0 +1 @@ +9 diff --git a/src/telemetry/debian/control b/src/telemetry/debian/control new file mode 100644 index 000000000000..e21138d3e5e7 --- /dev/null +++ b/src/telemetry/debian/control @@ -0,0 +1,12 @@ +Source: telemetry +Maintainer: Jipan Yang +Build-Depends: debhelper (>= 8.0.0), + dh-systemd +Standards-Version: 0.0.1 +Section: net + +Package: telemetry +Priority: extra +Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: telemetry daemon diff --git a/src/telemetry/debian/files b/src/telemetry/debian/files new file mode 100644 index 000000000000..5535f2430c43 --- /dev/null +++ b/src/telemetry/debian/files @@ -0,0 +1 @@ +telemetry_0.1_amd64.deb net extra diff --git a/src/telemetry/debian/rules b/src/telemetry/debian/rules new file mode 100644 index 000000000000..3995a26d7fcd --- /dev/null +++ b/src/telemetry/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ --with systemd diff --git a/src/telemetry/debian/telemetry.dirs b/src/telemetry/debian/telemetry.dirs new file mode 100644 index 000000000000..442d011fb522 --- /dev/null +++ b/src/telemetry/debian/telemetry.dirs @@ -0,0 +1 @@ +etc/telemetry diff --git a/src/telemetry/debian/telemetry.init.d b/src/telemetry/debian/telemetry.init.d new file mode 100644 index 000000000000..f80bbcc96ea4 --- /dev/null +++ b/src/telemetry/debian/telemetry.init.d @@ -0,0 +1,14 @@ +#!/bin/bash +# +### BEGIN INIT INFO +# Provides: telemetry +# Required-Start: $local_fs $network $remote_fs $syslog +# Required-Stop: $local_fs $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start and stop the telemetry +# Description: telemetry is an implementation of telemetry daemon in Go +### END INIT INFO +# + +exit 0 diff --git a/src/telemetry/debian/telemetry.service b/src/telemetry/debian/telemetry.service new file mode 100644 index 000000000000..371d4b6d2b2d --- /dev/null +++ b/src/telemetry/debian/telemetry.service @@ -0,0 +1,14 @@ +[Unit] +Description=telemetry service +After=network.target + +[Service] +ExecStart=/usr/sbin/telemetry $DAEMON_ARGS +#ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=on-failure + +[Install] +WantedBy=multi-user.target +Alias=telemetry.service + From c0293245769f165e93541c1f6b2e6f1fd17bfeaa Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Sat, 24 Mar 2018 18:37:42 -0700 Subject: [PATCH 2/2] Update package name from telemetry to sonic-telemetry Signed-off-by: Jipan Yang --- rules/docker-telemetry.mk | 2 +- rules/telemetry.mk | 8 ++++---- src/telemetry/Makefile | 8 ++++---- src/telemetry/debian/changelog | 4 ++-- src/telemetry/debian/control | 21 +++++++++++++-------- src/telemetry/debian/files | 1 - src/telemetry/debian/telemetry.dirs | 1 - src/telemetry/debian/telemetry.init.d | 4 ++-- src/telemetry/debian/telemetry.service | 14 -------------- 9 files changed, 26 insertions(+), 37 deletions(-) delete mode 100644 src/telemetry/debian/files delete mode 100644 src/telemetry/debian/telemetry.dirs delete mode 100644 src/telemetry/debian/telemetry.service diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk index 5bb75c11d810..fca3b8a39a70 100644 --- a/rules/docker-telemetry.mk +++ b/rules/docker-telemetry.mk @@ -2,7 +2,7 @@ DOCKER_TELEMETRY = docker-sonic-telemetry.gz $(DOCKER_TELEMETRY)_PATH = $(DOCKERS_PATH)/docker-sonic-telemetry -$(DOCKER_TELEMETRY)_DEPENDS += $(REDIS_TOOLS) $(TELEMETRY) +$(DOCKER_TELEMETRY)_DEPENDS += $(REDIS_TOOLS) $(SONIC_TELEMETRY) $(DOCKER_TELEMETRY)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY) ifeq ($(ENABLE_SYSTEM_TELEMETRY), y) diff --git a/rules/telemetry.mk b/rules/telemetry.mk index 1b48d3cf2f6d..a160bf50899c 100644 --- a/rules/telemetry.mk +++ b/rules/telemetry.mk @@ -1,5 +1,5 @@ -# telemetry package +# SONiC telemetry package -TELEMETRY = telemetry_0.1_amd64.deb -$(TELEMETRY)_SRC_PATH = $(SRC_PATH)/telemetry -SONIC_DPKG_DEBS += $(TELEMETRY) +SONIC_TELEMETRY = sonic-telemetry_0.1_amd64.deb +$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/telemetry +SONIC_DPKG_DEBS += $(SONIC_TELEMETRY) diff --git a/src/telemetry/Makefile b/src/telemetry/Makefile index 5559a4dd8ad1..91a822d4f93c 100644 --- a/src/telemetry/Makefile +++ b/src/telemetry/Makefile @@ -2,11 +2,11 @@ export GOPATH=/tmp/go INSTALL := /usr/bin/install -all: telemetry +all: sonic-telemetry -telemetry: - /usr/local/go/bin/go get -v github.com/jipanyang/sonic-telemetry/telemetry - /usr/local/go/bin/go get -v github.com/jipanyang/sonic-telemetry/dialout/dialout_client_cli +sonic-telemetry: + /usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/telemetry + /usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/dialout/dialout_client_cli install: $(INSTALL) -D ${GOPATH}/bin/telemetry $(DESTDIR)/usr/sbin/telemetry diff --git a/src/telemetry/debian/changelog b/src/telemetry/debian/changelog index 4f9c6a2d18c7..77dab629040e 100644 --- a/src/telemetry/debian/changelog +++ b/src/telemetry/debian/changelog @@ -1,5 +1,5 @@ -telemetry (0.1) UNRELEASED; urgency=low +sonic-telemetry (0.1) UNRELEASED; urgency=medium * Initial release. - -- Jipan Yang Thu, 18 Jan 2018 15:45:03 -0800 + -- Jipan Yang Sat, 24 Mar 2018 12:48:22 -0700 diff --git a/src/telemetry/debian/control b/src/telemetry/debian/control index e21138d3e5e7..f1b6a7c07282 100644 --- a/src/telemetry/debian/control +++ b/src/telemetry/debian/control @@ -1,12 +1,17 @@ -Source: telemetry +Source: sonic-telemetry +Section: devel +Priority: optional Maintainer: Jipan Yang Build-Depends: debhelper (>= 8.0.0), dh-systemd -Standards-Version: 0.0.1 -Section: net +Standards-Version: 3.9.3 +Homepage: https://github.com/Azure/sonic-telemetry +XS-Go-Import-Path: github.com/Azure/sonic-telemetry -Package: telemetry -Priority: extra -Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: telemetry daemon +Package: sonic-telemetry +Architecture: any +Built-Using: ${misc:Built-Using} +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: SONiC telemetry + sonic-telemetry \ No newline at end of file diff --git a/src/telemetry/debian/files b/src/telemetry/debian/files deleted file mode 100644 index 5535f2430c43..000000000000 --- a/src/telemetry/debian/files +++ /dev/null @@ -1 +0,0 @@ -telemetry_0.1_amd64.deb net extra diff --git a/src/telemetry/debian/telemetry.dirs b/src/telemetry/debian/telemetry.dirs deleted file mode 100644 index 442d011fb522..000000000000 --- a/src/telemetry/debian/telemetry.dirs +++ /dev/null @@ -1 +0,0 @@ -etc/telemetry diff --git a/src/telemetry/debian/telemetry.init.d b/src/telemetry/debian/telemetry.init.d index f80bbcc96ea4..2fea32e17c49 100644 --- a/src/telemetry/debian/telemetry.init.d +++ b/src/telemetry/debian/telemetry.init.d @@ -1,13 +1,13 @@ #!/bin/bash # ### BEGIN INIT INFO -# Provides: telemetry +# Provides: sonic-telemetry # Required-Start: $local_fs $network $remote_fs $syslog # Required-Stop: $local_fs $network $remote_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: start and stop the telemetry -# Description: telemetry is an implementation of telemetry daemon in Go +# Description: sonic-telemetry is an implementation of sonic telemetry daemon in Go ### END INIT INFO # diff --git a/src/telemetry/debian/telemetry.service b/src/telemetry/debian/telemetry.service deleted file mode 100644 index 371d4b6d2b2d..000000000000 --- a/src/telemetry/debian/telemetry.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=telemetry service -After=network.target - -[Service] -ExecStart=/usr/sbin/telemetry $DAEMON_ARGS -#ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=on-failure - -[Install] -WantedBy=multi-user.target -Alias=telemetry.service -