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

Add daemon which periodically pushes process and docker stats to State DB #3525

Merged
merged 21 commits into from
Nov 27, 2019
Merged

Add daemon which periodically pushes process and docker stats to State DB #3525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d0f36ee
adding draft for daemon getting process data
pra-moh Sep 26, 2019
58b59dc
resolving PR comments, adding separate method for docker
pra-moh Sep 30, 2019
d5cf0f0
adjusting whitespace
pra-moh Oct 1, 2019
b085b5b
adding process data output parsing to daemon
pra-moh Oct 2, 2019
9624514
adjusting space
pra-moh Oct 2, 2019
f1b2d8a
removing trailing spaces
pra-moh Oct 7, 2019
57da086
adding seperate method for docker data formatting
pra-moh Oct 24, 2019
9119ba9
uncommenting root check
pra-moh Oct 24, 2019
cd49b30
resolving comments on constant name, rounded integer
pra-moh Nov 13, 2019
a56b356
Resolving comment for converting to integer and uppercase for table n…
pra-moh Nov 13, 2019
8d0ef54
adding restart=always
pra-moh Nov 13, 2019
0c51c28
adding entry in sonic_debian_extension.j2
pra-moh Nov 13, 2019
147719f
added new line at end of file
pra-moh Nov 14, 2019
b00378d
uppercase for process and docker_stats
pra-moh Nov 14, 2019
57c33ed
trying to add changes from previous commit
pra-moh Nov 14, 2019
e2f147d
correcting return statement
pra-moh Nov 14, 2019
f049311
appending BYTES to converted columns
pra-moh Nov 16, 2019
cd00617
changing top 5 to 1024 processes
pra-moh Nov 21, 2019
14a1056
adding d to suggest daemon file
pra-moh Nov 21, 2019
4270c30
removing d from classname
pra-moh Nov 21, 2019
eedab12
adding database.service as dependency
pra-moh Nov 27, 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
6 changes: 3 additions & 3 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ echo "caclmgrd.service" | sudo tee -a $GENERATED_SERVICE_FILE
sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd $FILESYSTEM_ROOT/usr/bin/

# Copy process docker cpu/memory utilization data export daemon
jleveque marked this conversation as resolved.
Show resolved Hide resolved
sudo cp $IMAGE_CONFIGS/procdockerstats/procdockerstats.service $FILESYSTEM_ROOT/etc/systemd/system/
echo "procdockerstats.service" | sudo tee -a $GENERATED_SERVICE_FILE
sudo cp $IMAGE_CONFIGS/procdockerstats/procdockerstats $FILESYSTEM_ROOT/usr/bin/
sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd.service $FILESYSTEM_ROOT/etc/systemd/system/
echo "procdockerstatsd.service" | sudo tee -a $GENERATED_SERVICE_FILE
sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd $FILESYSTEM_ROOT/usr/bin/

# Copy process-reboot-cause service files
sudo cp $IMAGE_CONFIGS/process-reboot-cause/process-reboot-cause.service $FILESYSTEM_ROOT/etc/systemd/system/
Expand Down
8 changes: 4 additions & 4 deletions ...ge_config/procdockerstats/procdockerstats → ..._config/procdockerstatsd/procdockerstatsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# !/usr/bin/env python
'''
procdockerstats
procdockerstatsd
Daemon which periodically gathers process and docker statistics and pushes the data to STATE_DB
'''

Expand All @@ -16,7 +16,7 @@ import swsssdk

VERSION = '1.0'

SYSLOG_IDENTIFIER = "procdockerstats"
SYSLOG_IDENTIFIER = "procdockerstatsd"

REDIS_HOSTIP = "127.0.0.1"

Expand All @@ -37,7 +37,7 @@ def log_error(msg, also_print_to_console=False):
syslog.closelog()

# ========================== ProcessDocker class ==========================
class ProcDockerStats:
class ProcDockerStatsd:
jleveque marked this conversation as resolved.
Show resolved Hide resolved

def __init__(self):
self.state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
Expand Down Expand Up @@ -202,7 +202,7 @@ def main():
log_error("Must be root to run process-docker daemon")
print "Error: Must be root to run process-docker daemon"
sys.exit(1)
pd = ProcDockerStats()
pd = ProcDockerStatsd()
# Data need to be updated every 2 mins. hence adding delay of 120 seconds
while True:
pd.run()
Expand Down
2 changes: 1 addition & 1 deletion ...g/procdockerstats/procdockerstats.service → ...procdockerstatsd/procdockerstatsd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ After=updategraph.service

[Service]
Type=simple
ExecStart=/usr/bin/procdockerstats
ExecStart=/usr/bin/procdockerstatsd
Restart=Always

[Install]
Expand Down