Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[submodule update] Add SSD Health tools #3218

Merged
merged 2 commits into from
Oct 4, 2019
Merged

[submodule update] Add SSD Health tools #3218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a393afc
Add SSD Health tools
andriymoroz-mlnx Jul 24, 2019
3abf4b9
Remove extra ls
andriymoroz-mlnx Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dockers/docker-platform-monitor/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion ...platform-monitor/base_image_files/sensors → ...form-monitor/base_image_files/cmd_wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) "$@"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andriymoroz-mlnx: Just wondering if we need this script at all anymore, especially because now you need to pass the binary name to the file. The point of these wrapper scripts is to allow users to run executables which reside inside Docker containers as if they are in the base image. If you think there will still be a need for this, then we can leave it, but I think you might want to consider renaming it pmon_cmd_wrapper.

10 changes: 0 additions & 10 deletions dockers/docker-platform-monitor/base_image_files/smartctl
View file
Open in desktop

This file was deleted.

Binary file added dockers/docker-platform-monitor/ssd_tools/SmartCmd
View file
Open in desktop
Binary file not shown.
Binary file added dockers/docker-platform-monitor/ssd_tools/iSmart
View file
Open in desktop
Binary file not shown.
6 changes: 4 additions & 2 deletions rules/docker-platform-monitor.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion src/sonic-platform-common
Open in desktop
Submodule sonic-platform-common updated from 33b037 to cc2dac