diff --git a/mqtt_srv.py b/mqtt_srv.py index 2b99a65..aeac332 100755 --- a/mqtt_srv.py +++ b/mqtt_srv.py @@ -1050,8 +1050,67 @@ else: if NEXT_CHECK < int(time.time()): NEXT_CHECK = int(time.time()) + 20 #writeLog("Blalala : Next : " + str(NEXT_CHECK)) - - if host.lower() == "rpi5" or host.lower() == "asus" or host.lower() == "morefine" or host.lower() == "ryzen" or host.lower() == "amd" or host.lower() == "rack": + if host.lower() == "rpi5": + #writeLog("Blalala : AAA") + print(psutil.sensors_temperatures()) + #print(psutil.sensors_fans()) + sences = psutil.sensors_temperatures() + print("SENCES") + print(sences) + print("#"*40) + try: + cpu_data = sences["cpu_thermal"][0] + except: + try: + cpu_data = sences["k10temp"][0] + except: + cpu_data = "None" + writeLog(cpu_data) + print("CPUDATA") + print(cpu_data) + print("#"*40) + print("MBDATA") + try: + mb_data = sences["acpitz"][0] + print(mb_data) + print(mb_data.current) + mb_data = mb_data.current + except: + mb_data = 0 + + + print("#"*40) + + + try: + print(psutil.sensors_fans()) + fan_data = psutil.sensors_fans()["asus"][0].current + except: + fan_data = "None" + mem_data = psutil.virtual_memory() + swap_data = psutil.swap_memory() + #cpu_usage = psutil.cpu_percent(interval=1) + load1, load5, load15 = psutil.getloadavg() + cpu_usage = round((load1/os.cpu_count()) * 100, 1) + + print(mem_data) + print(mem_data.percent) + print(psutil.disk_usage('/')) + #print(psutil.virtual_memory()) + #print(dict(psutil.virtual_memory()._asdict())) + #cmnd = "sensors -j|grep -v \"Can't read\"" + #status, output = subprocess.getstatusoutput(cmnd) + #print(output) + #print(type(output)) + #jn1 = json.loads(output) + + #print(str(jn1["coretemp-isa-0000"]["Package id 0"]["temp1_input"])) + #print(str(jn1["asus-isa-0000"]["cpu_fan"]["fan1_input"])) + #client.publish("sectorq/monitor/" + host.lower(), payload="{\"mb_temp\":0,\"mem_usage\":0,\"cpu_temp\":0,\"cpu_usage\":0,\"gpu_temp\":0,\"gpu_usage\":0}", qos=0, retain=False) + writeLog('{"status":"on", "version":"' + VERSION + '","TCPU":"NA", "MB_TEMP":' + str(mb_data) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":"' + str(fan_data) + '", "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}') + client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","TCPU":"NA", "MB_TEMP":' + str(mb_data) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":"' + str(fan_data) + '", "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False) + client.publish("sectorq/systems/" + host.lower() + "/stat", payload="on", qos=0, retain=True) + if host.lower() == "asus" or host.lower() == "morefine" or host.lower() == "ryzen" or host.lower() == "amd" or host.lower() == "rack": #writeLog("Blalala : AAA") print(psutil.sensors_temperatures()) #print(psutil.sensors_fans())