From b1b98703ce77375ff63d0e0745c517ab906d4de4 Mon Sep 17 00:00:00 2001 From: Dave Pedu Date: Thu, 28 Jan 2016 22:18:56 -0800 Subject: [PATCH] normalize cli output --- pymonitor/monitors/diskspace.py | 2 +- pymonitor/monitors/load.py | 4 ++-- pymonitor/monitors/meminfo.py | 3 +-- pymonitor/monitors/procs.py | 4 ++-- pymonitor/monitors/uptime.py | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pymonitor/monitors/diskspace.py b/pymonitor/monitors/diskspace.py index 391143a..29aafd0 100644 --- a/pymonitor/monitors/diskspace.py +++ b/pymonitor/monitors/diskspace.py @@ -47,5 +47,5 @@ mapping = { } if __name__ == '__main__': - for item in diskspace(filesystems=["/", "/tmp/monitor"]): + for item in diskspace(filesystems=["/", "/dev"]): print(item) diff --git a/pymonitor/monitors/load.py b/pymonitor/monitors/load.py index e9f5fdb..7e0fe01 100644 --- a/pymonitor/monitors/load.py +++ b/pymonitor/monitors/load.py @@ -24,5 +24,5 @@ mapping = { } if __name__ == '__main__': - for avg in load(): - print(' '.join([avg["load_1m"], avg["load_5m"], avg["load_15m"]])) + for item in load(): + print(item) diff --git a/pymonitor/monitors/meminfo.py b/pymonitor/monitors/meminfo.py index 244bc0b..a035f9a 100644 --- a/pymonitor/monitors/meminfo.py +++ b/pymonitor/monitors/meminfo.py @@ -64,5 +64,4 @@ mapping = { if __name__ == '__main__': for item in meminfo(): - for k,v in item.items(): - print("%s: %s"%(k,v)) + print(item) diff --git a/pymonitor/monitors/procs.py b/pymonitor/monitors/procs.py index 29d8fdc..e99f2b3 100644 --- a/pymonitor/monitors/procs.py +++ b/pymonitor/monitors/procs.py @@ -71,5 +71,5 @@ mapping = { } if __name__ == '__main__': - for stats in procs(): - print("%s procs %s kthreads %s threads" % (stats["procs"], stats["kthreads"], stats["threads"])) + for item in procs(): + print(item) diff --git a/pymonitor/monitors/uptime.py b/pymonitor/monitors/uptime.py index 85d9520..9050151 100644 --- a/pymonitor/monitors/uptime.py +++ b/pymonitor/monitors/uptime.py @@ -14,4 +14,4 @@ mapping = { if __name__ == '__main__': for item in uptime(): - print(item["uptime"]) + print(item)