Skip to content

Commit 976850f

Browse files
andriymoroz-mlnxjleveque
authored andcommitted
[submodule update] Add SSD Health tools (#3218)
Signed-off-by: Andriy Moroz <[email protected]>
1 parent f3cfa8f commit 976850f

File tree

7 files changed

+7
-14
lines changed

7 files changed

+7
-14
lines changed

dockers/docker-platform-monitor/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,6 @@ RUN apt-get purge -y \
5656

5757
COPY ["docker_init.sh", "lm-sensors.sh", "/usr/bin/"]
5858
COPY ["docker-pmon.supervisord.conf.j2", "start.sh.j2", "/usr/share/sonic/templates/"]
59+
COPY ["ssd_tools/*", "/usr/bin/"]
5960

6061
ENTRYPOINT ["/usr/bin/docker_init.sh"]

dockers/docker-platform-monitor/base_image_files/sensors renamed to dockers/docker-platform-monitor/base_image_files/cmd_wrapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ if [ -t 1 ] ; then
77
DOCKER_EXEC_FLAGS+="t"
88
fi
99

10-
docker exec -$DOCKER_EXEC_FLAGS pmon sensors "$@"
10+
docker exec -$DOCKER_EXEC_FLAGS pmon $(basename $0) "$@"

dockers/docker-platform-monitor/base_image_files/smartctl

Lines changed: 0 additions & 10 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.

rules/docker-platform-monitor.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
4040
$(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro
4141
$(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
4242

43-
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += sensors:/usr/bin/sensors
44-
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += smartctl:/usr/sbin/smartctl
43+
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
44+
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl
45+
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
46+
$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd

0 commit comments

Comments
 (0)