Skip to content

Commit be637cf

Browse files
committed
ansible-scylla-node: Improves "legacy" support for 'node-exporter'
This patch improves how 'node_exporter_install' is called and how 'node-exporter' service is started. Fixes: scylladb#249 Signed-off-by: Eduardo Benzecri <[email protected]>
1 parent 681cb1d commit be637cf

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

ansible-scylla-node/handlers/main.yml

+14-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,21 @@
2424
name: scylla-server
2525
state: stopped
2626

27-
- name: node_exporter start
27+
- name: Enable and start 'node-exporter.service' service (legacy)
28+
block:
29+
- name: Disable and stop 'scylla-node-exporter.service' service
30+
ansible.builtin.service:
31+
name: scylla-node-exporter.service
32+
state: stopped
33+
enabled: no
34+
when: ansible_facts.services["scylla-node-exporter.service"] is defined
35+
36+
- name: Enable and start 'node-exporter.service' service (legacy)
37+
ansible.builtin.service:
38+
name: node-exporter.service
39+
state: started
40+
enabled: yes
2841
become: true
29-
service:
30-
name: node-exporter
31-
state: started
32-
enabled: yes
3342

3443
- name: Enable and start 'scylla-node-exporter.service' service
3544
block:

ansible-scylla-node/tasks/common.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@
114114
become: true
115115
when: skip_ntp is defined and skip_ntp|bool == false
116116

117-
- name: node exporter setup
117+
- name: Run 'node_exporter_install' (legacy)
118118
shell: |
119119
node_exporter_install --force
120-
when: install_type == 'online'
121120
become: true
122121
notify:
123-
- node_exporter start
124-
ignore_errors: true
125-
#TODO: stop ignoring errors when the node_exporter_install script fix is available in all actual versions, resp. use only for < 5.0 / 2022
122+
- Enable and start 'node-exporter.service' service (legacy)
123+
when:
124+
- install_type == 'online'
125+
- ansible_facts.services["scylla-node-exporter.service"] is not defined
126126

127127
- name: configure Scylla
128128
shell: |

0 commit comments

Comments
 (0)