From 92523d949e0320fb89866b607b18b19a9e545ad7 Mon Sep 17 00:00:00 2001 From: Tom Taylor <975744+t0mtaylor@users.noreply.github.com> Date: Mon, 23 May 2022 14:33:19 +0100 Subject: [PATCH] Fix spacing --- app/sql.py | 126 ++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/app/sql.py b/app/sql.py index ff627b5b..5a54aa8e 100755 --- a/app/sql.py +++ b/app/sql.py @@ -863,13 +863,13 @@ def get_dick_permit(**kwargs): def is_master(ip, **kwargs): cursor = conn.cursor() if kwargs.get('master_slave'): - sql = """ select master.hostname, master.ip, slave.hostname, slave.ip - from servers as master - left join servers as slave on master.id = slave.master + sql = """ select master.hostname, master.ip, slave.hostname, slave.ip + from servers as master + left join servers as slave on master.id = slave.master where slave.master > 0 """ else: - sql = """ select slave.ip, slave.hostname from servers as master - left join servers as slave on master.id = slave.master + sql = """ select slave.ip, slave.hostname from servers as master + left join servers as slave on master.id = slave.master where master.ip = '%s' """ % ip try: cursor.execute(sql) @@ -1632,7 +1632,7 @@ def select_table_metrics(): where servers.metrics = 1 and metr.date <= now() and metr.date >= DATE_ADD(NOW(), INTERVAL -3 DAY) group by servers.ip ) as avg_sess_3d, - + (select servers.ip,max(metr.sess_rate) as max_sess_1h from servers left join metrics as metr on metr.serv = servers.ip where servers.metrics = 1 and @@ -1662,14 +1662,14 @@ def select_table_metrics(): where servers.metrics = 1 and metr.date <= now() and metr.date >= DATE_ADD(NOW(),INTERVAL -24 HOUR) group by servers.ip) as avg_cur_24h, - - (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_3d from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and - metr.date <= now() and metr.date >= DATE_ADD(NOW(),INTERVAL -3 DAY) - group by servers.ip ) as avg_cur_3d, + + (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_3d from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and + metr.date <= now() and metr.date >= DATE_ADD(NOW(),INTERVAL -3 DAY) + group by servers.ip ) as avg_cur_3d, - (select servers.ip,max(metr.curr_con) as max_con_1h from servers + (select servers.ip,max(metr.curr_con) as max_con_1h from servers left join metrics as metr on metr.serv = servers.ip where servers.metrics = 1 and metr.date <= now() and metr.date >= DATE_ADD(NOW(),INTERVAL -1 HOUR) @@ -1686,7 +1686,7 @@ def select_table_metrics(): where servers.metrics = 1 and metr.date <= now() and metr.date >= DATE_ADD(NOW(),INTERVAL -3 DAY) group by servers.ip ) as max_con_3d - + where ip.ip=hostname.ip and ip.ip=avg_sess_1h.ip and ip.ip=avg_sess_24h.ip @@ -1709,27 +1709,27 @@ def select_table_metrics(): (select servers.ip, servers.hostname as hostname from servers left join metrics as metr on servers.ip = metr.serv where servers.metrics = 1 %s) as hostname, - (select servers.ip,round(avg(metr.sess_rate), 1) as avg_sess_1h from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and + (select servers.ip,round(avg(metr.sess_rate), 1) as avg_sess_1h from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-1 hours', 'localtime') group by servers.ip) as avg_sess_1h, - (select servers.ip,round(avg(metr.sess_rate), 1) as avg_sess_24h from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and + (select servers.ip,round(avg(metr.sess_rate), 1) as avg_sess_24h from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-24 hours', 'localtime') - group by servers.ip) as avg_sess_24h, + group by servers.ip) as avg_sess_24h, - (select servers.ip,round(avg(metr.sess_rate), 1) as avg_sess_3d from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and - metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') + (select servers.ip,round(avg(metr.sess_rate), 1) as avg_sess_3d from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and + metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') group by servers.ip ) as avg_sess_3d, - (select servers.ip,max(metr.sess_rate) as max_sess_1h from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and + (select servers.ip,max(metr.sess_rate) as max_sess_1h from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-1 hours', 'localtime') group by servers.ip) as max_sess_1h, @@ -1737,49 +1737,49 @@ def select_table_metrics(): left join metrics as metr on metr.serv = servers.ip where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-24 hours', 'localtime') - group by servers.ip) as max_sess_24h, + group by servers.ip) as max_sess_24h, - (select servers.ip,max(metr.sess_rate) as max_sess_3d from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and - metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') + (select servers.ip,max(metr.sess_rate) as max_sess_3d from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and + metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') group by servers.ip ) as max_sess_3d, - (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_1h from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and + (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_1h from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-1 hours', 'localtime') group by servers.ip) as avg_cur_1h, - (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_24h from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and + (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_24h from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-24 hours', 'localtime') - group by servers.ip) as avg_cur_24h, + group by servers.ip) as avg_cur_24h, - (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_3d from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and - metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') + (select servers.ip,round(avg(metr.curr_con+metr.cur_ssl_con), 1) as avg_cur_3d from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and + metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') group by servers.ip ) as avg_cur_3d, - (select servers.ip,max(metr.curr_con) as max_con_1h from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and + (select servers.ip,max(metr.curr_con) as max_con_1h from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-1 hours', 'localtime') group by servers.ip) as max_con_1h, - (select servers.ip,max(metr.curr_con) as max_con_24h from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and + (select servers.ip,max(metr.curr_con) as max_con_24h from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-24 hours', 'localtime') - group by servers.ip) as max_con_24h, + group by servers.ip) as max_con_24h, - (select servers.ip,max(metr.curr_con) as max_con_3d from servers - left join metrics as metr on metr.serv = servers.ip - where servers.metrics = 1 and - metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') - group by servers.ip ) as max_con_3d + (select servers.ip,max(metr.curr_con) as max_con_3d from servers + left join metrics as metr on metr.serv = servers.ip + where servers.metrics = 1 and + metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-3 days', 'localtime') + group by servers.ip ) as max_con_3d where ip.ip=hostname.ip and ip.ip=avg_sess_1h.ip @@ -2134,8 +2134,8 @@ def select_smon(user_group, **kwargs): http = kwargs.get('proto')+':'+kwargs.get('uri') except: http = '' - sql = """select id, ip, port, en, http, body, telegram_channel_id, `desc`, `group`, user_group, slack_channel_id from smon - where ip='%s' and port='%s' and http='%s' and body='%s' %s + sql = """select id, ip, port, en, http, body, telegram_channel_id, `desc`, `group`, user_group, slack_channel_id from smon + where ip='%s' and port='%s' and http='%s' and body='%s' %s """ % (kwargs.get('ip'), kwargs.get('port'), http, body, user_group) elif kwargs.get('action') == 'add': sql = """select id, ip, port, en, http, body, telegram_channel_id, `desc`, `group`, user_group, slack_channel_id from smon @@ -2346,16 +2346,14 @@ def response_time(time, smon_id): def smon_list(user_group): if user_group == 1: - query = (SMON.select(SMON.ip, SMON.port,SMON.status,SMON.en,SMON.desc,SMON.response_time,SMON.time_state, - SMON.group,SMON.script,SMON.http,SMON.http_status,SMON.body,SMON.body_status) - .order_by(SMON.group) - ) + query = (SMON.select(SMON.ip, SMON.port, SMON.status, SMON.en, SMON.desc, SMON.response_time, SMON.time_state, + SMON.group, SMON.script, SMON.http, SMON.http_status, SMON.body, SMON.body_status) + .order_by(SMON.group)) else: query = (SMON.select(SMON.ip, SMON.port, SMON.status, SMON.en, SMON.desc, SMON.response_time, SMON.time_state, SMON.group, SMON.script, SMON.http, SMON.http_status, SMON.body, SMON.body_status) .where(SMON.user_group == user_group) - .order_by(SMON.group) - ) + .order_by(SMON.group)) try: query_res = query.execute()