diff --git a/app/scripts/ansible/roles/apache_exporter/tasks/main.yml b/app/scripts/ansible/roles/apache_exporter/tasks/main.yml index 99a64872..6a0bdc46 100644 --- a/app/scripts/ansible/roles/apache_exporter/tasks/main.yml +++ b/app/scripts/ansible/roles/apache_exporter/tasks/main.yml @@ -38,11 +38,11 @@ dest: "{{ prometheus_exporter_dist_dir }}/{{ apache_exporter_signature }}.tar.gz" owner: root group: root - register: _download_binary - until: _download_binary is succeeded - retries: 5 - delay: 2 mode: "u=rwx,go=rx" + register: _download_binary + until: _download_binary is succeeded + retries: 5 + delay: 2 - name: make distribution directory become: true diff --git a/app/scripts/ansible/roles/haproxy_exporter/tasks/main.yml b/app/scripts/ansible/roles/haproxy_exporter/tasks/main.yml index 02ad3d9b..61a23d52 100644 --- a/app/scripts/ansible/roles/haproxy_exporter/tasks/main.yml +++ b/app/scripts/ansible/roles/haproxy_exporter/tasks/main.yml @@ -51,11 +51,11 @@ dest: "{{ prometheus_exporter_dist_dir }}/{{ haproxy_exporter_signature }}.tar.gz" owner: root group: root - register: _download_binary - until: _download_binary is succeeded - retries: 5 - delay: 2 mode: "u=rw,go=r" + register: _download_binary + until: _download_binary is succeeded + retries: 5 + delay: 2 - name: untar tarball become: true diff --git a/app/scripts/ansible/roles/nginx_exporter/tasks/main.yml b/app/scripts/ansible/roles/nginx_exporter/tasks/main.yml index ab2b421b..d5a3ff8b 100644 --- a/app/scripts/ansible/roles/nginx_exporter/tasks/main.yml +++ b/app/scripts/ansible/roles/nginx_exporter/tasks/main.yml @@ -52,11 +52,11 @@ dest: "{{ prometheus_exporter_dist_dir }}/{{ nginx_exporter_signature }}.tar.gz" owner: root group: root - register: _download_binary - until: _download_binary is succeeded - retries: 5 - delay: 2 - mode: "u=rwx,go=rx" + mode: "u=rw,go=r" + register: _download_binary + until: _download_binary is succeeded + retries: 5 + delay: 2 when: nginx_exporter_version is version('0.9.0', '>=') - name: download tarball alt diff --git a/app/scripts/install_haproxy_exporter.sh b/app/scripts/install_haproxy_exporter.sh index d6569c76..92859ca4 100644 --- a/app/scripts/install_haproxy_exporter.sh +++ b/app/scripts/install_haproxy_exporter.sh @@ -26,7 +26,7 @@ if [ ! -d "/var/www/haproxy-wi/app/scripts/ansible/roles/bdellegrazie.ansible-ro export https_proxy="$PROXY" export http_proxy="$PROXY" fi - ansible-galaxy install bdellegrazie.ansible-role-prometheus_exporter --roles-path /var/www/haproxy-wi/app/scripts/ansible/roles/ + ansible-galaxy install bdellegrazie.ansible-role-prometheus_exporter --roles-path /var/www/haproxy-wi/app/scripts/ansible/roles/ -f bash -c cat << EOF >> /var/www/haproxy-wi/app/scripts/ansible/roles/bdellegrazie.ansible-role-prometheus_exporter/vars/vars-family-redhat-8.yml --- prometheus_exporter_ansible_packages: diff --git a/app/scripts/install_nginx_exporter.sh b/app/scripts/install_nginx_exporter.sh index a7e2873e..3277112e 100644 --- a/app/scripts/install_nginx_exporter.sh +++ b/app/scripts/install_nginx_exporter.sh @@ -26,7 +26,7 @@ if [ ! -d "/var/www/haproxy-wi/app/scripts/ansible/roles/bdellegrazie.ansible-ro export https_proxy="$PROXY" export http_proxy="$PROXY" fi - ansible-galaxy install bdellegrazie.ansible-role-prometheus_exporter --roles-path /var/www/haproxy-wi/app/scripts/ansible/roles/ + ansible-galaxy install bdellegrazie.ansible-role-prometheus_exporter --roles-path /var/www/haproxy-wi/app/scripts/ansible/roles/ -f bash -c cat << EOF >> /var/www/haproxy-wi/app/scripts/ansible/roles/bdellegrazie.ansible-role-prometheus_exporter/vars/vars-family-redhat-8.yml --- prometheus_exporter_ansible_packages: