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

Merge pull request #137 from ZZYhho/main 

Fix: tencent redis other version 同步失败
pull/143/merge
StarsL.cn 2025-01-13 17:33:06 +08:00 committed by GitHub
parent 3e109b75b1 d317f134e7
commit 0b3f08c258
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flask-consul/units/cloud/alicloud.py
View File

@ -294,18 +294,18 @@ def rds(account,region):
next_token = rdsbaseinfo.body.next_token next_token = rdsbaseinfo.body.next_token
try: try:
describe_dbinstances_as_csv_request = rds_20140815_models.DescribeDBInstancesAsCsvRequest(region_id=region) for iid in rds_dict.keys():
rdsplusinfo = client.describe_dbinstances_as_csv_with_options(describe_dbinstances_as_csv_request, runtime) describe_dbinstance_attribute_request = rds_20140815_models.DescribeDBInstanceAttributeRequest(dbinstance_id=iid)
rdsplus_list = rdsplusinfo.body.to_map()['Items']["DBInstanceAttribute"] rdsplusinfo = client.describe_dbinstance_attribute_with_options(describe_dbinstance_attribute_request, runtime)
rdsplus_list = rdsplusinfo.body.to_map()['Items']["DBInstanceAttribute"]
rds_plus = {i['DBInstanceId']:{'port':int(i['Port']), rds_plus = {i['DBInstanceId']:{'port':int(i['Port']),
'cpu':f"{i['DBInstanceCPU']}核", 'cpu':f"{i['DBInstanceCPU']}核",
'mem':f"{round(i['DBInstanceMemory']/1024)}GB", 'mem':f"{round(i['DBInstanceMemory']/1024)}GB",
'disk':f"{i['DBInstanceStorage']}GB" 'disk':f"{i['DBInstanceStorage']}GB"
} for i in rdsplus_list} } for i in rdsplus_list}
for k,v in rds_plus.items(): for k,v in rds_plus.items():
if k in rds_dict: if k in rds_dict:
rds_dict[k].update(v) rds_dict[k].update(v)
except Exception as e: except Exception as e:
logger.error('DescribeDBInstancesAsCsvRequest ERROR' + f'{e}\n{traceback.format_exc()}') logger.error('DescribeDBInstancesAsCsvRequest ERROR' + f'{e}\n{traceback.format_exc()}')

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

@ -255,7 +255,7 @@ def redis(account,region):
'region':region, 'region':region,
'group':group_dict.get(str(i.ProjectId),'无'), 'group':group_dict.get(str(i.ProjectId),'无'),
'status': '运行中' if i.Status == 2 else '非运行中', 'status': '运行中' if i.Status == 2 else '非运行中',
'itype':{6:'主从',7:'集群',8:'主从',9:'集群'}.get(i.Type,i.Type), 'itype':{2:'主从',3:'主从',4:'集群',5:'单机'，6:'主从',7:'集群',8:'主从',9:'集群',15:'主从',16:'集群',17:'主从',18:'集群'}.get(i.Type,i.Type),
'ver':i.CurrentRedisVersion, 'ver':i.CurrentRedisVersion,
'exp': '按量' if i.DeadlineTime == "0000-00-00 00:00:00" else i.DeadlineTime.split(' ')[0], 'exp': '按量' if i.DeadlineTime == "0000-00-00 00:00:00" else i.DeadlineTime.split(' ')[0],
'mem':f"{i.Size}MB", 'mem':f"{i.Size}MB",