diff --git a/homeassistant/components/webmin/manifest.json b/homeassistant/components/webmin/manifest.json index a15ca0a1f0d..12a03830cb8 100644 --- a/homeassistant/components/webmin/manifest.json +++ b/homeassistant/components/webmin/manifest.json @@ -7,5 +7,5 @@ "integration_type": "device", "iot_class": "local_polling", "loggers": ["webmin"], - "requirements": ["webmin-xmlrpc==0.0.1"] + "requirements": ["webmin-xmlrpc==0.0.2"] } diff --git a/requirements_all.txt b/requirements_all.txt index 3616d5d050d..06b99ce0c64 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2836,7 +2836,7 @@ waterfurnace==1.1.0 weatherflow4py==0.1.14 # homeassistant.components.webmin -webmin-xmlrpc==0.0.1 +webmin-xmlrpc==0.0.2 # homeassistant.components.assist_pipeline webrtc-noise-gain==1.2.3 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index d232d3fdc6b..95b8400d877 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -2177,7 +2177,7 @@ watchdog==2.3.1 weatherflow4py==0.1.14 # homeassistant.components.webmin -webmin-xmlrpc==0.0.1 +webmin-xmlrpc==0.0.2 # homeassistant.components.assist_pipeline webrtc-noise-gain==1.2.3 diff --git a/tests/components/webmin/fixtures/webmin_update.json b/tests/components/webmin/fixtures/webmin_update.json index c74346a925f..7ec77978a93 100644 --- a/tests/components/webmin/fixtures/webmin_update.json +++ b/tests/components/webmin/fixtures/webmin_update.json @@ -1,97 +1,135 @@ { - "load_1m": 0.98, - "load_5m": 1.02, - "load_15m": 1.0, - "mem_total": 32767008, - "mem_free": 26162544, - "swap_total": 1953088, - "swap_free": 1953088, - "total_space": 18104905818112, - "free_space": 8641328926720, - "fs": [ + "disk_total": 18104905818112, + "io": [0, 4], + "load": [ + 1.29, + 1.36, + 1.37, + 3589, + "Intel(R) Core(TM) i7-5820K CPU @ 3.30GHz", + "GenuineIntel", + 15728640, + 12 + ], + "disk_free": 7749321486336, + "kernel": { "os": "Linux", "arch": "x86_64", "version": "6.6.18-1-lts" }, + "disk_fs": [ { - "free": 174511820800, - "dir": "/", - "iused": 391146, - "used": 61225123840, - "type": "ext4", "device": "UUID=00000000-80b6-0000-8a06-000000000000", - "iused_percent": 3, - "used_percent": 26, + "dir": "/", + "ifree": 14927206, "total": 248431161344, + "used_percent": 80, + "type": "ext4", "itotal": 15482880, - "ifree": 15091734 + "iused": 555674, + "free": 49060442112, + "used": 186676502528, + "iused_percent": 4 }, { - "iused": 8877, - "used": 4608079593472, - "type": "ext4", - "dir": "/media/disk1", - "free": 1044483624960, - "used_percent": 82, - "ifree": 183131475, - "itotal": 183140352, - "total": 5952635744256, - "device": "UUID=00000000-2bb2-0000-896c-000000000000", - "iused_percent": 1 - }, - { - "used": 3881508986880, - "type": "ext4", - "iused": 3411401, - "dir": "/media/disk2", - "free": 7422333480960, - "used_percent": 35, "total": 11903838912512, + "used_percent": 38, + "iused": 3542318, + "type": "ext4", "itotal": 366198784, - "ifree": 362787383, "device": "/dev/md127", + "ifree": 362656466, + "dir": "/media/disk2", + "iused_percent": 1, + "free": 7028764823552, + "used": 4275077644288 + }, + { + "dir": "/media/disk1", + "ifree": 183130757, + "device": "UUID=00000000-2bb2-0000-896c-000000000000", + "type": "ext4", + "itotal": 183140352, + "iused": 9595, + "used_percent": 89, + "total": 5952635744256, + "used": 4981066997760, + "free": 671496220672, "iused_percent": 1 } ], - "used_space": 8550813704192, - "uptime": { "days": 3, "minutes": 23, "seconds": 12 }, + "drivetemps": [ + { "temp": 49, "device": "/dev/sda", "failed": "", "errors": "" }, + { "failed": "", "errors": "", "device": "/dev/sdb", "temp": 49 }, + { "device": "/dev/sdc", "temp": 51, "failed": "", "errors": "" }, + { "failed": "", "errors": "", "device": "/dev/sdd", "temp": 51 }, + { "errors": "", "failed": "", "temp": 43, "device": "/dev/sde" }, + { "device": "/dev/sdf", "temp": 40, "errors": "", "failed": "" } + ], + "mem": [32766344, 28530480, 1953088, 1944384, 27845756, ""], + "disk_used": 9442821144576, + "cputemps": [ + { "temp": 51, "core": 0 }, + { "temp": 49, "core": 1 }, + { "core": 2, "temp": 59 }, + { "temp": 51, "core": 3 }, + { "temp": 50, "core": 4 }, + { "temp": 49, "core": 5 } + ], + "procs": 310, + "cpu": [0, 8, 92, 0, 0], + "cpufans": [ + { "rpm": 0, "fan": 1 }, + { "fan": 2, "rpm": 1371 }, + { "rpm": 0, "fan": 3 }, + { "rpm": 927, "fan": 4 }, + { "rpm": 801, "fan": 5 } + ], + "load_1m": 1.29, + "load_5m": 1.36, + "load_15m": 1.37, + "mem_total": 32766344, + "mem_free": 28530480, + "swap_total": 1953088, + "swap_free": 1944384, + "uptime": { "days": 11, "minutes": 1, "seconds": 28 }, "active_interfaces": [ { - "fullname": "lo", + "scope6": ["host"], + "address": "127.0.0.1", + "address6": ["::1"], + "name": "lo", + "broadcast": 0, "up": 1, "index": 0, - "scope6": ["host"], - "netmask": "255.0.0.0", + "fullname": "lo", "netmask6": [128], - "edit": 1, - "broadcast": 0, + "netmask": "255.0.0.0", "mtu": 65536, - "name": "lo", - "address": "127.0.0.1", - "address6": ["::1"] + "edit": 1 }, { - "mtu": 1500, - "fullname": "enp6s0", + "scope6": [], + "address6": [], + "name": "enp6s0", "up": 1, "index": 1, - "ether": "12:34:56:78:9a:bc", - "address6": [], "netmask6": [], + "fullname": "enp6s0", + "mtu": 1500, "edit": 1, - "scope6": [], - "name": "enp6s0" + "ether": "12:34:56:78:9a:bc" }, { + "ether": "12:34:56:78:9a:bd", "edit": 1, - "netmask6": [64], "netmask": "255.255.255.0", - "scope6": ["link"], - "up": 1, - "index": 2, + "netmask6": [64], "fullname": "eno1", - "address6": ["fe80::2:3:4"], - "address": "192.168.1.4", - "name": "eno1", "mtu": 1500, + "index": 2, "broadcast": "192.168.1.255", - "ether": "12:34:56:78:9a:bd" + "up": 1, + "address6": ["fe80::2:3:4"], + "scope6": ["link"], + "name": "eno1", + "address": "192.168.1.4" } ] } diff --git a/tests/components/webmin/snapshots/test_diagnostics.ambr b/tests/components/webmin/snapshots/test_diagnostics.ambr index f227f6332fe..9c666938f56 100644 --- a/tests/components/webmin/snapshots/test_diagnostics.ambr +++ b/tests/components/webmin/snapshots/test_diagnostics.ambr @@ -55,62 +55,183 @@ 'up': 1, }), ]), - 'free_space': 8641328926720, - 'fs': list([ + 'cpu': list([ + 0, + 8, + 92, + 0, + 0, + ]), + 'cpufans': list([ + dict({ + 'fan': 1, + 'rpm': 0, + }), + dict({ + 'fan': 2, + 'rpm': 1371, + }), + dict({ + 'fan': 3, + 'rpm': 0, + }), + dict({ + 'fan': 4, + 'rpm': 927, + }), + dict({ + 'fan': 5, + 'rpm': 801, + }), + ]), + 'cputemps': list([ + dict({ + 'core': 0, + 'temp': 51, + }), + dict({ + 'core': 1, + 'temp': 49, + }), + dict({ + 'core': 2, + 'temp': 59, + }), + dict({ + 'core': 3, + 'temp': 51, + }), + dict({ + 'core': 4, + 'temp': 50, + }), + dict({ + 'core': 5, + 'temp': 49, + }), + ]), + 'disk_free': 7749321486336, + 'disk_fs': list([ dict({ 'device': '**REDACTED**', 'dir': '**REDACTED**', - 'free': 174511820800, - 'ifree': 15091734, + 'free': 49060442112, + 'ifree': 14927206, 'itotal': 15482880, - 'iused': 391146, - 'iused_percent': 3, + 'iused': 555674, + 'iused_percent': 4, 'total': 248431161344, 'type': 'ext4', - 'used': 61225123840, - 'used_percent': 26, + 'used': 186676502528, + 'used_percent': 80, }), dict({ 'device': '**REDACTED**', 'dir': '**REDACTED**', - 'free': 1044483624960, - 'ifree': 183131475, - 'itotal': 183140352, - 'iused': 8877, - 'iused_percent': 1, - 'total': 5952635744256, - 'type': 'ext4', - 'used': 4608079593472, - 'used_percent': 82, - }), - dict({ - 'device': '**REDACTED**', - 'dir': '**REDACTED**', - 'free': 7422333480960, - 'ifree': 362787383, + 'free': 7028764823552, + 'ifree': 362656466, 'itotal': 366198784, - 'iused': 3411401, + 'iused': 3542318, 'iused_percent': 1, 'total': 11903838912512, 'type': 'ext4', - 'used': 3881508986880, - 'used_percent': 35, + 'used': 4275077644288, + 'used_percent': 38, + }), + dict({ + 'device': '**REDACTED**', + 'dir': '**REDACTED**', + 'free': 671496220672, + 'ifree': 183130757, + 'itotal': 183140352, + 'iused': 9595, + 'iused_percent': 1, + 'total': 5952635744256, + 'type': 'ext4', + 'used': 4981066997760, + 'used_percent': 89, }), ]), - 'load_15m': 1.0, - 'load_1m': 0.98, - 'load_5m': 1.02, - 'mem_free': 26162544, - 'mem_total': 32767008, - 'swap_free': 1953088, - 'swap_total': 1953088, - 'total_space': 18104905818112, - 'uptime': dict({ - 'days': 3, - 'minutes': 23, - 'seconds': 12, + 'disk_total': 18104905818112, + 'disk_used': 9442821144576, + 'drivetemps': list([ + dict({ + 'device': '**REDACTED**', + 'errors': '', + 'failed': '', + 'temp': 49, + }), + dict({ + 'device': '**REDACTED**', + 'errors': '', + 'failed': '', + 'temp': 49, + }), + dict({ + 'device': '**REDACTED**', + 'errors': '', + 'failed': '', + 'temp': 51, + }), + dict({ + 'device': '**REDACTED**', + 'errors': '', + 'failed': '', + 'temp': 51, + }), + dict({ + 'device': '**REDACTED**', + 'errors': '', + 'failed': '', + 'temp': 43, + }), + dict({ + 'device': '**REDACTED**', + 'errors': '', + 'failed': '', + 'temp': 40, + }), + ]), + 'io': list([ + 0, + 4, + ]), + 'kernel': dict({ + 'arch': 'x86_64', + 'os': 'Linux', + 'version': '6.6.18-1-lts', + }), + 'load': list([ + 1.29, + 1.36, + 1.37, + 3589, + 'Intel(R) Core(TM) i7-5820K CPU @ 3.30GHz', + 'GenuineIntel', + 15728640, + 12, + ]), + 'load_15m': 1.37, + 'load_1m': 1.29, + 'load_5m': 1.36, + 'mem': list([ + 32766344, + 28530480, + 1953088, + 1944384, + 27845756, + '', + ]), + 'mem_free': 28530480, + 'mem_total': 32766344, + 'procs': 310, + 'swap_free': 1944384, + 'swap_total': 1953088, + 'uptime': dict({ + 'days': 11, + 'minutes': 1, + 'seconds': 28, }), - 'used_space': 8550813704192, }), 'entry': dict({ 'data': dict({ diff --git a/tests/components/webmin/snapshots/test_sensor.ambr b/tests/components/webmin/snapshots/test_sensor.ambr index 285bcdf1f9b..93f8bcc3709 100644 --- a/tests/components/webmin/snapshots/test_sensor.ambr +++ b/tests/components/webmin/snapshots/test_sensor.ambr @@ -44,7 +44,7 @@ 'entity_id': 'sensor.192_168_1_1_load_15m', 'last_changed': , 'last_updated': , - 'state': '1.0', + 'state': '1.37', }) # --- # name: test_sensor[sensor.192_168_1_1_load_1m-entry] @@ -92,7 +92,7 @@ 'entity_id': 'sensor.192_168_1_1_load_1m', 'last_changed': , 'last_updated': , - 'state': '0.98', + 'state': '1.29', }) # --- # name: test_sensor[sensor.192_168_1_1_load_5m-entry] @@ -140,7 +140,7 @@ 'entity_id': 'sensor.192_168_1_1_load_5m', 'last_changed': , 'last_updated': , - 'state': '1.02', + 'state': '1.36', }) # --- # name: test_sensor[sensor.192_168_1_1_memory_free-entry] @@ -196,7 +196,7 @@ 'entity_id': 'sensor.192_168_1_1_memory_free', 'last_changed': , 'last_updated': , - 'state': '24.9505462646484', + 'state': '27.2087860107422', }) # --- # name: test_sensor[sensor.192_168_1_1_memory_total-entry] @@ -252,7 +252,7 @@ 'entity_id': 'sensor.192_168_1_1_memory_total', 'last_changed': , 'last_updated': , - 'state': '31.2490539550781', + 'state': '31.248420715332', }) # --- # name: test_sensor[sensor.192_168_1_1_swap_free-entry] @@ -308,7 +308,7 @@ 'entity_id': 'sensor.192_168_1_1_swap_free', 'last_changed': , 'last_updated': , - 'state': '1.86260986328125', + 'state': '1.85430908203125', }) # --- # name: test_sensor[sensor.192_168_1_1_swap_total-entry]