From ed320cf0f4bb11cee1e69e9dc9176ba109df1b86 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Thu, 17 Oct 2019 13:04:34 -0700 Subject: [PATCH] change netstat pid field to integer --- README.md | 20 ++++++++++---------- jc/parsers/netstat.py | 22 +++++++++++----------- setup.py | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 5d65471c..ddf343f7 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # JC -JSON CLI output utility v0.1 +JSON CLI output utility `jc` is used to JSONify the output of many standard linux cli tools for easier parsing in scripts. Parsers for `ls`, `ifconfig`, and `netstat` are currently included and more can be added via modules. @@ -140,7 +140,7 @@ $ netstat -p | jc --netstat -p "foreign_address": "lb-192-30-255-113", "foreign_port": "https", "state": "ESTABLISHED", - "pid": "53550", + "pid": 53550, "program_name": "git-remote-ht", "receive_q": 0, "send_q": 0 @@ -151,7 +151,7 @@ $ netstat -p | jc --netstat -p "foreign_address": "lb-192-30-255-113", "foreign_port": "https", "state": "ESTABLISHED", - "pid": "53550", + "pid": 53550, "program_name": "git-remote-ht", "receive_q": 0, "send_q": 0 @@ -172,7 +172,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "0.0.0.0", "foreign_port": "*", "state": "LISTEN", - "pid": "1594", + "pid": 1594, "program_name": "master", "receive_q": 0, "send_q": 0 @@ -183,7 +183,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "0.0.0.0", "foreign_port": "*", "state": "LISTEN", - "pid": "21918", + "pid": 21918, "program_name": "sshd", "receive_q": 0, "send_q": 0 @@ -196,7 +196,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "[::]", "foreign_port": "*", "state": "LISTEN", - "pid": "1594", + "pid": 1594, "program_name": "master", "receive_q": 0, "send_q": 0 @@ -207,7 +207,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "[::]", "foreign_port": "*", "state": "LISTEN", - "pid": "21918", + "pid": 21918, "program_name": "sshd", "receive_q": 0, "send_q": 0 @@ -221,7 +221,7 @@ $ netstat -lp | jc --netstat -p "local_port": "bootpc", "foreign_address": "0.0.0.0", "foreign_port": "*", - "pid": "13903", + "pid": 13903, "program_name": "dhclient", "receive_q": 0, "send_q": 0 @@ -231,7 +231,7 @@ $ netstat -lp | jc --netstat -p "local_port": "323", "foreign_address": "0.0.0.0", "foreign_port": "*", - "pid": "30926", + "pid": 30926, "program_name": "chronyd", "receive_q": 0, "send_q": 0 @@ -243,7 +243,7 @@ $ netstat -lp | jc --netstat -p "local_port": "323", "foreign_address": "[::]", "foreign_port": "*", - "pid": "30926", + "pid": 30926, "program_name": "chronyd", "receive_q": 0, "send_q": 0 diff --git a/jc/parsers/netstat.py b/jc/parsers/netstat.py index 3d61e467..9291fc84 100644 --- a/jc/parsers/netstat.py +++ b/jc/parsers/netstat.py @@ -21,7 +21,7 @@ $ netstat -p | jc --netstat -p "foreign_address": "lb-192-30-255-113", "foreign_port": "https", "state": "ESTABLISHED", - "pid": "53550", + "pid": 53550, "program_name": "git-remote-ht", "receive_q": 0, "send_q": 0 @@ -32,7 +32,7 @@ $ netstat -p | jc --netstat -p "foreign_address": "lb-192-30-255-113", "foreign_port": "https", "state": "ESTABLISHED", - "pid": "53550", + "pid": 53550, "program_name": "git-remote-ht", "receive_q": 0, "send_q": 0 @@ -53,7 +53,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "0.0.0.0", "foreign_port": "*", "state": "LISTEN", - "pid": "1594", + "pid": 1594, "program_name": "master", "receive_q": 0, "send_q": 0 @@ -64,7 +64,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "0.0.0.0", "foreign_port": "*", "state": "LISTEN", - "pid": "21918", + "pid": 21918, "program_name": "sshd", "receive_q": 0, "send_q": 0 @@ -77,7 +77,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "[::]", "foreign_port": "*", "state": "LISTEN", - "pid": "1594", + "pid": 1594, "program_name": "master", "receive_q": 0, "send_q": 0 @@ -88,7 +88,7 @@ $ netstat -lp | jc --netstat -p "foreign_address": "[::]", "foreign_port": "*", "state": "LISTEN", - "pid": "21918", + "pid": 21918, "program_name": "sshd", "receive_q": 0, "send_q": 0 @@ -102,7 +102,7 @@ $ netstat -lp | jc --netstat -p "local_port": "bootpc", "foreign_address": "0.0.0.0", "foreign_port": "*", - "pid": "13903", + "pid": 13903, "program_name": "dhclient", "receive_q": 0, "send_q": 0 @@ -112,7 +112,7 @@ $ netstat -lp | jc --netstat -p "local_port": "323", "foreign_address": "0.0.0.0", "foreign_port": "*", - "pid": "30926", + "pid": 30926, "program_name": "chronyd", "receive_q": 0, "send_q": 0 @@ -124,7 +124,7 @@ $ netstat -lp | jc --netstat -p "local_port": "323", "foreign_address": "[::]", "foreign_port": "*", - "pid": "30926", + "pid": 30926, "program_name": "chronyd", "receive_q": 0, "send_q": 0 @@ -168,10 +168,10 @@ def parse_line(entry): output_line['state'] = parsed_line[5] if len(parsed_line) > 6: - output_line['pid'] = parsed_line[6].split('/')[0] + output_line['pid'] = int(parsed_line[6].split('/')[0]) output_line['program_name'] = parsed_line[6].split('/')[1] else: - output_line['pid'] = parsed_line[5].split('/')[0] + output_line['pid'] = int(parsed_line[5].split('/')[0]) output_line['program_name'] = parsed_line[5].split('/')[1] output_line['receive_q'] = int(parsed_line[1]) diff --git a/setup.py b/setup.py index 2d3b7c72..f7ff05c7 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open('README.md', 'r') as f: setuptools.setup( name='jc', - version='0.1.1', + version='0.2.0', author='Kelly Brazil', author_email='kellyjonbrazil@gmail.com', description='This tool serializes the output of popular command line tools to structured JSON output.',