diff --git a/agent.py b/agent.py index e593907..0063b05 100644 --- a/agent.py +++ b/agent.py @@ -75,9 +75,9 @@ class SerialLineReceiver(SerialLineReceiverBase): def send_status(self): import psutil - disk_usage = {(disk.device.replace('/', '_')): - psutil.disk_usage(disk.mountpoint).percent - for disk in psutil.disk_partitions()} + disk_usage = dict((disk.device.replace('/', '_'), + psutil.disk_usage(disk.mountpoint).percent) + for disk in psutil.disk_partitions()) args = {"cpu": dict(psutil.cpu_times()._asdict()), "ram": dict(psutil.virtual_memory()._asdict()), "swap": dict(psutil.swap_memory()._asdict()), diff --git a/linux/_linuxcontext.py b/linux/_linuxcontext.py index 6577576..b46519c 100644 --- a/linux/_linuxcontext.py +++ b/linux/_linuxcontext.py @@ -39,6 +39,7 @@ mount_template_linux = ( distros = {'Scientific Linux': 'rhel', + 'Oracle Linux Server': 'rhel', 'CentOS': 'rhel', 'CentOS Linux': 'rhel', 'Debian': 'debian',