From ad645636d07d0423253f19068a22b2a28251b05f Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Thu, 25 Mar 2021 11:43:30 -0700 Subject: [PATCH] update uptime docs --- CHANGELOG | 9 ++++---- EXAMPLES.md | 19 +++++++++++----- README.md | 19 +++++++++++----- docs/parsers/uptime.md | 50 +++++++++++++++++++++++++++--------------- jc/parsers/uptime.py | 39 ++++++++++++++++++-------------- 5 files changed, 86 insertions(+), 50 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 034d8a18..601871b6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,11 +5,12 @@ jc changelog - Add upower parser tested on linux - Update date parser: complete rewrite (v2.0) providing many enhancements: - Mmake weekday numbering ISO 8601 compliant - - Add a calculated naive timestamp - - Add a calculated UTC timestamp (only if date output is in UTC) + - Add a calculated naive timestamp field + - Add a calculated UTC timestamp field (only if date output is in UTC) - Add several fields, including: hour_24, utc_offset, day_of_year, week_of_year, iso, and timezone_aware -- Update uptime parser to provide datestamps -- Update last parser to use the new date-time parsing function +- Update uptime parser to add uptime_days, uptime_hours, uptime_minutes, uptime_total_seconds, time_hour, + time_minute, and time_second fields +- Update last parser to use new timestamp function - Add -h option to display the help text. Piping errors no longer show the help text. 20210305 v1.14.4 diff --git a/EXAMPLES.md b/EXAMPLES.md index c8965b1c..e30d6aaf 100644 --- a/EXAMPLES.md +++ b/EXAMPLES.md @@ -2841,12 +2841,19 @@ uptime | jc --uptime -p # or: jc -p uptime ``` ```json { - "time": "11:30:44", - "uptime": "1 day, 21:17", - "users": 1, - "load_1m": 0.01, - "load_5m": 0.04, - "load_15m": 0.05 + "time": "11:35", + "uptime": "3 days, 4:03", + "users": 5, + "load_1m": 1.88, + "load_5m": 2.0, + "load_15m": 1.94, + "time_hour": 11, + "time_minute": 35, + "time_second": null, + "uptime_days": 3, + "uptime_hours": 4, + "uptime_minutes": 3, + "uptime_total_seconds": 273780 } ``` ### w diff --git a/README.md b/README.md index 085b8a0c..273d819e 100644 --- a/README.md +++ b/README.md @@ -802,12 +802,19 @@ uptime | jc --uptime -p # or: jc -p uptime ``` ```json { - "time": "11:30:44", - "uptime": "1 day, 21:17", - "users": 1, - "load_1m": 0.01, - "load_5m": 0.04, - "load_15m": 0.05 + "time": "11:35", + "uptime": "3 days, 4:03", + "users": 5, + "load_1m": 1.88, + "load_5m": 2.0, + "load_15m": 1.94, + "time_hour": 11, + "time_minute": 35, + "time_second": null, + "uptime_days": 3, + "uptime_hours": 4, + "uptime_minutes": 3, + "uptime_total_seconds": 273780 } ``` ### XML files diff --git a/docs/parsers/uptime.md b/docs/parsers/uptime.md index a927c45b..0fa7e7c7 100644 --- a/docs/parsers/uptime.md +++ b/docs/parsers/uptime.md @@ -23,22 +23,29 @@ Example: $ uptime | jc --uptime -p { - "time": "11:30:44", - "uptime": "1 day, 21:17", - "users": 1, - "load_1m": 0.01, - "load_5m": 0.04, - "load_15m": 0.05 + "time": "11:35", + "uptime": "3 days, 4:03", + "users": 5, + "load_1m": 1.88, + "load_5m": 2.0, + "load_15m": 1.94, + "time_hour": 11, + "time_minute": 35, + "time_second": null, + "uptime_days": 3, + "uptime_hours": 4, + "uptime_minutes": 3, + "uptime_total_seconds": 273780 } $ uptime | jc --uptime -p -r { - "time": "11:31:09", - "uptime": "1 day, 21:17", - "users": "1", - "load_1m": "0.00", - "load_5m": "0.04", - "load_15m": "0.05" + "time": "11:36", + "uptime": "3 days, 4:04", + "users": "5", + "load_1m": "1.88", + "load_5m": "1.99", + "load_15m": "1.94" } @@ -64,12 +71,19 @@ Returns: Dictionary. Structured data with the following schema: { - "time": string, - "uptime": string, - "users": integer, - "load_1m": float, - "load_5m": float, - "load_15m": float + "time": string, + "time_hour": integer, + "time_minute": integer, + "time_second": integer, # null if not displayed + "uptime": string, + "uptime_days": integer, + "uptime_hours": integer, + "uptime_minutes": integer, + "uptime_total_seconds": integer, + "users": integer, + "load_1m": float, + "load_5m": float, + "load_15m": float } diff --git a/jc/parsers/uptime.py b/jc/parsers/uptime.py index c75f822e..31e4adb6 100644 --- a/jc/parsers/uptime.py +++ b/jc/parsers/uptime.py @@ -21,22 +21,29 @@ Example: $ uptime | jc --uptime -p { - "time": "11:30:44", - "uptime": "1 day, 21:17", - "users": 1, - "load_1m": 0.01, - "load_5m": 0.04, - "load_15m": 0.05 + "time": "11:35", + "uptime": "3 days, 4:03", + "users": 5, + "load_1m": 1.88, + "load_5m": 2.0, + "load_15m": 1.94, + "time_hour": 11, + "time_minute": 35, + "time_second": null, + "uptime_days": 3, + "uptime_hours": 4, + "uptime_minutes": 3, + "uptime_total_seconds": 273780 } $ uptime | jc --uptime -p -r { - "time": "11:31:09", - "uptime": "1 day, 21:17", - "users": "1", - "load_1m": "0.00", - "load_5m": "0.04", - "load_15m": "0.05" + "time": "11:36", + "uptime": "3 days, 4:04", + "users": "5", + "load_1m": "1.88", + "load_5m": "1.99", + "load_15m": "1.94" } """ import jc.utils @@ -74,10 +81,10 @@ def process(proc_data): "time_minute": integer, "time_second": integer, # null if not displayed "uptime": string, - "uptime_days": integer, # new - "uptime_hours": integer, # new - "uptime_minutes": integer, # new - "uptime_total_seconds": integer, # new + "uptime_days": integer, + "uptime_hours": integer, + "uptime_minutes": integer, + "uptime_total_seconds": integer, "users": integer, "load_1m": float, "load_5m": float,