python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00
Code Issues Releases Activity

fixes for ubunut

Browse Source
This commit is contained in:
Kelly Brazil
2021-12-01 16:01:52 -08:00
parent 406336c718
commit bf15575e90
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jc/parsers/iostat.py
View File

@ -48,8 +48,14 @@ Schema:
"r_await": float, "r_await": float,
"w_await": float, "w_await": float,
"svctm": float, "svctm": float,
"percent_util": float "aqu_sz": float,
"rareq_sz": float,
"wareq_sz": float,
"percent_util": float,
"percent_rrqm": float,
"percent_wrqm": float
} }
]
Examples: Examples:
@ -168,7 +174,8 @@ def _process(proc_data):
'percent_user', 'percent_nice', 'percent_system', 'percent_iowait', 'percent_user', 'percent_nice', 'percent_system', 'percent_iowait',
'percent_steal', 'percent_idle', 'tps', 'kb_read_s', 'mb_read_s', 'kb_wrtn_s', 'percent_steal', 'percent_idle', 'tps', 'kb_read_s', 'mb_read_s', 'kb_wrtn_s',
'mb_wrtn_s', 'rrqm_s', 'wrqm_s', 'r_s', 'w_s', 'rmb_s', 'rkb_s', 'wmb_s', 'mb_wrtn_s', 'rrqm_s', 'wrqm_s', 'r_s', 'w_s', 'rmb_s', 'rkb_s', 'wmb_s',
'wkb_s', 'avgrq_sz', 'avgqu_sz', 'await', 'r_await', 'w_await', 'svctm', 'percent_util' 'wkb_s', 'avgrq_sz', 'avgqu_sz', 'await', 'r_await', 'w_await', 'svctm',
'percent_util', 'percent_rrqm', 'percent_wrqm', 'aqu_sz', 'rareq_sz', 'wareq_sz'
] ]
int_list = ['kb_read', 'mb_read', 'kb_wrtn', 'mb_wrtn'] int_list = ['kb_read', 'mb_read', 'kb_wrtn', 'mb_wrtn']
for key in entry: for key in entry:
@ -231,7 +238,7 @@ def parse(data, raw=False, quiet=False):
cpu_list.append(headers) cpu_list.append(headers)
continue continue
if line.startswith('Device:'): if line.startswith('Device'):
if cpu_list: if cpu_list:
raw_output.extend(_create_obj_list(cpu_list, 'cpu')) raw_output.extend(_create_obj_list(cpu_list, 'cpu'))
cpu_list = [] cpu_list = []
@ -252,10 +259,10 @@ def parse(data, raw=False, quiet=False):
if section == 'device': if section == 'device':
device_list.append(line) device_list.append(line)
if cpu_list: if cpu_list:
raw_output.extend(_create_obj_list(cpu_list, 'cpu')) raw_output.extend(_create_obj_list(cpu_list, 'cpu'))
if device_list: if device_list:
raw_output.extend(_create_obj_list(device_list, 'device')) raw_output.extend(_create_obj_list(device_list, 'device'))
return raw_output if raw else _process(raw_output) return raw_output if raw else _process(raw_output)