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

兼容jumpserver3.x同步

pull/72/head
starsliao 2023-07-21 17:09:16 +08:00
parent eb39830de2
commit 1744974658
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flask-consul/units/jms/sync_jms.py
View File

@ -27,9 +27,9 @@ def update_jms_ecs(jms_url,headers,new_node_dict,node_id,cloud,account,ecs_info,
ecs_url = f"{jms_url}/api/v1/assets/assets/" ecs_url = f"{jms_url}/api/v1/assets/assets/"
reget_ecs_list = requests.request("GET", f'{ecs_url}?node={node_id}', headers=headers).json() reget_ecs_list = requests.request("GET", f'{ecs_url}?node={node_id}', headers=headers).json()
try: try:
jms_ecs_dict = {i['ip']:{'name':i['hostname'],'id':i['id'],'comment':i['comment'],'node':i['nodes_display'][0]} for i in reget_ecs_list} jms_ecs_dict = {i.get('ip',i.get('address','IPNOTFOUND')):{'name':i.get('hostname',i.get('name','NAMENOTFOUND')),'id':i['id'],'comment':i['comment'],'node':i['nodes_display'][0]} for i in reget_ecs_list}
except: except:
jms_ecs_dict = {i['ip']:{'name':i['hostname'],'id':i['id'],'comment':i['comment'],'node':i['nodes'][0]} for i in reget_ecs_list} jms_ecs_dict = {i.get('ip',i.get('address','IPNOTFOUND')):{'name':i.get('hostname',i.get('name','NAMENOTFOUND')),'id':i['id'],'comment':i['comment'],'node':i['nodes'][0]} for i in reget_ecs_list}
ecs_list = consul_manager.get_instances(f'{cloud}_{account}_ecs')['instances'] ecs_list = consul_manager.get_instances(f'{cloud}_{account}_ecs')['instances']
ecs_ip_dict = {i['address']:i['meta'][0]['name'] for i in ecs_list} ecs_ip_dict = {i['address']:i['meta'][0]['name'] for i in ecs_list}
@ -59,6 +59,8 @@ def update_jms_ecs(jms_url,headers,new_node_dict,node_id,cloud,account,ecs_info,
payload = { payload = {
"ip": ip, "ip": ip,
"hostname": iname, "hostname": iname,
"address": ip,
"name": iname,
"protocols": protocols, "protocols": protocols,
"platform": platform, "platform": platform,
"is_active": True, "is_active": True,
@ -88,11 +90,11 @@ def del_jms_repip(jms_url,headers,node_id,ecs_ip_dict):
rep_jmsecs_list = [] rep_jmsecs_list = []
new_jms_list = requests.request("GET", f'{ecs_url}?node={node_id}', headers=headers).json() new_jms_list = requests.request("GET", f'{ecs_url}?node={node_id}', headers=headers).json()
for i in new_jms_list: for i in new_jms_list:
if i['ip'] not in temp_jmsecs_dict: if i.get('ip',i.get('address','IPNOTFOUND')) not in temp_jmsecs_dict:
temp_jmsecs_dict[i['ip']] = {'name':i['hostname'],'id':i['id'],'ip':i['ip']} temp_jmsecs_dict[i.get('ip',i.get('address','IPNOTFOUND'))] = {'name':i.get('hostname',i.get('name','NAMENOTFOUND')),'id':i['id'],'ip':i.get('ip',i.get('address','IPNOTFOUND'))}
else: else:
rep_jmsecs_list.append(temp_jmsecs_dict[i['ip']]) rep_jmsecs_list.append(temp_jmsecs_dict[i.get('ip',i.get('address','IPNOTFOUND'))])
rep_jmsecs_list.append({'name':i['hostname'],'id':i['id'],'ip':i['ip']}) rep_jmsecs_list.append({'name':i.get('hostname',i.get('name','NAMENOTFOUND')),'id':i['id'],'ip':i.get('ip',i.get('address','IPNOTFOUND'))})
for j in rep_jmsecs_list: for j in rep_jmsecs_list:
if j['name'] != ecs_ip_dict.get(j['ip']): if j['name'] != ecs_ip_dict.get(j['ip']):

2
vue-consul/src/main.js
View File

@ -46,7 +46,7 @@ Object.keys(filters).forEach(key => {
}) })
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.prototype.VER = 'v0.12.6' Vue.prototype.VER = 'v0.12.7'
new Vue({ new Vue({
el: '#app', el: '#app',