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

fix schema

Browse Source
This commit is contained in:
Kelly Brazil
2022-05-25 12:18:51 -07:00
parent 51aa5b268f
commit 4e130d11a3
2 changed files with 75 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
docs/parsers/top.md
View File

@ -49,23 +49,23 @@ Schema:
"cpu_hardware": float, "cpu_hardware": float,
"cpu_software": float, "cpu_software": float,
"cpu_steal": float, "cpu_steal": float,
"mem_total": integer, "mem_total": float, [0]
"mem_free": integer, "mem_free": float, [0]
"mem_used": integer, "mem_used": float, [0]
"mem_buff_cache": integer, "mem_buff_cache": float, [0]
"swap_total": integer, "swap_total": float, [0]
"swap_free": integer, "swap_free": float, [0]
"swap_used": integer, "swap_used": float, [0]
"mem_available": integer, "mem_available": float, [0]
"processes": [ "processes": [
{ {
"pid": integer, "pid": integer,
"user": string, "user": string,
"priority": integer, "priority": integer,
"nice": integer, "nice": integer,
"virtual_mem": string, "virtual_mem": float, [1]
"resident_mem": string, "resident_mem": float, [1]
"shared_mem": string, "shared_mem": float, [1]
"status": string, "status": string,
"percent_cpu": float, "percent_cpu": float,
"percent_mem": float, "percent_mem": float,
@ -86,9 +86,9 @@ Schema:
"thread_count": integer, "thread_count": integer,
"last_used_processor": integer, "last_used_processor": integer,
"time": string, "time": string,
"swap": string, "swap": float, [1]
"code": string, "code": float, [1]
"data": string, "data": float, [1]
"major_page_fault_count": integer, "major_page_fault_count": integer,
"minor_page_fault_count": integer, "minor_page_fault_count": integer,
"dirty_pages_count": integer, "dirty_pages_count": integer,
@ -107,7 +107,7 @@ Schema:
] ]
"major_page_fault_count_delta": integer, "major_page_fault_count_delta": integer,
"minor_page_fault_count_delta": integer, "minor_page_fault_count_delta": integer,
"used": string, "used": float, [1]
"ipc_namespace_inode": integer, "ipc_namespace_inode": integer,
"mount_namespace_inode": integer, "mount_namespace_inode": integer,
"net_namespace_inode": integer, "net_namespace_inode": integer,
@ -119,6 +119,9 @@ Schema:
} }
] ]
[0] Values are in the units output by `top`
[1] Unit suffix stripped during float conversion
Examples: Examples:
$ top -b -n 3 | jc --top -p $ top -b -n 3 | jc --top -p
@ -143,19 +146,23 @@ Examples:
"cpu_hardware": 0.0, "cpu_hardware": 0.0,
"cpu_software": 0.0, "cpu_software": 0.0,
"cpu_steal": 0.0, "cpu_steal": 0.0,
"swap_total": 2, "mem_total": 3.7,
"swap_free": 2, "mem_free": 3.3,
"swap_used": 0, "mem_used": 0.2,
"mem_available": 3, "mem_buff_cache": 0.2,
"swap_total": 2.0,
"swap_free": 2.0,
"swap_used": 0.0,
"mem_available": 3.3,
"processes": [ "processes": [
{ {
"pid": 2225, "pid": 2225,
"user": "kbrazil", "user": "kbrazil",
"priority": 20, "priority": 20,
"nice": 0, "nice": 0,
"virtual_mem": 158, "virtual_mem": 158.1,
"resident_mem": 2, "resident_mem": 2.2,
"shared_mem": 1, "shared_mem": 1.6,
"status": "running", "status": "running",
"percent_cpu": 12.5, "percent_cpu": 12.5,
"percent_mem": 0.1, "percent_mem": 0.1,
@ -176,9 +183,9 @@ Examples:
"thread_count": 1, "thread_count": 1,
"last_used_processor": 0, "last_used_processor": 0,
"time": "0:00", "time": "0:00",
"swap": "0.0m", "swap": 0.0,
"code": "0.1m", "code": 0.1,
"data": "1.0m", "data": 1.0,
"major_page_fault_count": 0, "major_page_fault_count": 0,
"minor_page_fault_count": 736, "minor_page_fault_count": 736,
"dirty_pages_count": 0, "dirty_pages_count": 0,
@ -200,7 +207,7 @@ Examples:
], ],
"major_page_fault_count_delta": 0, "major_page_fault_count_delta": 0,
"minor_page_fault_count_delta": 4, "minor_page_fault_count_delta": 4,
"used": "2.2m", "used": 2.2,
"ipc_namespace_inode": 4026531839, "ipc_namespace_inode": 4026531839,
"mount_namespace_inode": 4026531840, "mount_namespace_inode": 4026531840,
"net_namespace_inode": 4026531956, "net_namespace_inode": 4026531956,

78
jc/parsers/top.py
View File

@ -44,23 +44,23 @@ Schema:
"cpu_hardware": float, "cpu_hardware": float,
"cpu_software": float, "cpu_software": float,
"cpu_steal": float, "cpu_steal": float,
"mem_total": integer, "mem_total": float, [0]
"mem_free": integer, "mem_free": float, [0]
"mem_used": integer, "mem_used": float, [0]
"mem_buff_cache": integer, "mem_buff_cache": float, [0]
"swap_total": integer, "swap_total": float, [0]
"swap_free": integer, "swap_free": float, [0]
"swap_used": integer, "swap_used": float, [0]
"mem_available": integer, "mem_available": float, [0]
"processes": [ "processes": [
{ {
"pid": integer, "pid": integer,
"user": string, "user": string,
"priority": integer, "priority": integer,
"nice": integer, "nice": integer,
"virtual_mem": string, "virtual_mem": float, [1]
"resident_mem": string, "resident_mem": float, [1]
"shared_mem": string, "shared_mem": float, [1]
"status": string, "status": string,
"percent_cpu": float, "percent_cpu": float,
"percent_mem": float, "percent_mem": float,
@ -81,9 +81,9 @@ Schema:
"thread_count": integer, "thread_count": integer,
"last_used_processor": integer, "last_used_processor": integer,
"time": string, "time": string,
"swap": string, "swap": float, [1]
"code": string, "code": float, [1]
"data": string, "data": float, [1]
"major_page_fault_count": integer, "major_page_fault_count": integer,
"minor_page_fault_count": integer, "minor_page_fault_count": integer,
"dirty_pages_count": integer, "dirty_pages_count": integer,
@ -102,7 +102,7 @@ Schema:
] ]
"major_page_fault_count_delta": integer, "major_page_fault_count_delta": integer,
"minor_page_fault_count_delta": integer, "minor_page_fault_count_delta": integer,
"used": string, "used": float, [1]
"ipc_namespace_inode": integer, "ipc_namespace_inode": integer,
"mount_namespace_inode": integer, "mount_namespace_inode": integer,
"net_namespace_inode": integer, "net_namespace_inode": integer,
@ -114,6 +114,9 @@ Schema:
} }
] ]
[0] Values are in the units output by `top`
[1] Unit suffix stripped during float conversion
Examples: Examples:
$ top -b -n 3 | jc --top -p $ top -b -n 3 | jc --top -p
@ -138,19 +141,23 @@ Examples:
"cpu_hardware": 0.0, "cpu_hardware": 0.0,
"cpu_software": 0.0, "cpu_software": 0.0,
"cpu_steal": 0.0, "cpu_steal": 0.0,
"swap_total": 2, "mem_total": 3.7,
"swap_free": 2, "mem_free": 3.3,
"swap_used": 0, "mem_used": 0.2,
"mem_available": 3, "mem_buff_cache": 0.2,
"swap_total": 2.0,
"swap_free": 2.0,
"swap_used": 0.0,
"mem_available": 3.3,
"processes": [ "processes": [
{ {
"pid": 2225, "pid": 2225,
"user": "kbrazil", "user": "kbrazil",
"priority": 20, "priority": 20,
"nice": 0, "nice": 0,
"virtual_mem": 158, "virtual_mem": 158.1,
"resident_mem": 2, "resident_mem": 2.2,
"shared_mem": 1, "shared_mem": 1.6,
"status": "running", "status": "running",
"percent_cpu": 12.5, "percent_cpu": 12.5,
"percent_mem": 0.1, "percent_mem": 0.1,
@ -171,9 +178,9 @@ Examples:
"thread_count": 1, "thread_count": 1,
"last_used_processor": 0, "last_used_processor": 0,
"time": "0:00", "time": "0:00",
"swap": "0.0m", "swap": 0.0,
"code": "0.1m", "code": 0.1,
"data": "1.0m", "data": 1.0,
"major_page_fault_count": 0, "major_page_fault_count": 0,
"minor_page_fault_count": 736, "minor_page_fault_count": 736,
"dirty_pages_count": 0, "dirty_pages_count": 0,
@ -195,7 +202,7 @@ Examples:
], ],
"major_page_fault_count_delta": 0, "major_page_fault_count_delta": 0,
"minor_page_fault_count_delta": 4, "minor_page_fault_count_delta": 4,
"used": "2.2m", "used": 2.2,
"ipc_namespace_inode": 4026531839, "ipc_namespace_inode": 4026531839,
"mount_namespace_inode": 4026531840, "mount_namespace_inode": 4026531840,
"net_namespace_inode": 4026531956, "net_namespace_inode": 4026531956,
@ -395,19 +402,19 @@ def _process(proc_data: List[Dict], quiet=False) -> List[Dict]:
int_list: List = [ int_list: List = [
'uptime', 'users', 'tasks_total', 'tasks_running', 'tasks_sleeping', 'tasks_stopped', 'uptime', 'users', 'tasks_total', 'tasks_running', 'tasks_sleeping', 'tasks_stopped',
'tasks_zombie', 'mem_total', 'mem_free', 'mem_used', 'mem_buff_cache', 'swap_total', 'tasks_zombie', 'pid', 'priority', 'nice', 'parent_pid', 'uid', 'real_uid', 'saved_uid',
'swap_free', 'swap_used', 'mem_available', 'pid', 'priority', 'nice', 'parent_pid', 'uid', 'gid', 'pgrp', 'tty_process_gid', 'session_id', 'thread_count', 'last_used_processor',
'real_uid', 'saved_uid', 'gid', 'pgrp', 'tty_process_gid', 'session_id', 'thread_count', 'major_page_fault_count', 'minor_page_fault_count', 'dirty_pages_count', 'thread_gid',
'last_used_processor', 'major_page_fault_count', 'minor_page_fault_count', 'major_page_fault_count_delta', 'minor_page_fault_count_delta', 'ipc_namespace_inode',
'dirty_pages_count', 'thread_gid', 'major_page_fault_count_delta', 'mount_namespace_inode', 'net_namespace_inode', 'pid_namespace_inode',
'minor_page_fault_count_delta', 'ipc_namespace_inode', 'mount_namespace_inode', 'user_namespace_inode', 'nts_namespace_inode'
'net_namespace_inode', 'pid_namespace_inode', 'user_namespace_inode', 'nts_namespace_inode',
'virtual_mem', 'resident_mem', 'shared_mem'
] ]
float_list: List = [ float_list: List = [
'load_1m', 'load_5m', 'load_15m', 'cpu_user', 'cpu_sys', 'cpu_nice', 'cpu_idle', 'cpu_wait', 'load_1m', 'load_5m', 'load_15m', 'cpu_user', 'cpu_sys', 'cpu_nice', 'cpu_idle', 'cpu_wait',
'cpu_hardware', 'cpu_software', 'cpu_steal', 'percent_cpu', 'percent_mem' 'cpu_hardware', 'cpu_software', 'cpu_steal', 'percent_cpu', 'percent_mem', 'mem_total',
'mem_free', 'mem_used', 'mem_buff_cache', 'swap_total', 'swap_free', 'swap_used',
'mem_available', 'virtual_mem', 'resident_mem', 'shared_mem', 'swap', 'code', 'data', 'used'
] ]
for idx, item in enumerate(proc_data): for idx, item in enumerate(proc_data):
@ -593,7 +600,6 @@ def parse(
continue continue
if line.startswith(' PID '): if line.startswith(' PID '):
# line = normalize_headers(line)
process_table = True process_table = True
process_list.append(line) process_list.append(line)
continue continue