Skip to content

Commit 7f6492e

Browse files
authored
Include size storage when listing backup dirs (#509)
Use `du` rather than `ls` so that the size of the backup dirs are reported
1 parent c827824 commit 7f6492e

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

Ansible/roles/backup_lxc_containers/tasks/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
loop: "{{ (list_backup_dirs.files | sort(attribute='ctime'))[:-backup_retention] }}"
2929
when: list_backup_dirs.files | length > backup_retention
3030

31-
- name: "List backup directories"
31+
- name: "Get backup directories names and sizes"
3232
ansible.builtin.shell:
33-
cmd: ls -ltrh "{{ backup_base_dir }}"
34-
register: ls_backup_dirs
33+
cmd: du -hd1 "{{ backup_base_dir }}"
34+
register: size_backup_dirs
3535
changed_when: false
3636

3737
- name: "Show backup directories"
3838
ansible.builtin.debug:
39-
msg: "{{ ls_backup_dirs.stdout_lines }}"
40-
when: ls_backup_dirs.stdout_lines | length > 0
39+
msg: "{{ size_backup_dirs.stdout_lines }}"
40+
when: size_backup_dirs.stdout_lines | length > 0

Ansible/roles/backup_podman_containers_volumes/tasks/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
loop: "{{ (list_backup_dirs.files | sort(attribute='ctime'))[:-backup_retention] }}"
2929
when: list_backup_dirs.files | length > backup_retention
3030

31-
- name: "List backup directories"
31+
- name: "Get backup directories names and sizes"
3232
ansible.builtin.shell:
33-
cmd: ls -ltrh "{{ backup_base_dir }}"
34-
register: ls_backup_dirs
33+
cmd: du -hd1 "{{ backup_base_dir }}"
34+
register: size_backup_dirs
3535
changed_when: false
36-
36+
3737
- name: "Show backup directories"
3838
ansible.builtin.debug:
39-
msg: "{{ ls_backup_dirs.stdout_lines }}"
40-
when: ls_backup_dirs.stdout_lines | length > 0
39+
msg: "{{ size_backup_dirs.stdout_lines }}"
40+
when: size_backup_dirs.stdout_lines | length > 0

Ansible/roles/backup_qemu_vms/tasks/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
loop: "{{ (list_backup_dirs.files | sort(attribute='ctime'))[:-backup_retention] }}"
2929
when: list_backup_dirs.files | length > backup_retention
3030

31-
- name: "List backup directories"
31+
- name: "Get backup directories names and sizes"
3232
ansible.builtin.shell:
33-
cmd: ls -ltrh "{{ backup_base_dir }}"
34-
register: ls_backup_dirs
33+
cmd: du -hd1 "{{ backup_base_dir }}"
34+
register: size_backup_dirs
3535
changed_when: false
3636

3737
- name: "Show backup directories"
3838
ansible.builtin.debug:
39-
msg: "{{ ls_backup_dirs.stdout_lines }}"
40-
when: ls_backup_dirs.stdout_lines | length > 0
39+
msg: "{{ size_backup_dirs.stdout_lines }}"
40+
when: size_backup_dirs.stdout_lines | length > 0

Ansible/roles/core_system_backup/tasks/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
msg: "{{ core_system_backup.stdout_lines }}"
1313
when: core_system_backup.stdout_lines | length > 0
1414

15-
- name: "List Core System Backup archives"
15+
- name: "Get backup directories names and sizes"
1616
ansible.builtin.shell:
17-
cmd: ls -ltrh /backup/System_Backup
18-
register: core_system_backup_list_archives
17+
cmd: du -hd1 /backup/system/
18+
register: size_backup_dirs
1919
changed_when: false
2020

21-
- name: "Show Core System Backup archives list"
21+
- name: "Show backup directories"
2222
ansible.builtin.debug:
23-
msg: "{{ core_system_backup_list_archives.stdout_lines }}"
24-
when: core_system_backup_list_archives.stdout_lines | length > 0
23+
msg: "{{ size_backup_dirs.stdout_lines }}"
24+
when: size_backup_dirs.stdout_lines | length > 0

Ansible/roles/vps_system_backup/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
- name: "VPS System Backup"
55
ansible.builtin.shell:
6-
cmd: cd /opt/VPS_Backup && rsync -aAXHv --delete --exclude='/dev/*' --exclude='/proc/*' --exclude='/sys/*' --exclude='/tmp/*' --exclude='/run/*' --exclude='/mnt/*' --exclude='/media/*' --exclude='/lost+found/' --exclude='/swap/' --exclude='/var/cache/pacman/pkg/*' --exclude='/var/lib/archbuild/*' --exclude='/var/lib/aurbuild/*' --exclude='/var/lib/docker/*' --exclude='/opt/crystal/*' --exclude='/opt/VPS_Backup/*' / $(date +%d-%m-%Y) && tar -czvf $(date +%d-%m-%Y).tar.gz $(date +%d-%m-%Y) && gpg --symmetric --batch --passphrase-file .passwd --cipher-algo AES256 -c $(date +%d-%m-%Y).tar.gz && rm -rf $(date +%d-%m-%Y) $(date +%d-%m-%Y).tar.gz && ls -ltrh
6+
cmd: cd /opt/VPS_Backup && rsync -aAXHv --delete --exclude='/dev/*' --exclude='/proc/*' --exclude='/sys/*' --exclude='/tmp/*' --exclude='/run/*' --exclude='/mnt/*' --exclude='/media/*' --exclude='/lost+found/' --exclude='/swap/' --exclude='/var/cache/pacman/pkg/*' --exclude='/var/lib/archbuild/*' --exclude='/var/lib/aurbuild/*' --exclude='/var/lib/docker/*' --exclude='/opt/crystal/*' --exclude='/opt/VPS_Backup/*' / $(date +%d-%m-%Y) && tar -czvf $(date +%d-%m-%Y).tar.gz $(date +%d-%m-%Y) && gpg --symmetric --batch --passphrase-file .passwd --cipher-algo AES256 -c $(date +%d-%m-%Y).tar.gz && rm -rf $(date +%d-%m-%Y) $(date +%d-%m-%Y).tar.gz && du hd1 .
77
register: vps_system_backup
88
changed_when: true
99

@@ -49,7 +49,7 @@
4949

5050
- name: "Get backup archives in FileBrowser"
5151
ansible.builtin.shell:
52-
cmd: ls -ltrh /data/FileBrowser/data/VPS_Backup
52+
cmd: du -hd1 /data/FileBrowser/data/VPS_Backup
5353
register: list_backup_archives_filebrowser
5454
changed_when: false
5555
delegate_to: fsprd01.rc

0 commit comments

Comments
 (0)