From 59b2ea4a7a08448bea7799615d75b91e61ffc92e Mon Sep 17 00:00:00 2001 From: Sheppy Date: Fri, 9 Jun 2023 13:17:37 +0000 Subject: [PATCH] add: new storrage exports for carddav --- roles/backup-vm/files/ths_cal_backup.sh | 11 +++++++++++ roles/monitoring-client/tasks/main.yaml | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/roles/backup-vm/files/ths_cal_backup.sh b/roles/backup-vm/files/ths_cal_backup.sh index b4d48b2..b3b2e67 100644 --- a/roles/backup-vm/files/ths_cal_backup.sh +++ b/roles/backup-vm/files/ths_cal_backup.sh @@ -4,12 +4,23 @@ set -e cd BACKUP_NAME=backup_$(date +%Y%m%d).zip mkdir -p ~/ths_caldav_backups/ +mkdir -p ~/ths_carddav_backups/ +mkdir -p ~/ths_carddav_telefon_backups/ + vdirsyncer -c vsyncdir.conf sync + zip -q -r ~/ths_caldav_backups/${BACKUP_NAME} ~/ths-caldav +zip -q -r ~/ths_carddav_backups/${BACKUP_NAME} ~/ths-carddav +zip -q -r ~/ths_carddav_telefon_backups/${BACKUP_NAME} ~/ths-carddav-telefon + ~/backups/backup-tools/backup_manager.py ~/ths_caldav_backups/ --debug +~/backups/backup-tools/backup_manager.py ~/ths_carddav_backups/ --debug +~/backups/backup-tools/backup_manager.py ~/ths_carddav_telefon_backups/ --debug # send to storrage box rsync --delete --rsh="/usr/bin/sshpass -p HISTORY_PURGED_SECRET ssh -p23" -r ths_caldav_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/ +rsync --delete --rsh="/usr/bin/sshpass -p HISTORY_PURGED_SECRET ssh -p23" -r ths_carddav_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/carddav/ +rsync --delete --rsh="/usr/bin/sshpass -p HISTORY_PURGED_SECRET ssh -p23" -r ths_carddav_telefon_backups/* u244665-sub2@u244665.your-storagebox.de:./ths_caldav_backups/carddav_telefon/ curl -H "Content-Type: application/json" \ -X POST https://async-icinga.atlantishq.de/ \ diff --git a/roles/monitoring-client/tasks/main.yaml b/roles/monitoring-client/tasks/main.yaml index eae8af7..69b7760 100644 --- a/roles/monitoring-client/tasks/main.yaml +++ b/roles/monitoring-client/tasks/main.yaml @@ -72,3 +72,10 @@ cron: name: "monitoring" job: "/etc/monitoring/monitoring-report.py -c /etc/monitoring.conf --nsca-bin /bin/send_nsca --nsca-config /etc/send_nsca.cfg" + +- name: Install Prometheus Node Exporter + become: yes + import_role: + name: prometheus.prometheus.node_exporter + vars: + node_exporter_web_telemetry_path: "/node-exporter"