From 06e8e65d850b613481c49b9e1e403b3b659d2993 Mon Sep 17 00:00:00 2001 From: Aidaho12 Date: Fri, 26 Jan 2018 10:24:20 +0600 Subject: [PATCH] v1.4.1 Fixed bugs --- cgi-bin/funct.py | 48 +++++++------------- cgi-bin/viewsttats.py | 6 +-- haproxy-webintarface.config | 10 ++--- index.html | 5 +-- style.css | 89 ++++++++++++++++++++++++++++++++++--- 5 files changed, 106 insertions(+), 52 deletions(-) diff --git a/cgi-bin/funct.py b/cgi-bin/funct.py index ec86fa1b..d7627ccc 100644 --- a/cgi-bin/funct.py +++ b/cgi-bin/funct.py @@ -12,8 +12,7 @@ def check_config(): path_config = "haproxy-webintarface.config" config = configparser.ConfigParser() config.read(path_config) - - + for section in [ 'main', 'configs', 'ssh', 'logs', 'haproxy' ]: if not config.has_section(section): print('Check config file, no %s section' % section) @@ -71,6 +70,7 @@ def mode_admin(button): def links(): print('Home Page ') print('Stats ') + print('Monitoring ') print('Logs') print('Edit settings ') print(' | Configs: ') @@ -82,9 +82,8 @@ def links(): show_login_links() def head(title): - print("Content-type: text/html\n") + print('Content-type: text/html\n') print('%s' % title) -<<<<<<< HEAD print('' '' '' @@ -98,18 +97,18 @@ def head(title): if config.get('main', 'logo_enable') == "1": print('' % config.get('main', 'logo_path')) print('
') -======= - print('') - print('') - print('') - print('
') ->>>>>>> parent of fe00260... v1.3 links() print('
') def footer(): - print('

UP

') - print('
') + print('
' + '

' + 'UP' + '

' + '
' + '
' + '
' + '
') links() print('
') @@ -153,9 +152,9 @@ def show_config(cfg): print('' + line + '
') continue if "#" in line: - print('
') + print('
') print(i) - print(line + '
') + print(line + '
') continue print('
') print(i) @@ -203,7 +202,6 @@ def upload_and_restart(serv, cfg): return True ssh.close() -<<<<<<< HEAD def compare(stdout): i = 0 @@ -252,10 +250,6 @@ def show_ip(stdout): print(line) def ssh_command(serv, commands, **kwargs): -======= - -def ssh_command(serv, commands): ->>>>>>> parent of fe00260... v1.3 ssh = SSHClient() ssh.load_system_host_keys() k = paramiko.RSAKey.from_private_key_file(ssh_keys) @@ -277,7 +271,6 @@ def ssh_command(serv, commands): for command in commands: stdin , stdout, stderr = ssh.exec_command(command) -<<<<<<< HEAD if ip is 1: show_ip(stdout) @@ -287,24 +280,13 @@ def ssh_command(serv, commands): show_log(stdout) print(stderr.read().decode(encoding='UTF-8')) -======= - print('
') - i = 1 - for line in stdout: - i = i + 1 - if i % 2 == 0: - print('
' + line + '
') - else: - print('
' + line + '
') - print('
') ->>>>>>> parent of fe00260... v1.3 ssh.close() def chooseServer(formName, title, note): print('

' + title + '

') print('

Choose server

') print('
') - print('

') print('') form = cgi.FieldStorage() @@ -322,7 +304,7 @@ def chooseServer(formName, title, note): print('') print('

') if note == "y": - print('

Note: If you reconfigure First server, second will reconfigured automatically


') + print('

Note: If you reconfigure First server, second will reconfigured automatically

') def choose_server_with_vip(serv): import listserv as listhap diff --git a/cgi-bin/viewsttats.py b/cgi-bin/viewsttats.py index 193b0fb7..786a1e2f 100644 --- a/cgi-bin/viewsttats.py +++ b/cgi-bin/viewsttats.py @@ -23,9 +23,9 @@ form = cgi.FieldStorage() serv = form.getvalue('serv') if serv is None: - first_serv = list(listhap.list_hap_vip.values()) + first_serv = sorted(list(listhap.listhap.values())) serv = first_serv[0] - + try: response = requests.get('http://%s:%s/stats' % (serv, stats_port), auth=(haproxy_user, haproxy_pass)) except requests.exceptions.ConnectTimeout: @@ -34,6 +34,7 @@ except requests.exceptions.ReadTimeout: print('Oops. Read timeout occured') print("Content-type: text/html\n") +print('' % (config.get('haproxy', 'refresh_time') ,serv)) for i in listhap.listhap: if listhap.listhap.get(i) == serv: @@ -54,4 +55,3 @@ print('

') data = dump.dump_all(response) print('') print(data.decode('utf-8')) - diff --git a/haproxy-webintarface.config b/haproxy-webintarface.config index eb23ed11..16343d39 100644 --- a/haproxy-webintarface.config +++ b/haproxy-webintarface.config @@ -6,16 +6,13 @@ server_port = 8000 #Log for server.py log_path = %(fullpath)s/log/ time_zone = UTC -<<<<<<< HEAD #Enable logo on top menu. Default disable logo_enable = 0 logo_path = /logo.png -======= ->>>>>>> parent of fe00260... v1.3 [configs] #Server for save configs from HAproxy servers -haproxy_configs_server = +haproxy_configs_server = localhost #Dir where configs will be save haproxy_save_configs_dir = /opt/haproxy/cgi-bin/hap_config/ @@ -28,7 +25,6 @@ ssh_user_name = root [logs] #Logs save localy, disable by default local_path_logs = /var/log/haproxy.log -# syslog_server_enable = enable syslog_server = 172.28.5.112 @@ -45,5 +41,5 @@ haproxy_config_path = /etc/haproxy/haproxy.cfg tmp_config_path = /tmp #Time in seconds for auto refresh view stats_port refresh_time = 120 -======= ->>>>>>> parent of fe00260... v1.3 + + diff --git a/index.html b/index.html index ad06937b..39c10f47 100644 --- a/index.html +++ b/index.html @@ -8,10 +8,9 @@ -<<<<<<< HEAD
-

Welcome! HAproxy Web Intarface

+

Welcome! HAproxy Web Interface

Choose your destiny!

View stats
Edit settings
@@ -26,7 +25,6 @@
-=======

Welcome! HAproxy Web intarface

Choose your destiny!

@@ -39,6 +37,5 @@ Upload old config
->>>>>>> parent of fe00260... v1.3 diff --git a/style.css b/style.css index bf650930..0100a645 100644 --- a/style.css +++ b/style.css @@ -6,7 +6,7 @@ body { font-size: 14px; line-height: 1.42857143; color: #000; - background-color: #fff; + background-color: #eee; margin: 0; padding: 0; } @@ -18,6 +18,12 @@ body { position: fixed; right: 0; left: 0; + z-index: 1000; +} +.top-menu img { + max-width: 125px; + float: left; + padding-left: 100px; } .top-menu a, .footer a { padding: 10px; @@ -39,9 +45,79 @@ body { margin-left: 35%; } .conteiner { - clear: both; - margin-top: 65px; - min-height: calc(100vh - 115px); + clear: both; + margin-top: 65px; + min-height: calc(100vh - 115px); + width: 45%; + background-color: #fff; + margin-left: 27%; +} +.configShow, .diff { + margin-left: 16%; + max-height:: 70%; + overflow: auto; + width: 70%; + border: 1px solid #DCDCDC; + border-radius: 5px; +} +.diffHead { + background-color: #F5F5F5; + padding: 10px; +} +.lineDog { + background-color: #dbedff; + margin-bottom: 10px; +} +.lineDiffMinus, .lineDiffPlus { + padding-left: 5px; +} +.lineDiffMinus { + background-color: #ffdce0; +} +.lineDiffPlus { + background-color: #cdffd8; +} +.lineDiff { + padding-left: 5px; +} +.param { + font-weight: bold; + background-color: #DCDCDC; + padding-left: 13px; +} +.numRow { + padding-left: 10px; + padding-right: 20px; +} +.paramInSec { + font-weight: bold; +} +.conteinerIndex { + width: 20%; + background-color: #fff; + padding: 20px; + border-radius: 10px; + margin-top: 2%; +} +.conteinerIndex img { + max-width: 250px; +} +.copyright { + color: #23527c; + margin-left: 15px; +} +.line { + background-color: #eee; + border: 1px solid #000; +} +.line, .line3 { + padding-top:5px; + padding-bottom: 5px; + padding-left: 10px; + padding-right: 10px; +} +.comment { + color: #aaa; } .addName { background-color: #eee; @@ -142,7 +218,9 @@ input::-moz-focus-inner { border: 0; } input { - line-height: normal; + line-height: normal; + border-radius: 4px; + padding: 4px; } fieldset { @@ -198,6 +276,7 @@ a:focus { padding-left: 15px; margin-right: auto; margin-left: auto; +} .container-fluid { padding-right: 15px; padding-left: 15px;