mirror of https://github.com/Aidaho12/haproxy-wi
Tidy more space with latest from master
Tom Taylor
GitHub
parent
92523d949e
commit
38178ab326
31
app/sql.py
31
app/sql.py
|
|
@ -386,14 +386,12 @@ def select_user_groups_with_names(user_id, **kwargs):
|
|||
if kwargs.get("all") is not None:
|
||||
query = (UserGroups
|
||||
.select(UserGroups.user_group_id, UserGroups.user_id, Groups.name)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
|
||||
)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id)) )
|
||||
else:
|
||||
query = (UserGroups
|
||||
.select(UserGroups.user_group_id, Groups.name)
|
||||
.join(Groups, on=(UserGroups.user_group_id == Groups.group_id))
|
||||
.where(UserGroups.user_id == user_id)
|
||||
)
|
||||
.where(UserGroups.user_id == user_id))
|
||||
try:
|
||||
query_res = query.execute()
|
||||
except Exception as e:
|
||||
|
|
@ -1668,7 +1666,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_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
|
||||
|
|
@ -1685,7 +1683,7 @@ def select_table_metrics():
|
|||
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 max_con_3d
|
||||
group by servers.ip ) as max_con_3d
|
||||
|
||||
where ip.ip=hostname.ip
|
||||
and ip.ip=avg_sess_1h.ip
|
||||
|
|
@ -1733,9 +1731,9 @@ def select_table_metrics():
|
|||
metr.date <= datetime('now', 'localtime') and metr.date >= datetime('now', '-1 hours', 'localtime')
|
||||
group by servers.ip) as max_sess_1h,
|
||||
|
||||
(select servers.ip,max(metr.sess_rate) as max_sess_24h 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_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_sess_24h,
|
||||
|
||||
|
|
@ -2223,7 +2221,6 @@ def select_en_service():
|
|||
return query_res
|
||||
|
||||
|
||||
|
||||
def select_status(smon_id):
|
||||
try:
|
||||
query_res = SMON.get(SMON.id == smon_id).status
|
||||
|
|
@ -2539,7 +2536,7 @@ def delete_ports(serv):
|
|||
def insert_port_scanner_history(serv, port, port_status, service_name):
|
||||
try:
|
||||
PortScannerHistory.insert(serv=serv, port=port, status=port_status, service_name=service_name,
|
||||
date=funct.get_data('regular')).execute()
|
||||
date=funct.get_data('regular')).execute()
|
||||
except Exception as e:
|
||||
out_error(e)
|
||||
|
||||
|
|
@ -2649,7 +2646,7 @@ def add_server_aws(region, instance_type, public_ip, floating_ip, volume_size, s
|
|||
return False
|
||||
|
||||
|
||||
def add_server_gcore(project ,region, instance_type, network_type, network_name, volume_size, ssh_key_name, name, os,
|
||||
def add_server_gcore(project, region, instance_type, network_type, network_name, volume_size, ssh_key_name, name, os,
|
||||
firewall, provider_id, group_id, status, delete_on_termination, volume_type):
|
||||
try:
|
||||
ProvisionedServers.insert(region=region, instance_type=instance_type, public_ip=network_type, network_name=network_name,
|
||||
|
|
@ -2683,7 +2680,7 @@ def select_aws_server(server_id):
|
|||
prov_serv.volume_size, prov_serv.ssh_key_name, prov_serv.name, prov_serv.os,
|
||||
prov_serv.firewall, prov_serv.provider_id, prov_serv.group_id, prov_serv.id,
|
||||
prov_serv.delete_on_termination, prov_serv.volume_type)
|
||||
.where(prov_serv.id == server_id))
|
||||
.where(prov_serv.id == server_id))
|
||||
try:
|
||||
query_res = query.execute()
|
||||
except Exception as e:
|
||||
|
|
@ -2794,7 +2791,7 @@ def update_server_do(size, privet_net, floating_ip, ssh_ids, ssh_name, oss, fire
|
|||
group, status, server_id):
|
||||
query = ProvisionedServers.update(instance_type=size, private_networking=privet_net,
|
||||
floating_ip=floating_ip, ssh_ids=ssh_ids, ssh_key_name=ssh_name,
|
||||
os=oss,firewall=firewall, monitoring=monitoring, backup=backup,
|
||||
os=oss, firewall=firewall, monitoring=monitoring, backup=backup,
|
||||
provider_id=provider,
|
||||
group_id=group, status=status).where(ProvisionedServers.id == server_id)
|
||||
try:
|
||||
|
|
@ -2820,9 +2817,9 @@ def select_provisioned_servers(**kwargs):
|
|||
prov_serv.select(prov_serv.id, prov_serv.name, prov_serv.provider_id, prov_serv.type,
|
||||
prov_serv.group_id, prov_serv.instance_type, prov_serv.status, prov_serv.date,
|
||||
prov_serv.region, prov_serv.os, prov_serv.IP, prov_serv.last_error, prov_serv.name_template)
|
||||
.where((prov_serv.name == kwargs.get('new')) &
|
||||
(prov_serv.group_id == kwargs.get('group')) &
|
||||
(prov_serv.type == kwargs.get('type'))))
|
||||
.where((prov_serv.name == kwargs.get('new')) &
|
||||
(prov_serv.group_id == kwargs.get('group')) &
|
||||
(prov_serv.type == kwargs.get('type'))))
|
||||
else:
|
||||
query = prov_serv.select(prov_serv.id, prov_serv.name, prov_serv.provider_id, prov_serv.type, prov_serv.group_id,
|
||||
prov_serv.instance_type, prov_serv.status, prov_serv.date, prov_serv.region, prov_serv.os,
|
||||
|
|
|
|||
Loading…
Reference in New Issue