From 6fe17c2d32dc4e0bf902b6eddb5c38f9eef902ce Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Mon, 27 Dec 2021 10:10:01 +0300
Subject: [PATCH] v5.3.5.0

Changelog: https://haproxy-wi.org/changelog.py#5_3_5
---
 .../roles/node_exporter/tasks/configure.yml   | 51 +++++++++++++++++++
 app/templates/include/mon_installation.html   |  8 +--
 2 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 app/scripts/ansible/roles/node_exporter/tasks/configure.yml

diff --git a/app/scripts/ansible/roles/node_exporter/tasks/configure.yml b/app/scripts/ansible/roles/node_exporter/tasks/configure.yml
new file mode 100644
index 00000000..0a269032
--- /dev/null
+++ b/app/scripts/ansible/roles/node_exporter/tasks/configure.yml
@@ -0,0 +1,51 @@
+---
+- name: Copy the node_exporter systemd service file
+  template:
+    src: node_exporter.service.j2
+    dest: /etc/systemd/system/node_exporter.service
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart node_exporter
+
+- block:
+    - name: Create node_exporter config directory
+      file:
+        path: "/etc/node_exporter"
+        state: directory
+        owner: root
+        group: root
+        mode: u+rwX,g+rwX,o=rX
+
+    - name: Copy the node_exporter config file
+      template:
+        src: config.yaml.j2
+        dest: /etc/node_exporter/config.yaml
+        owner: root
+        group: root
+        mode: 0644
+      notify: restart node_exporter
+  when:
+    ( node_exporter_tls_server_config | length > 0 ) or
+    ( node_exporter_http_server_config | length > 0 ) or
+    ( node_exporter_basic_auth_users | length > 0 )
+
+- name: Create textfile collector dir
+  file:
+    path: "{{ node_exporter_textfile_dir }}"
+    state: directory
+    owner: "{{ _node_exporter_system_user }}"
+    group: "{{ _node_exporter_system_group }}"
+    recurse: true
+    mode: u+rwX,g+rwX,o=rX
+  when: node_exporter_textfile_dir | length > 0
+
+- name: Allow node_exporter port in SELinux on RedHat OS family
+  seport:
+    ports: "{{ node_exporter_web_listen_address.split(':')[-1] }}"
+    proto: tcp
+    setype: http_port_t
+    state: present
+  when:
+    - ansible_version.full is version_compare('2.4', '>=')
+    - ansible_selinux.status == "enabled"
diff --git a/app/templates/include/mon_installation.html b/app/templates/include/mon_installation.html
index cfe40c6f..4d534a34 100644
--- a/app/templates/include/mon_installation.html
+++ b/app/templates/include/mon_installation.html
@@ -76,8 +76,8 @@
             <td id="cur_nginx_exp_ver" class="padding10 first-collumn"></td>
             <td class="padding10 first-collumn" style="width: 20%;">
                 {% set values = dict() %}
-                {% set values = {'0.5.0':'0.5.0', '0.6.0':'0.6.0', '0.7.0':'0.7.0', '0.9.0':'0.9.0'} %}
-                {{ select('nginxexpver',  values=values, selected='0.9.0') }}
+                {% set values = {'0.5.0':'0.5.0', '0.6.0':'0.6.0', '0.7.0':'0.7.0', '0.9.0':'0.9.0', '0.10.0':'0.10.0'} %}
+                {{ select('nginxexpver',  values=values, selected='0.10.0') }}
             </td>
             <td style="padding-left: 53px;">{{ checkbox('nginx_ext_prom', title="This exporter will be used by an external Prometheus. Also use this checkbox if you update the Exporter") }}</td>
             <td class="padding10 first-collumn">
@@ -108,8 +108,8 @@
             <td class="padding10 first-collumn" style="width: 20%;">
                 {% set values = dict() %}
                 {% set values = {'1.0.0':'1.0.0','1.1.0':'1.1.0', '1.1.1':'1.1.1', '1.1.2':'1.1.2', '1.2.0':'1.2.0',
-                '1.2.2':'1.2.2', '1.3.0':'1.3.0'} %}
-                {{ select('nodeexpver',  values=values, selected='1.3.0') }}
+                '1.2.2':'1.2.2', '1.3.0':'1.3.0', '1.3.1':'1.3.1'} %}
+                {{ select('nodeexpver',  values=values, selected='1.3.1') }}
             </td>
             <td style="padding-left: 53px;">{{ checkbox('node_ext_prom', title="This exporter will be used by an external Prometheus. Also use this checkbox if you update the Exporter") }}</td>
             <td class="padding10 first-collumn">