diff --git a/roles/prometheus_node/tasks/collectors.yml b/roles/prometheus_node/tasks/collectors.yml index 19dfd56..5016c14 100644 --- a/roles/prometheus_node/tasks/collectors.yml +++ b/roles/prometheus_node/tasks/collectors.yml @@ -4,8 +4,8 @@ ansible.builtin.template: src: "{{ basename }}.j2" dest: "/usr/local/bin/{{ basename }}" - owner: root - group: prometheus + owner: "{{ prometheus_node_root_user }}" + group: "{{ prometheus_node_group }}" mode: 0750 vars: basename: "{{ item.value.template_base_name | default('prometheus-node-exporter-' + item.key + '.sh') }}" @@ -15,8 +15,8 @@ ansible.builtin.copy: content: "{{ item.value.config.content }}" dest: "{{ item.value.config.filename }}" - owner: root - group: prometheus + owner: "{{ prometheus_node_root_user }}" + group: "{{ prometheus_node_group }}" mode: 0640 when: "'config' in item.value" loop: "{{ prometheus_textfile_collectors | dict2items }}" @@ -25,8 +25,8 @@ ansible.builtin.template: src: "etc/systemd/system/prometheus-collector.service.j2" dest: "/etc/systemd/system/prometheus-node-exporter-{{ item.key }}.service" - owner: root - group: root + owner: "{{ prometheus_node_root_user }}" + group: "{{ prometheus_node_root_group }}" mode: 0644 vars: basename: "{{ item.value.template_base_name | default('prometheus-node-exporter-' + item.key + '.sh') }}" @@ -39,8 +39,8 @@ ansible.builtin.template: src: "etc/systemd/system/prometheus-collector.timer.j2" dest: "/etc/systemd/system/prometheus-node-exporter-{{ item.key }}.timer" - owner: root - group: root + owner: "{{ prometheus_node_root_user }}" + group: "{{ prometheus_node_root_group }}" mode: 0644 loop: "{{ prometheus_textfile_collectors | dict2items }}" notify: @@ -59,8 +59,8 @@ ansible.builtin.template: src: "etc/cron.d/prometheus-node-exporter.j2" dest: "{{ prometheus_node_crontab }}" - owner: root - group: root + owner: "{{ prometheus_node_root_user }}" + group: "{{ prometheus_node_root_group }}" mode: 0644 vars: collectors: "{{ prometheus_textfile_collectors }}" diff --git a/roles/prometheus_node/tasks/config.yml b/roles/prometheus_node/tasks/config.yml index a446b1e..bcde4cc 100644 --- a/roles/prometheus_node/tasks/config.yml +++ b/roles/prometheus_node/tasks/config.yml @@ -21,8 +21,8 @@ ansible.builtin.template: src: etc/default/prometheus-node-exporter.j2 dest: /etc/default/prometheus-node-exporter - owner: root - group: root + owner: "{{ prometheus_node_root_user }}" + group: "{{ prometheus_node_root_group }}" mode: 0644 vars: args: "{{ prometheus_node_exporter_args }}" diff --git a/roles/prometheus_node/tasks/install/Debian_10.yml b/roles/prometheus_node/tasks/install/Debian_10.yml index 9165904..1f5219f 100644 --- a/roles/prometheus_node/tasks/install/Debian_10.yml +++ b/roles/prometheus_node/tasks/install/Debian_10.yml @@ -50,7 +50,7 @@ - ansible_virtualization_role == 'host' - name: start prometheus-node-exporter-smartmon.timer - ansible.builtin.systemd: + ansible.builtin.service: name: prometheus-node-exporter-smartmon.timer state: "{{ (ansible_virtualization_role == 'host' and not smartmon_exporter_force_off) | ternary('started', 'stopped') }}" enabled: "{{ ansible_virtualization_role == 'host' }}" diff --git a/roles/prometheus_node/tasks/install/OpenBSD.yml b/roles/prometheus_node/tasks/install/OpenBSD.yml index 7e4b148..cff78d5 100644 --- a/roles/prometheus_node/tasks/install/OpenBSD.yml +++ b/roles/prometheus_node/tasks/install/OpenBSD.yml @@ -10,6 +10,6 @@ ansible.builtin.file: path: "{{ prometheus_node_textfile_dir }}" state: directory - owner: root + owner: "{{ prometheus_node_root_user }}" group: "{{ prometheus_node_group }}" mode: 0750 diff --git a/roles/prometheus_node/vars/Debian.yml b/roles/prometheus_node/vars/Debian.yml index d959a8a..727c83a 100644 --- a/roles/prometheus_node/vars/Debian.yml +++ b/roles/prometheus_node/vars/Debian.yml @@ -1,5 +1,7 @@ --- +prometheus_node_root_user: root +prometheus_node_root_group: root prometheus_node_user: prometheus prometheus_node_group: prometheus prometheus_node_service: prometheus-node-exporter diff --git a/roles/prometheus_node/vars/OpenBSD.yml b/roles/prometheus_node/vars/OpenBSD.yml index aeb6a80..d1780fb 100644 --- a/roles/prometheus_node/vars/OpenBSD.yml +++ b/roles/prometheus_node/vars/OpenBSD.yml @@ -1,5 +1,7 @@ --- +prometheus_node_root_user: root +prometheus_node_root_group: wheel prometheus_node_user: _nodeexporter prometheus_node_group: _nodeexporter prometheus_node_service: node_exporter diff --git a/roles/prometheus_node/vars/default.yml b/roles/prometheus_node/vars/default.yml index d959a8a..727c83a 100644 --- a/roles/prometheus_node/vars/default.yml +++ b/roles/prometheus_node/vars/default.yml @@ -1,5 +1,7 @@ --- +prometheus_node_root_user: root +prometheus_node_root_group: root prometheus_node_user: prometheus prometheus_node_group: prometheus prometheus_node_service: prometheus-node-exporter