Clean up variable organization (wip), better backup/node_exporter for mii, aya01, pi

Signed-off-by: TuDatTr <tuan-dat.tran@tudattr.dev>

roles/backblaze/tasks/backup.yml

@@ -1,17 +1,18 @@
 ---
 - name: Shut down docker
-  shell:
-    cmd: "docker compose down --remove-orphans"
-    chdir: "{{ docker_compose_dir }}"
+  systemd:
+    name: docker
+    state: stopped
+  become: true
 
 - name: Backing up for "{{ inventory_hostname }}"
   shell:
-    cmd: "rclone sync {{ item.1 }} secret:{{ item.1 }}"
-  when: item.0.key == inventory_hostname
-  loop: "{{ backblaze_paths | dict2items | subelements('value') }}"
+    cmd: "rclone sync {{ item }} secret:{{ item }} --transfers 16"
+  loop: "{{ host.backblaze.paths }}"
   become: true
 
 - name: Restart docker
-  shell:
-    cmd: "docker compose up -d"
-    chdir: "{{ docker_compose_dir }}"
+  systemd:
+    name: docker
+    state: started
+  become: true

roles/backblaze/tasks/config.yml

@@ -1,5 +1,5 @@
 ---
-- name: Create rclone config folder at "{{ rclone_config }}"
+- name: Create rclone config folder
   file:
     path: "{{ rclone_config }}"
     owner: '0'
@@ -8,9 +8,9 @@
     state: directory
   become: true
 
-- name: Copy "templates/{{ inventory_hostname }}/rclone.conf" config to "{{ inventory_hostname }}":"{{ rclone_config }}/rclone.conf"
+- name: Copy "rclone.conf"
   template:
-    src: "templates/{{ inventory_hostname }}/rclone.conf"
+    src: "rclone.conf.j2"
     dest: "{{ rclone_config }}/rclone.conf"
     owner: '0'
     group: '0'

roles/backblaze/tasks/main.yml

@@ -3,5 +3,3 @@
 - include_tasks: install.yml
 - include_tasks: config.yml
 - include_tasks: backup.yml
-  tags:
-    - backup

roles/backblaze/templates/aya01/rclone.conf

@@ -1,10 +0,0 @@
-[remote]
-type = b2
-account = {{ vault_backblaze_aya01_account }}
-key = {{ vault_backblaze_aya01_key }}
-
-[secret]
-type = crypt
-remote = remote:aya01-tudattr-dev
-password = {{ vault_rclone_aya01_password }}
-password2 = {{ vault_rclone_aya01_password2 }}

roles/backblaze/templates/pi/rclone.conf

@@ -1,10 +0,0 @@
-[remote]
-type = b2
-account = {{ vault_backblaze_pi_account }}
-key = {{ vault_backblaze_pi_key }}
-
-[secret]
-type = crypt
-remote = remote:pi-tudattr-dev
-password = {{ vault_rclone_pi_password }}
-password2 = {{ vault_rclone_pi_password2 }}

roles/backblaze/templates/rclone.conf.j2

@@ -0,0 +1,10 @@
+[remote]
+type = b2
+account = {{ host.backblaze.account }}
+key = {{ host.backblaze.key }}
+
+[secret]
+type = crypt
+remote = {{ host.backblaze.remote }}
+password = {{ host.backblaze.password }}
+password2 = {{ host.backblaze.password2 }}

roles/docker/templates/aya01/prometheus/prometheus.yml.j2

@@ -16,13 +16,15 @@ rule_files:
   # - "second_rules.yml"
 
 scrape_configs:
-  - job_name: 'node'
+  - job_name: 'aya01'
     scrape_interval: 10s
     scrape_timeout: 10s
     tls_config:
       insecure_skip_verify: true
     static_configs:
     - targets: ['{{ aya01_ip }}:{{node_exporter_port}}']
+    - targets: ['{{ mii_ip }}:{{node_exporter_port}}']
+    - targets: ['{{ pi_ip }}:{{node_exporter_port}}']
   - job_name: Mikrotik
     static_configs:
       - targets:

roles/node_exporter/templates/node_exporter.service.j2

@@ -4,7 +4,7 @@ Description=NodeExporter
 [Service]
 TimeoutStartSec=0
 User=node_exporter
-ExecStart={{ node_exporter_bin_path }} --web.listen-address={{ aya01_ip }}:{{ node_exporter_port }} {{ node_exporter_options }}
+ExecStart={{ node_exporter_bin_path }} --web.listen-address={{ host.ip }}:{{ node_exporter_port }} {{ node_exporter_options }}
 
 [Install]
 WantedBy=multi-user.target