github
/
ConsulManager
mirror of https://github.com/starsliao/ConsulManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add exp date

pull/24/head
StarsL.cn 2022-07-01 08:07:37 +08:00
parent fd5a2abdaf
commit 18b87fbf0c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flask-consul/units/cloud/tencent_cloud.py
View File

@ -21,10 +21,10 @@ def exp(account,collect_days,notify_days,notify_amount):
now = datetime.datetime.now() now = datetime.datetime.now()
for i in ecs_list: for i in ecs_list:
exp_day = datetime.datetime.strptime(i['exp'], '%Y-%m-%d') exp_day = datetime.datetime.strptime(i['exp'], '%Y-%m-%d')
if (now - exp_day).days <= collect_days: if (exp_day - now).days <= collect_days:
exp_dict[i['iid']] = {'Region':i['region'],'Product':i['os'],'Name':i['name'], exp_dict[i['iid']] = {'Region':i['region'],'Product':i['os'],'Name':i['name'],
'EndTime':i['exp'],'Ptype':i['cpu']+i['mem'],'Group':i['group']} 'EndTime':i['exp'],'Ptype':i['cpu']+i['mem'],'Group':i['group']}
if (now - exp_day).days <= notify_days: if (exp_day - now).days <= notify_days:
notify_dict[i['iid']] = exp_dict[i['iid']] notify_dict[i['iid']] = exp_dict[i['iid']]
consul_kv.put_kv(f'ConsulManager/exp/lists/tencent_cloud/{account}/exp', exp_dict) consul_kv.put_kv(f'ConsulManager/exp/lists/tencent_cloud/{account}/exp', exp_dict)

2
flask-consul/views/exp.py
View File

@ -26,7 +26,7 @@ class Exp(Resource):
exp_config_dict = args['exp_config_dict'] exp_config_dict = args['exp_config_dict']
consul_kv.put_kv('ConsulManager/exp/config',exp_config_dict) consul_kv.put_kv('ConsulManager/exp/config',exp_config_dict)
cloud_job_list = consul_kv.get_keys_list('ConsulManager/jobs') cloud_job_list = consul_kv.get_keys_list('ConsulManager/jobs')
cloud_list = [i for i in cloud_job_list if i.endswith('/group') and 'tencent_cloud' in i] cloud_list = [i for i in cloud_job_list if i.endswith('/group')]
collect_days = exp_config_dict['collect_days'] collect_days = exp_config_dict['collect_days']
notify_days = exp_config_dict['notify_days'] notify_days = exp_config_dict['notify_days']
notify_amount = exp_config_dict['notify_amount'] notify_amount = exp_config_dict['notify_amount']