commit
0b3f08c258
|
@ -294,18 +294,18 @@ def rds(account,region):
|
|||
next_token = rdsbaseinfo.body.next_token
|
||||
|
||||
try:
|
||||
describe_dbinstances_as_csv_request = rds_20140815_models.DescribeDBInstancesAsCsvRequest(region_id=region)
|
||||
rdsplusinfo = client.describe_dbinstances_as_csv_with_options(describe_dbinstances_as_csv_request, runtime)
|
||||
rdsplus_list = rdsplusinfo.body.to_map()['Items']["DBInstanceAttribute"]
|
||||
|
||||
rds_plus = {i['DBInstanceId']:{'port':int(i['Port']),
|
||||
'cpu':f"{i['DBInstanceCPU']}核",
|
||||
'mem':f"{round(i['DBInstanceMemory']/1024)}GB",
|
||||
'disk':f"{i['DBInstanceStorage']}GB"
|
||||
} for i in rdsplus_list}
|
||||
for k,v in rds_plus.items():
|
||||
if k in rds_dict:
|
||||
rds_dict[k].update(v)
|
||||
for iid in rds_dict.keys():
|
||||
describe_dbinstance_attribute_request = rds_20140815_models.DescribeDBInstanceAttributeRequest(dbinstance_id=iid)
|
||||
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']),
|
||||
'cpu':f"{i['DBInstanceCPU']}核",
|
||||
'mem':f"{round(i['DBInstanceMemory']/1024)}GB",
|
||||
'disk':f"{i['DBInstanceStorage']}GB"
|
||||
} for i in rdsplus_list}
|
||||
for k,v in rds_plus.items():
|
||||
if k in rds_dict:
|
||||
rds_dict[k].update(v)
|
||||
except Exception as e:
|
||||
logger.error('DescribeDBInstancesAsCsvRequest ERROR' + f'{e}\n{traceback.format_exc()}')
|
||||
|
||||
|
|
|
@ -255,7 +255,7 @@ def redis(account,region):
|
|||
'region':region,
|
||||
'group':group_dict.get(str(i.ProjectId),'无'),
|
||||
'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,
|
||||
'exp': '按量' if i.DeadlineTime == "0000-00-00 00:00:00" else i.DeadlineTime.split(' ')[0],
|
||||
'mem':f"{i.Size}MB",
|
||||
|
|
Loading…
Reference in New Issue