matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[submodule update] Add SSD Health tools (#3218)

Browse Source 
Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
This commit is contained in:
Andriy Moroz 2019-10-04 20:52:58 +03:00 committed by Joe LeVeque
parent f3cfa8fdff
commit 976850fc00
7 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dockers/docker-platform-monitor/Dockerfile.j2
View File

@ -56,5 +56,6 @@ RUN apt-get purge -y \
COPY ["docker_init.sh", "lm-sensors.sh", "/usr/bin/"]
COPY ["docker-pmon.supervisord.conf.j2", "start.sh.j2", "/usr/share/sonic/templates/"]
COPY ["ssd_tools/*", "/usr/bin/"]
ENTRYPOINT ["/usr/bin/docker_init.sh"]

2
dockers/docker-platform-monitor/base_image_files/sensors → dockers/docker-platform-monitor/base_image_files/cmd_wrapper
View File

@ -7,4 +7,4 @@ if [ -t 1 ] ; then
DOCKER_EXEC_FLAGS+="t"
fi
docker exec -$DOCKER_EXEC_FLAGS pmon sensors "$@"
docker exec -$DOCKER_EXEC_FLAGS pmon $(basename $0) "$@"

10
dockers/docker-platform-monitor/base_image_files/smartctl
View File

@ -1,10 +0,0 @@
#!/bin/bash
DOCKER_EXEC_FLAGS="i"
# Determine whether stdout is on a terminal
if [ -t 1 ] ; then
DOCKER_EXEC_FLAGS+="t"
fi
docker exec -$DOCKER_EXEC_FLAGS pmon smartctl "$@"

BIN
dockers/docker-platform-monitor/ssd_tools/SmartCmd Executable file
View File

Binary file not shown.

BIN
dockers/docker-platform-monitor/ssd_tools/iSmart Executable file
View File

Binary file not shown.

6
rules/docker-platform-monitor.mk
View File

@ -40,5 +40,7 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista/utils/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += sensors:/usr/bin/sensors
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += smartctl:/usr/sbin/smartctl
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd

2
src/sonic-platform-common

@ -1 +1 @@
Subproject commit 33b037d38f1c96264729b966e777efed143ed01d
Subproject commit cc2dac5963a14d04dd15735de35df9b30cff1e41