spark-store-project/ServerStatus
14
0
Fork 0
mirror of https://github.com//cppla/ServerStatus synced 2025-07-23 19:52:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

beta macos disk info

Browse Source
This commit is contained in:
cppla 2022-11-03 16:25:23 +08:00
parent 34b1bca5b1
commit 9f60b7962b
1 changed files with 17 additions and 12 deletions

29
clients/client-psutil.py

@ -46,18 +46,23 @@ def get_swap():
return int(Mem.total/1024.0), int(Mem.used/1024.0) return int(Mem.total/1024.0), int(Mem.used/1024.0)
def get_hdd(): def get_hdd():
valid_fs = [ "ext4", "ext3", "ext2", "reiserfs", "jfs", "btrfs", "fuseblk", "zfs", "simfs", "ntfs", "fat32", "exfat", "xfs" ] # todo, 兼容macos ,beta
disks = dict() if "darwin" in sys.platform:
size = 0 return int(psutil.disk_usage("/").total/1024.0/1024.0), int(psutil.disk_usage("/").used/1024.0/1024.0)
used = 0 else:
for disk in psutil.disk_partitions(): valid_fs = ["ext4", "ext3", "ext2", "reiserfs", "jfs", "btrfs", "fuseblk", "zfs", "simfs", "ntfs", "fat32",
if not disk.device in disks and disk.fstype.lower() in valid_fs: "exfat", "xfs"]
disks[disk.device] = disk.mountpoint disks = dict()
for disk in disks.values(): size = 0
usage = psutil.disk_usage(disk) used = 0
size += usage.total for disk in psutil.disk_partitions():
used += usage.used if not disk.device in disks and disk.fstype.lower() in valid_fs:
return int(size/1024.0/1024.0), int(used/1024.0/1024.0) disks[disk.device] = disk.mountpoint
for disk in disks.values():
usage = psutil.disk_usage(disk)
size += usage.total
used += usage.used
return int(size/1024.0/1024.0), int(used/1024.0/1024.0)
def get_cpu(): def get_cpu():
return psutil.cpu_percent(interval=INTERVAL) return psutil.cpu_percent(interval=INTERVAL)