From d2223c45d16fc82a47991702d1db26f03a0e2aa5 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Fri, 27 May 2022 17:20:54 -0700 Subject: [PATCH] add new fields to schema --- docs/parsers/top.md | 11 ++++++++++- docs/parsers/top_s.md | 11 ++++++++++- jc/parsers/top.py | 29 +++++++++++++++++++---------- jc/parsers/top_s.py | 29 +++++++++++++++++++---------- 4 files changed, 58 insertions(+), 22 deletions(-) diff --git a/docs/parsers/top.md b/docs/parsers/top.md index d8cf5e32..eca13780 100644 --- a/docs/parsers/top.md +++ b/docs/parsers/top.md @@ -114,7 +114,16 @@ All `-` values are converted to `null` "net_namespace_inode": integer, "pid_namespace_inode": integer, "user_namespace_inode": integer, - "nts_namespace_inode": integer + "nts_namespace_inode": integer, + "control_group_name": string, + "lxc_container_name": string, + "numa_node": integer, + "out_of_mem_adjustment": integer, + "out_of_mem_score": integer, + "resident_anon_mem": integer, + "resident_file_backed_mem": integer, + "resident_locked_mem": integer, + "resident_shared_mem": integer } ] } diff --git a/docs/parsers/top_s.md b/docs/parsers/top_s.md index d313158b..452656e1 100644 --- a/docs/parsers/top_s.md +++ b/docs/parsers/top_s.md @@ -112,7 +112,16 @@ Schema: "net_namespace_inode": integer, "pid_namespace_inode": integer, "user_namespace_inode": integer, - "nts_namespace_inode": integer + "nts_namespace_inode": integer, + "control_group_name": string, + "lxc_container_name": string, + "numa_node": integer, + "out_of_mem_adjustment": integer, + "out_of_mem_score": integer, + "resident_anon_mem": integer, + "resident_file_backed_mem": integer, + "resident_locked_mem": integer, + "resident_shared_mem": integer } ], diff --git a/jc/parsers/top.py b/jc/parsers/top.py index 3f744d53..7e4bef4b 100644 --- a/jc/parsers/top.py +++ b/jc/parsers/top.py @@ -109,7 +109,16 @@ All `-` values are converted to `null` "net_namespace_inode": integer, "pid_namespace_inode": integer, "user_namespace_inode": integer, - "nts_namespace_inode": integer + "nts_namespace_inode": integer, + "control_group_name": string, + "lxc_container_name": string, + "numa_node": integer, + "out_of_mem_adjustment": integer, + "out_of_mem_score": integer, + "resident_anon_mem": integer, + "resident_file_backed_mem": integer, + "resident_locked_mem": integer, + "resident_shared_mem": integer } ] } @@ -343,7 +352,7 @@ def _process(proc_data: List[Dict], quiet=False) -> List[Dict]: key_map: Dict = { '%CPU': 'percent_cpu', '%MEM': 'percent_mem', - 'CGNAME': 'control_group_name', # + 'CGNAME': 'control_group_name', 'CGROUPS': 'cgroups', 'CODE': 'code', 'COMMAND': 'command', @@ -352,21 +361,21 @@ def _process(proc_data: List[Dict], quiet=False) -> List[Dict]: 'Flags': 'flags', 'GID': 'gid', 'GROUP': 'group', - 'LXC': 'lxc_container_name', # + 'LXC': 'lxc_container_name', 'NI': 'nice', - 'NU': 'numa_node', # - 'OOMa': 'out_of_mem_adjustment', # - 'OOMs': 'out_of_mem_score', # + 'NU': 'numa_node', + 'OOMa': 'out_of_mem_adjustment', + 'OOMs': 'out_of_mem_score', 'P': 'last_used_processor', 'PGRP': 'pgrp', 'PID': 'pid', 'PPID': 'parent_pid', 'PR': 'priority', 'RES': 'resident_mem', - 'RSan': 'resident_anon_mem', # - 'RSfd': 'resident_file_backed_mem', # - 'RSlk': 'resident_locked_mem', # - 'RSsh': 'resident_shared_mem', # + 'RSan': 'resident_anon_mem', + 'RSfd': 'resident_file_backed_mem', + 'RSlk': 'resident_locked_mem', + 'RSsh': 'resident_shared_mem', 'RUID': 'real_uid', 'RUSER': 'real_user', 'S': 'status', diff --git a/jc/parsers/top_s.py b/jc/parsers/top_s.py index 3a3af29a..61402e27 100644 --- a/jc/parsers/top_s.py +++ b/jc/parsers/top_s.py @@ -107,7 +107,16 @@ Schema: "net_namespace_inode": integer, "pid_namespace_inode": integer, "user_namespace_inode": integer, - "nts_namespace_inode": integer + "nts_namespace_inode": integer, + "control_group_name": string, + "lxc_container_name": string, + "numa_node": integer, + "out_of_mem_adjustment": integer, + "out_of_mem_score": integer, + "resident_anon_mem": integer, + "resident_file_backed_mem": integer, + "resident_locked_mem": integer, + "resident_shared_mem": integer } ], @@ -180,7 +189,7 @@ def _process(proc_data: Dict, idx=0, quiet=False) -> Dict: key_map: Dict = { '%CPU': 'percent_cpu', '%MEM': 'percent_mem', - 'CGNAME': 'control_group_name', # + 'CGNAME': 'control_group_name', 'CGROUPS': 'cgroups', 'CODE': 'code', 'COMMAND': 'command', @@ -189,21 +198,21 @@ def _process(proc_data: Dict, idx=0, quiet=False) -> Dict: 'Flags': 'flags', 'GID': 'gid', 'GROUP': 'group', - 'LXC': 'lxc_container_name', # + 'LXC': 'lxc_container_name', 'NI': 'nice', - 'NU': 'numa_node', # - 'OOMa': 'out_of_mem_adjustment', # - 'OOMs': 'out_of_mem_score', # + 'NU': 'numa_node', + 'OOMa': 'out_of_mem_adjustment', + 'OOMs': 'out_of_mem_score', 'P': 'last_used_processor', 'PGRP': 'pgrp', 'PID': 'pid', 'PPID': 'parent_pid', 'PR': 'priority', 'RES': 'resident_mem', - 'RSan': 'resident_anon_mem', # - 'RSfd': 'resident_file_backed_mem', # - 'RSlk': 'resident_locked_mem', # - 'RSsh': 'resident_shared_mem', # + 'RSan': 'resident_anon_mem', + 'RSfd': 'resident_file_backed_mem', + 'RSlk': 'resident_locked_mem', + 'RSsh': 'resident_shared_mem', 'RUID': 'real_uid', 'RUSER': 'real_user', 'S': 'status',