github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v5.5.1.0 

Changelog: https://roxy-wi.org/changelog.py#5_5_1
pull/321/head v5.5.1.0
Pavel Loginov 2022-04-08 21:08:31 +03:00
parent 0092bd77b9
commit b82bc2cb14
4 changed files with 68 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/scripts/ansible/roles/haproxy_exporter.yml
View File

@ -6,24 +6,6 @@
set_fact:
ansible_port: "{{SSH_PORT}}"
- name: collect facts about system services
service_facts:
register: services_state
- name: Open stat port for firewalld
firewalld:
port: "9101/tcp"
state: enabled
permanent: yes
immediate: yes
ignore_errors: yes
no_log: True
debugger: never
when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and ansible_facts.services["firewalld.service"]['state'] == "running"
- name: Open stat port for iptables
iptables:
chain: INPUT

16
app/scripts/ansible/roles/nginx_exporter.yml
View File

@ -6,22 +6,6 @@
set_fact:
ansible_port: "{{SSH_PORT}}"
- name: collect facts about system services
service_facts:
register: services_state
- name: Open stat port for firewalld
firewalld:
port: "9113/tcp"
state: enabled
permanent: yes
immediate: yes
ignore_errors: yes
when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and ansible_facts.services["firewalld.service"]['state'] == "running"
- name: Open stat port for iptables
iptables:
chain: INPUT

16
app/scripts/ansible/roles/node_exporter.yml
View File

@ -6,22 +6,6 @@
set_fact:
ansible_port: "{{SSH_PORT}}"
- name: collect facts about system services
service_facts:
register: services_state
- name: Open stat port for firewalld
firewalld:
port: "9100/tcp"
state: enabled
permanent: yes
immediate: yes
ignore_errors: yes
when: (ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == 'CentOS') and ansible_facts.services["firewalld.service"]['state'] == "running"
- name: Open stat port for iptables
iptables:
chain: INPUT

20
inc/users.js
View File

@ -334,7 +334,7 @@ $( function() {
if (data.indexOf('error:') != '-1') {
toastr.clear();
toastr.error(data);
} else if(data == 'no') {
} else if(data == 'no' || data == '') {
$('#cur_haproxy_exp_ver').text('HAProxy exporter has been not installed');
} else {
$('#cur_haproxy_exp_ver').text(data);
@ -357,7 +357,7 @@ $( function() {
if (data.indexOf('error:') != '-1') {
toastr.clear();
toastr.error(data);
} else if(data == 'no') {
} else if(data == 'no' || data == '') {
$('#cur_nginx_exp_ver').text('Nginx exporter has not been installed');
} else {
$('#cur_nginx_exp_ver').text(data);
@ -377,10 +377,10 @@ $( function() {
type: "POST",
success: function( data ) {
data = data.replace(/^\s+|\s+$/g,'');
if (data.indexOf('error:') != '-1' || data.indexOf('command') != '-1') {
if (data.indexOf('error:') != '-1') {
toastr.clear();
toastr.error(data);
} else if(data == 'no') {
} else if(data == 'no' || data.indexOf('command') != '-1' || data == '') {
$('#cur_node_exp_ver').text('Node exporter has not been installed');
} else {
$('#cur_node_exp_ver').text(data);
@ -1615,12 +1615,12 @@ function updateGroup(id) {
}
function updateServer(id) {
toastr.clear();
var typeip = 0;
var enable = 0;
var haproxy = 0;
var nginx = 0;
var firewall = 0;
var protected_serv = 0;
let typeip = 0;
let enable = 0;
let haproxy = 0;
let nginx = 0;
let firewall = 0;
let protected_serv = 0;
if ($('#typeip-'+id).is(':checked')) {
typeip = '1';
}