diff --git a/src/hetrixtools_freebsd/cli.py b/src/hetrixtools_freebsd/cli.py index 62aa4ce..3c9324f 100644 --- a/src/hetrixtools_freebsd/cli.py +++ b/src/hetrixtools_freebsd/cli.py @@ -12,6 +12,7 @@ import sys import subprocess import base64 import json +from datetime import datetime import jc # holy crap: takes well known utils and produces json! import re # for stuff that jc doesn't know @@ -23,19 +24,40 @@ __license__ = "BSD-3-Clause" _logger = logging.getLogger(__name__) +''' +SID +agent +reqreboot +uptime +load1 +load5 +load15 +disks +inodes +iops +raid + +EMPTY +dh +serv +cust +rps1 +rps2 +''' + class Update: def __init__(self, logger): self.version = "2.0.5" self.SID = "" self.agent = "" - self.user = "" - self.os = "" - self.kernel = "" - self.hostname = "" - self.time = "" + self.user = "hetrixtools" + self.os = "FreeBSD" # 64 + self.kernel = "1400097"# 64 + self.hostname = "fedi" # 64 + self.time = datetime.utcnow().strftime(r'%Y-%m-%d %H:%M:%S') # 64 self.reqreboot = "" self.uptime = "" - self.cpumodel = "" # getSysCtlInfo + self.cpumodel = "" # 64, getSysCtlInfo self.cpusockets = "" # getSysCtlInfo self.cpucores = "" # getSysCtlInfo self.cputhreads = "" # getSysCtlInfo @@ -49,25 +71,25 @@ class Update: self.load5 = "" # getSysCtlInfo self.load15 = "" # getSysCtlInfo self.ramsize = "" # getSysCtlInfo - self.ram = "" + self.ram = "" # getVMStatInfo self.ramswapsize = "" # getSysCtlInfo self.ramswap = "" # getSwapInfo self.rambuff = "" # getSwapInfo self.ramcache = "" # getSwapInfo - self.disks = "" - self.inodes = "" - self.iops = "" - self.raid = "" - self.dh = "" - self.nics = "" # getNetInfo - self.ipv4 = "" # getNetInfo - self.ipv6 = "" # getNetInfo + self.disks = "" # 64 + self.inodes = "" # 64 + self.iops = "" # 64 + self.raid = "" # empty + self.dh = "" # empty + self.nics = "" # 64, getNetInfo + self.ipv4 = "" # 64, getNetInfo + self.ipv6 = "" # 64, getNetInfo self.conn = "" # getNetInfo - self.temp = "" - self.serv = "" - self.cust = "" - self.rps1 = "" - self.rps2 = "" + self.temp = "" # empty + self.serv = "" # empty + self.cust = "" # empty + self.rps1 = "" # empty + self.rps2 = "" # empty self.logger = logger def getSysCtlAll(self): @@ -222,50 +244,50 @@ class Update: def toJsonString(self): """Return the object as a JSON string.""" retval = { - "version" : self.version , - "SID" : self.SID , - "agent" : self.agent , - "user" : self.user , - "os" : self.os , - "kernel" : self.kernel , - "hostname" : self.hostname , - "time" : self.time , - "reqreboot" : self.reqreboot , - "uptime" : self.uptime , - "cpumodel" : self.cpumodel , - "cpusockets" : self.cpusockets , - "cpucores" : self.cpucores , - "cputhreads" : self.cputhreads , - "cpuspeed" : self.cpuspeed , - "cpu" : self.cpu , - "wa" : self.wa , - "st" : self.st , - "us" : self.us , - "sy" : self.sy , - "load1" : self.load1 , - "load5" : self.load5 , - "load15" : self.load15 , - "ramsize" : self.ramsize , - "ram" : self.ram , - "ramswapsize" : self.ramswapsize, - "ramswap" : self.ramswap , - "rambuff" : self.rambuff , - "ramcache" : self.ramcache , - "disks" : self.disks , - "inodes" : self.inodes , - "iops" : self.iops , - "raid" : self.raid , - "dh" : self.dh , - "nics" : self.nics , - "ipv4" : self.ipv4 , - "ipv6" : self.ipv6 , - "conn" : self.conn , - "temp" : self.temp , - "serv" : self.serv , - "cust" : self.cust , - "rps1" : self.rps1 , - "rps2" : self.rps2 , - } + "version" : self.version , + "SID" : self.SID , + "agent" : self.agent , + "user" : self.user , + "os" : self.os , + "kernel" : self.kernel , + "hostname" : self.hostname , + "time" : self.time , + "reqreboot" : self.reqreboot , + "uptime" : self.uptime , + "cpumodel" : self.cpumodel , + "cpusockets" : self.cpusockets , + "cpucores" : self.cpucores , + "cputhreads" : self.cputhreads , + "cpuspeed" : self.cpuspeed , + "cpu" : self.cpu , + "wa" : self.wa , + "st" : self.st , + "us" : self.us , + "sy" : self.sy , + "load1" : self.load1 , + "load5" : self.load5 , + "load15" : self.load15 , + "ramsize" : self.ramsize , + "ram" : self.ram , + "ramswapsize" : self.ramswapsize, + "ramswap" : self.ramswap , + "rambuff" : self.rambuff , + "ramcache" : self.ramcache , + "disks" : self.disks , + "inodes" : self.inodes , + "iops" : self.iops , + "raid" : self.raid , + "dh" : self.dh , + "nics" : self.nics , + "ipv4" : self.ipv4 , + "ipv6" : self.ipv6 , + "conn" : self.conn , + "temp" : self.temp , + "serv" : self.serv , + "cust" : self.cust , + "rps1" : self.rps1 , + "rps2" : self.rps2 , + } return json.dumps(retval) # ---- Python API ----