diff --git a/app/scripts/ansible/roles/apache_exporter/tasks/main.yml b/app/scripts/ansible/roles/apache_exporter/tasks/main.yml index b03ce3ac..c5176e0e 100644 --- a/app/scripts/ansible/roles/apache_exporter/tasks/main.yml +++ b/app/scripts/ansible/roles/apache_exporter/tasks/main.yml @@ -53,14 +53,14 @@ become: true copy: src: "/tmp/apache_exporter-{{ apache_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}/apache_exporter" - dest: "/opt/prometheus/exporters/apache_exporter" + dest: "{{prometheus_exporter_dir}}/apache_exporter" mode: 0755 owner: root group: root notify: - restart apache exporter - when: not ansible_check_mode + - name: Copy the apache_exporter systemd service file become: true template: diff --git a/inc/users.js b/inc/users.js index 5822d6a7..bef63ed5 100644 --- a/inc/users.js +++ b/inc/users.js @@ -329,7 +329,7 @@ $( function() { if (data.indexOf('error:') != '-1') { toastr.clear(); toastr.error(data); - } else if(data == 'no' || data == '' || data.indexOf('No') != '-1') { + } else if(data == 'no' || data == '' || data.indexOf('No') != '-1' || data.indexOf('No such file or directory') != '-1') { $('#cur_haproxy_exp_ver').text('HAProxy exporter has been not installed'); } else { $('#cur_haproxy_exp_ver').text(data); @@ -352,7 +352,7 @@ $( function() { if (data.indexOf('error:') != '-1') { toastr.clear(); toastr.error(data); - } else if(data == 'no' || data == '') { + } else if(data == 'no' || data == '' || data.indexOf('No such file or directory') != '-1') { $('#cur_nginx_exp_ver').text('NGINX exporter has not been installed'); } else { $('#cur_nginx_exp_ver').text(data); @@ -375,7 +375,7 @@ $( function() { if (data.indexOf('error:') != '-1') { toastr.clear(); toastr.error(data); - } else if(data == 'no' || data == '') { + } else if(data == 'no' || data == '' || data.indexOf('No such file or directory') != '-1') { $('#cur_apache_exp_ver').text('Apache exporter has not been installed'); } else { $('#cur_apache_exp_ver').text(data);