python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-07-13 01:20:24 +02:00
Code Issues Releases Activity

update uptime docs

Browse Source
This commit is contained in:
Kelly Brazil
2021-03-25 11:43:30 -07:00
parent 2f2f297b29
commit ad645636d0
5 changed files with 86 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -5,11 +5,12 @@ jc changelog
- Add upower parser tested on linux - Add upower parser tested on linux
- Update date parser: complete rewrite (v2.0) providing many enhancements: - Update date parser: complete rewrite (v2.0) providing many enhancements:
- Mmake weekday numbering ISO 8601 compliant - Mmake weekday numbering ISO 8601 compliant
- Add a calculated naive timestamp - Add a calculated naive timestamp field
- Add a calculated UTC timestamp (only if date output is in UTC) - 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 - 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 uptime parser to add uptime_days, uptime_hours, uptime_minutes, uptime_total_seconds, time_hour,
- Update last parser to use the new date-time parsing function 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. - Add -h option to display the help text. Piping errors no longer show the help text.
20210305 v1.14.4 20210305 v1.14.4

19
EXAMPLES.md
View File

@ -2841,12 +2841,19 @@ uptime | jc --uptime -p # or: jc -p uptime
``` ```
```json ```json
{ {
"time": "11:30:44", "time": "11:35",
"uptime": "1 day, 21:17", "uptime": "3 days, 4:03",
"users": 1, "users": 5,
"load_1m": 0.01, "load_1m": 1.88,
"load_5m": 0.04, "load_5m": 2.0,
"load_15m": 0.05 "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 ### w

19
README.md
View File

@ -802,12 +802,19 @@ uptime | jc --uptime -p # or: jc -p uptime
``` ```
```json ```json
{ {
"time": "11:30:44", "time": "11:35",
"uptime": "1 day, 21:17", "uptime": "3 days, 4:03",
"users": 1, "users": 5,
"load_1m": 0.01, "load_1m": 1.88,
"load_5m": 0.04, "load_5m": 2.0,
"load_15m": 0.05 "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 ### XML files

50
docs/parsers/uptime.md
View File

@ -23,22 +23,29 @@ Example:
$ uptime | jc --uptime -p $ uptime | jc --uptime -p
{ {
"time": "11:30:44", "time": "11:35",
"uptime": "1 day, 21:17", "uptime": "3 days, 4:03",
"users": 1, "users": 5,
"load_1m": 0.01, "load_1m": 1.88,
"load_5m": 0.04, "load_5m": 2.0,
"load_15m": 0.05 "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 $ uptime | jc --uptime -p -r
{ {
"time": "11:31:09", "time": "11:36",
"uptime": "1 day, 21:17", "uptime": "3 days, 4:04",
"users": "1", "users": "5",
"load_1m": "0.00", "load_1m": "1.88",
"load_5m": "0.04", "load_5m": "1.99",
"load_15m": "0.05" "load_15m": "1.94"
} }
@ -64,12 +71,19 @@ Returns:
Dictionary. Structured data with the following schema: Dictionary. Structured data with the following schema:
{ {
"time": string, "time": string,
"uptime": string, "time_hour": integer,
"users": integer, "time_minute": integer,
"load_1m": float, "time_second": integer, # null if not displayed
"load_5m": float, "uptime": string,
"load_15m": float "uptime_days": integer,
"uptime_hours": integer,
"uptime_minutes": integer,
"uptime_total_seconds": integer,
"users": integer,
"load_1m": float,
"load_5m": float,
"load_15m": float
} }

39
jc/parsers/uptime.py
View File

@ -21,22 +21,29 @@ Example:
$ uptime | jc --uptime -p $ uptime | jc --uptime -p
{ {
"time": "11:30:44", "time": "11:35",
"uptime": "1 day, 21:17", "uptime": "3 days, 4:03",
"users": 1, "users": 5,
"load_1m": 0.01, "load_1m": 1.88,
"load_5m": 0.04, "load_5m": 2.0,
"load_15m": 0.05 "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 $ uptime | jc --uptime -p -r
{ {
"time": "11:31:09", "time": "11:36",
"uptime": "1 day, 21:17", "uptime": "3 days, 4:04",
"users": "1", "users": "5",
"load_1m": "0.00", "load_1m": "1.88",
"load_5m": "0.04", "load_5m": "1.99",
"load_15m": "0.05" "load_15m": "1.94"
} }
""" """
import jc.utils import jc.utils
@ -74,10 +81,10 @@ def process(proc_data):
"time_minute": integer, "time_minute": integer,
"time_second": integer, # null if not displayed "time_second": integer, # null if not displayed
"uptime": string, "uptime": string,
"uptime_days": integer, # new "uptime_days": integer,
"uptime_hours": integer, # new "uptime_hours": integer,
"uptime_minutes": integer, # new "uptime_minutes": integer,
"uptime_total_seconds": integer, # new "uptime_total_seconds": integer,
"users": integer, "users": integer,
"load_1m": float, "load_1m": float,
"load_5m": float, "load_5m": float,