Skip to content

Commit 31fa6b5

Browse files
committed
scylla-node: remove ignore_errors, make node exporter from 2022 work
2022 node exporter now works for clean install and upgrades fix detection of node-exporter services make sure the name of node exporter service matches the check
1 parent e42ec43 commit 31fa6b5

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

ansible-scylla-node/tasks/common.yml

+23-8
Original file line numberDiff line numberDiff line change
@@ -128,23 +128,38 @@
128128
become: true
129129
when: skip_ntp is defined and skip_ntp|bool == false
130130

131-
- name: node exporter setup
131+
- name: check for node_exporter_install
132+
stat:
133+
path: /usr/sbin/node_exporter_install
134+
register: node_exporter_install
135+
136+
- name: setup legacy node exporter
132137
shell: |
133138
node_exporter_install --force
134-
when: install_type == 'online'
139+
when: (install_type == 'online') and (node_exporter_install.stat.exists)
135140
become: true
136141
notify:
137142
- node_exporter start
138-
ignore_errors: true
139-
#TODO: stop ignoring errors when the node_exporter_install script fix is available in all actual versions, resp. use only for < 5.0 / 2022
140143

141-
- name: node exporter setup from 5.0/2022
142-
service:
144+
- name: check for node_exporter
145+
stat:
146+
path: /opt/scylladb/node_exporter/node_exporter
147+
register: node_exporter
148+
149+
- name: setup bundled node exporter
150+
block:
151+
- name: Enforce disabling of old node exporter
152+
service:
153+
name: node-exporter
154+
state: stopped
155+
when: ansible_facts.services['node-exporter.service'] is defined and (ansible_facts.services['node-exporter.service']["status"] != "not-found")
156+
- name: Start bundled node exporter
157+
service:
143158
name: scylla-node-exporter
144159
state: started
160+
when: ansible_facts.services['scylla-node-exporter.service'] is defined and (ansible_facts.services['scylla-node-exporter.service']["status"] != "not-found")
145161
become: true
146-
ignore_errors: true
147-
#TODO: stop ignoring errors when a version check is added
162+
when: node_exporter.stat.exists
148163

149164
- name: configure Scylla
150165
shell: |

ansible-scylla-node/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Facts gathering
44
- name: Populate service facts
5-
service_facts:
5+
ansible.builtin.service_facts:
66

77
- name: Populate package facts
88
package_facts:

0 commit comments

Comments
 (0)