From ac262cc98a5bb513d5e9f15fa346245409af28e0 Mon Sep 17 00:00:00 2001 From: jaydee Date: Tue, 18 Nov 2025 21:37:35 +0100 Subject: [PATCH] added v3 --- docker_backups.py | 9 ++++++++- omv_backup.py | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docker_backups.py b/docker_backups.py index 2acb92d..4373f25 100755 --- a/docker_backups.py +++ b/docker_backups.py @@ -4,7 +4,7 @@ import datetime import os import shutil now = datetime.datetime.now() -PASSWORD = "l4c1j4yd33Du5lo" +PASSWORD= "l4c1j4yd33Du5lo" DATETIME = now.strftime("%Y%m%d%H%M%S") os.chdir("/share/docker_data/__backups/") print("Backup gitlab") @@ -54,6 +54,13 @@ cmnd = f"zip -P {PASSWORD} zabbix_{DATETIME}.sql.zip zabbix_{DATETIME}.sql" status, output = subprocess.getstatusoutput(cmnd) os.remove(f"zabbix_{DATETIME}.sql") +print("Backup Influx") +cmnd = f"docker exec home-assistant-influxdb-1 influx backup /backup" +status, output = subprocess.getstatusoutput(cmnd) +cmnd = f"docker cp influxdb:/backup /tmp/backup" +status, output = subprocess.getstatusoutput(cmnd) +cmnd = f"zip -P {PASSWORD} influxdb_{DATETIME}.zip /tmp/backup" +status, output = subprocess.getstatusoutput(cmnd) print("Backup portainer") headers = { diff --git a/omv_backup.py b/omv_backup.py index 6296e41..ca59604 100755 --- a/omv_backup.py +++ b/omv_backup.py @@ -578,8 +578,11 @@ def backup_job(pl): break apps.remove(line[0]) sub_finished.append(line[0]) - msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"sub":line[0],"start_time":STARTTIME,"end_time":"in progress","progress":str(round(progress)) + "%","finished":",".join(finished),"sub_finished":",".join(sub_finished)} + # msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"sub":line[0],"start_time":STARTTIME,"end_time":"in progress","progress":str(round(progress)) + "%","finished":",".join(finished),"sub_finished":",".join(sub_finished)} + msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"sub":line[0],"start_time":STARTTIME,"end_time":"in progress","progress":str(round(progress)) + "%","finished":",".join(finished)} + logging.info(f"Sending message with topic {topic} {json.dumps(msg)}") + if not "gitea-runner" == line[0]: client2.publish(topic, json.dumps(msg),qos=0, retain=False) progress = progress + step