jaydee/mqtt_srv
1
0
Fork 0
mirror of https://gitlab.sectorq.eu/jaydee/mqtt_srv.git synced 2025-12-14 02:34:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

upt playbook

Browse Source
This commit is contained in:
jaydee
2023-09-24 19:39:34 +02:00
parent 9aa3a3f347
commit 2b68910618
1 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
mqtt_srv.py
View File

@@ -330,6 +330,8 @@ elif host == "SERVER":
mac = str(get_mac_address("enp2s0")) mac = str(get_mac_address("enp2s0"))
elif host == "ASUS" and curos != "Windows": elif host == "ASUS" and curos != "Windows":
mac = str(get_mac_address("enp3s0f1")) mac = str(get_mac_address("enp3s0f1"))
elif host == "morefine" and curos != "Windows":
mac = str(get_mac_address("eno1"))
else: else:
mac = str(get_mac_address("Ethernet")) mac = str(get_mac_address("Ethernet"))
@@ -787,37 +789,43 @@ def on_message(client, userdata, msg):
mon3 = "DVI-I-2-1" mon3 = "DVI-I-2-1"
mon4 = "eDP-1-1" mon4 = "eDP-1-1"
''' '''
mon1 = "HDMI-1" left = ["HDMI-A-0", "1920x1080"]
mon2 = "HDMI-2" mid = ["DisplayPort-0", "2560x1440"]
mon3 = "DVI-I-2-1" right = ["DisplayPort-1", "3440x1440"]
mon4 = "eDP-1"
if myObj["target"] == "mid": if myObj["target"] == "mid":
myCmd = "xrandr --output " + mon2 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --off --output " +mon1 + " --off --output " + mon4 + " --off" myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --off"
elif myObj["target"] == "left": elif myObj["target"] == "left":
myCmd = "xrandr --output " + mon1 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --off --output " +mon2 + " --off --output " + mon4 + " --off" myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {right[0]} --off --output {mid[0]} --off"
elif myObj["target"] == "midleftright":
myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "midright":
myCmd = f"xrandr --output {right[0]} --primary --auto --mode {right[1]} --output {mid[0]} --auto --left-of {right[0]} --mode {mid[1]} --output {left[0]} --off"
elif myObj["target"] == "right":
myCmd = f"xrandr --output {right[0]} --primary --auto --mode {right[1]} --output {mid[0]} --off --output {left[0]} --off"
elif myObj["target"] == "all": elif myObj["target"] == "all":
myCmd = "xrandr --output " + mon2 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --auto --right-of " + mon2 + " --mode 1920x1080 --output " + mon1 + " --auto --left-of " + mon2 + " --mode 1920x1080 --output " + mon4 + " --auto --right-of " + mon2 + " --mode 1920x1080" myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "midleft": elif myObj["target"] == "midleft":
myCmd = "xrandr --output " + mon2 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --off --output " + mon1 + " --auto --left-of " + mon2 + " --mode 1920x1080 --output " + mon4 + " --off" myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "midtop": elif myObj["target"] == "midtop":
myCmd = "xrandr --output " + mon2 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --auto --right-of " + mon2 + " --mode 1920x1080 --output " + mon1 + " --off --output " + mon4 + " --off" myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --off"
elif myObj["target"] == "midleftbuild": elif myObj["target"] == "midleftbuild":
myCmd = "xrandr --output " + mon2 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --off --output " + mon1 + " --auto --left-of " + mon2 + " --mode 1920x1080 --output " + mon4 + " --auto --right-of " + mon2 + " --mode 1920x1080" myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "midbuild": elif myObj["target"] == "midbuild":
myCmd = "xrandr --output " + mon2 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --off --output " + mon1 + " --off --output " + mon4 + " --auto --right-of " + mon2 + " --mode 1920x1080" myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --off"
elif myObj["target"] == "midlefttop": elif myObj["target"] == "midlefttop":
myCmd = "xrandr --output " + mon2 + " --primary --auto --mode 1920x1080 --output " + mon3 + " --auto --right-of " + mon2 + " --mode 1920x1080 --output " + mon1 + " --auto --left-of " + mon2 + " --mode 1920x1080 --output " + mon4 + " --off" myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "build": elif myObj["target"] == "build":
myCmd = "xrandr --output " + mon2 + " --off --output " + mon3 + " --off --output " + mon1 + " --off --output " + mon4 + " --auto --mode 1920x1080" myCmd = f"xrandr --output {mid[0]} --off --output {right[0]} --off --output {left[0]} --off"
else: else:
pass pass
writeLog(myCmd) writeLog(myCmd)
if myCmd != "": if myCmd != "":
print(myCmd) print(myCmd)
writeLog("Executing") writeLog("Executing : {myCmd}")
#subprocess.Popen(myCmd.split()) #subprocess.Popen(myCmd.split())
status, output = subprocess.getstatusoutput(myCmd) status, output = subprocess.getstatusoutput(myCmd)
writeLog(output) writeLog(output)
@@ -1050,13 +1058,36 @@ else:
NEXT_CHECK = int(time.time()) + 20 NEXT_CHECK = int(time.time()) + 20
writeLog("Blalala : Next : " + str(NEXT_CHECK)) writeLog("Blalala : Next : " + str(NEXT_CHECK))
if host.lower() == "asus": if host.lower() == "asus" or host.lower() == "morefine":
print(psutil.sensors_temperatures()) print(psutil.sensors_temperatures())
#print(psutil.sensors_fans()) #print(psutil.sensors_fans())
sences = psutil.sensors_temperatures() sences = psutil.sensors_temperatures()
cpu_data = sences["coretemp"][0] print("SENCES")
print(sences)
print("#"*40)
try:
cpu_data = sences["coretemp"][0]
except:
try:
cpu_data = sences["k10temp"][0]
except:
cpu_data = "None"
print("CPUDATA")
print(cpu_data)
print("#"*40)
mb_data = sences["acpitz"][0] mb_data = sences["acpitz"][0]
fan_data = psutil.sensors_fans()["asus"][0] print("MBDATA")
print(mb_data)
print(mb_data.current)
print("#"*40)
try:
fan_data = psutil.sensors_fans()["asus"][0].current
except:
fan_data = "None"
mem_data = psutil.virtual_memory() mem_data = psutil.virtual_memory()
swap_data = psutil.swap_memory() swap_data = psutil.swap_memory()
#cpu_usage = psutil.cpu_percent(interval=1) #cpu_usage = psutil.cpu_percent(interval=1)
@@ -1077,7 +1108,7 @@ else:
#print(str(jn1["coretemp-isa-0000"]["Package id 0"]["temp1_input"])) #print(str(jn1["coretemp-isa-0000"]["Package id 0"]["temp1_input"]))
#print(str(jn1["asus-isa-0000"]["cpu_fan"]["fan1_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) #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)
client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":' + str(fan_data.current) + ', "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False) client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "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) client.publish("sectorq/systems/" + host.lower() + "/stat", payload="on", qos=0, retain=True)
elif host.lower() == "openmediavault" or host.lower() == "omv": elif host.lower() == "openmediavault" or host.lower() == "omv":
#print(psutil.sensors_temperatures()) #print(psutil.sensors_temperatures())