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

[procdockerstatsd] Fix CMD field in dB (#4335)

Browse Source 
* Fix the CMD for the PROCESSSTATS entries so that
  there is a space between the command name and the
  arguments.

Signed-off-by: Garrick He <garrick_he@dell.com>
This commit is contained in:
Garrick He 2020-03-28 11:43:48 -07:00 committed by rlhui
parent 6929d1f3ac
commit a059d7ec0e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
files/image_config/procdockerstatsd/procdockerstatsd
View File

@ -41,8 +41,8 @@ class ProcDockerStats:
def __init__(self): def __init__(self):
self.state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP) self.state_db = swsssdk.SonicV2Connector(host=REDIS_HOSTIP)
self.state_db.connect("STATE_DB") self.state_db.connect("STATE_DB")
def run_command(self, cmd): def run_command(self, cmd):
proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
(stdout, stderr) = proc.communicate() (stdout, stderr) = proc.communicate()
@ -75,7 +75,7 @@ class ProcDockerStats:
# To remove extra space before UID # To remove extra space before UID
val = list(filter(None, values1)) val = list(filter(None, values1))
# Merging extra columns created due to space in cmd ouput # Merging extra columns created due to space in cmd ouput
val[8:] = [''.join(val[8:])] val[8:] = [' '.join(val[8:])]
process_data = dict(zip(keylist, val)) process_data = dict(zip(keylist, val))
process_data_list.append(process_data) process_data_list.append(process_data)
return process_data_list return process_data_list
@ -109,10 +109,10 @@ class ProcDockerStats:
for row in dict_list[0:]: for row in dict_list[0:]:
cid = row.get('CONTAINER ID') cid = row.get('CONTAINER ID')
if cid: if cid:
key = 'DOCKER_STATS|' + str(cid) key = 'DOCKER_STATS|' + str(cid)
dockerdict[key] = {} dockerdict[key] = {}
dockerdict[key]['NAME'] = row.get('NAME') dockerdict[key]['NAME'] = row.get('NAME')
splitcol = row.get('CPU %') splitcol = row.get('CPU %')
cpu = re.split("%", str(splitcol)) cpu = re.split("%", str(splitcol))
dockerdict[key]['CPU%'] = str(cpu[0]) dockerdict[key]['CPU%'] = str(cpu[0])
@ -131,7 +131,7 @@ class ProcDockerStats:
netio = re.split(" / ", str(splitcol)) netio = re.split(" / ", str(splitcol))
dockerdict[key]['NET_IN_BYTES'] = str(self.convert_to_bytes(netio[0])) dockerdict[key]['NET_IN_BYTES'] = str(self.convert_to_bytes(netio[0]))
dockerdict[key]['NET_OUT_BYTES'] = str(self.convert_to_bytes(netio[1])) dockerdict[key]['NET_OUT_BYTES'] = str(self.convert_to_bytes(netio[1]))
splitcol = row.get('BLOCK I/O') splitcol = row.get('BLOCK I/O')
blockio = re.split(" / ", str(splitcol)) blockio = re.split(" / ", str(splitcol))
dockerdict[key]['BLOCK_IN_BYTES'] = str(self.convert_to_bytes(blockio[0])) dockerdict[key]['BLOCK_IN_BYTES'] = str(self.convert_to_bytes(blockio[0]))