Merge branch 'adguard' into 'master'

Adguard

See merge request kdam0/vps!3

2 files changed, 37 insertions, 9 deletions

diff --git a/roles/monitoring/tasks/node.yaml b/roles/monitoring/tasks/node.yaml
index 5d38f1f..632ceb8 100644
--- a/roles/monitoring/tasks/node.yaml
+++ b/roles/monitoring/tasks/node.yaml
@@ -21,3 +21,18 @@
         state: 'started'
         enabled: true
   when: 'ansible_os_family == "Alpine"'
+
+- block:
+    - name: 'Install node-exporter'
+      become: true
+      package:
+        name: 'prometheus-node-exporter'
+        state: 'present'
+
+    - name: 'Start and enable node-exporter service'
+      become: true
+      service:
+        name: 'prometheus-node-exporter'
+        state: 'started'
+        enabled: true
+  when: 'ansible_os_family == "Debian"'
diff --git a/roles/monitoring/tasks/zfs.yaml b/roles/monitoring/tasks/zfs.yaml
index 2f18e32..a30a7ac 100644
--- a/roles/monitoring/tasks/zfs.yaml
+++ b/roles/monitoring/tasks/zfs.yaml
@@ -17,13 +17,13 @@
     mode: '755'
 
 - name: 'Extract ZFS exporter to dir'
-  command: 'tar -xf zfs_exporter-2.2.5.linux-arm64.tar.gz'
+  command: 'tar -xf zfs_exporter.tar.gz'
   args:
     chdir: '{{ monitoring_root_dir }}'
 
 - name: 'Copy the executable to /usr/bin'
   become: true
-  become_method: 'doas'
+  # become_method: 'doas'
   copy:
     src: '{{ monitoring_root_dir }}/zfs_exporter-2.2.5.linux-arm64/zfs_exporter'
     dest: '/usr/bin/zfs_exporter'
@@ -31,18 +31,31 @@
     owner: 'root'
     remote_src: true
 
-- name: 'Create service file to start zfs_exporter on boot'
+# - name: 'Create service file to start zfs_exporter on boot'
+#   become: true
+#   # become_method: 'doas'
+#   copy:
+#     src: 'zfs-exporter'
+#     dest: '/etc/init.d/zfs-exporter'
+#     mode: '0755'
+#     owner: 'root'
+#
+- name: 'Create systemd services'
   become: true
-  become_method: 'doas'
   copy:
-    src: 'zfs-exporter'
-    dest: '/etc/init.d/zfs-exporter'
-    mode: '0755'
-    owner: 'root'
+    src: 'zfs-exporter.service'
+    dest: '/etc/systemd/system/zfs-exporter.service'
+    mode: '644'
+  # notify:
+  #   - 'zfs-exporter restart'
+
+- name: 'Reload systemd units'
+  become: true
+  systemd:
+    daemon_reload: true
 
 - name: 'Start and enable the zfs-exporter service'
   become: true
-  become_method: 'doas'
   service:
     name: 'zfs-exporter'
     state: 'started'