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

Sensormond support #16089

Merged
merged 4 commits into from
Feb 24, 2024
Merged

Sensormond support #16089

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
451d097
Sensormond support
bmridul Aug 9, 2023
efa316f
Added missed files
bmridul Aug 10, 2023
e6e0664
Merge branch 'master' into sensormon
bmridul Sep 11, 2023
fa83820
Addressed review comment
bmridul Feb 9, 2024
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
13 changes: 13 additions & 0 deletions dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,16 @@ startsecs=10
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
{% endif %}

{% if not skip_sensormond %}
bmridul marked this conversation as resolved.
Show resolved Hide resolved
[program:sensormond]
command=/usr/local/bin/sensormond
priority=10
autostart=false
autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog
startsecs=10
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
{% endif %}
1 change: 1 addition & 0 deletions rules/docker-platform-monitor.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PCIED_PY3)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PSUD_PY3)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_SYSEEPROMD_PY3)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_THERMALCTLD_PY3)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_SENSORMOND_PY3)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_XCVRD_PY3)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_YCABLED_PY3)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_CHASSISD_PY3)
Expand Down
10 changes: 10 additions & 0 deletions rules/sonic-sensormond.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
SPATH := $($(SONIC_SENSORMOND_PY3)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-sensormond.mk rules/sonic-sensormond.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))

$(SONIC_SENSORMOND_PY3)_CACHE_MODE := GIT_CONTENT_SHA
$(SONIC_SENSORMOND_PY3)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(SONIC_SENSORMOND_PY3)_DEP_FILES := $(DEP_FILES)
$(SONIC_SENSORMOND_PY3)_SMDEP_FILES := $(SMDEP_FILES)
$(SONIC_SENSORMOND_PY3)_SMDEP_PATHS := $(SPATH)
10 changes: 10 additions & 0 deletions rules/sonic-sensormond.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# sonic-sensormond (SONiC Thermal control daemon) Debian package

# SONIC_SENSORMOND_PY3 package

SONIC_SENSORMOND_PY3 = sonic_sensormond-1.0-py3-none-any.whl
$(SONIC_SENSORMOND_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-sensormond
$(SONIC_SENSORMOND_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3)
$(SONIC_SENSORMOND_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
$(SONIC_SENSORMOND_PY3)_PYTHON_VERSION = 3
SONIC_PYTHON_WHEELS += $(SONIC_SENSORMOND_PY3)