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

Update awscloud.py 

AWS无法获取mem，值设置为0
pull/131/head
Yvan 2024-08-14 17:45:39 +08:00 committed by GitHub
parent 32bdcf4c6a
commit f5e39299c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flask-consul/units/cloud/awscloud.py
View File

@ -61,7 +61,7 @@ def ecs(account,region,isextip=False):
ecs_dict_temp[InstanceId]["region"] = region
ecs_dict_temp[InstanceId]["ip"] = instances["PrivateIpAddress"]
ecs_dict_temp[InstanceId]["cpu"] = f'{instances["CpuOptions"]["CoreCount"]*instances["CpuOptions"]["ThreadsPerCore"]}核'
ecs_dict_temp[InstanceId]["mem"] = "无"
ecs_dict_temp[InstanceId]["mem"] = "0"
ecs_dict_temp[InstanceId]["exp"] = "按量" # AWS仅按量
if isextip:
ecs_dict_temp[InstanceId]["ip"] = instances["PublicIpAddress"]
@ -114,7 +114,7 @@ def redis(account,region):
redis_dict_temp[CacheClusterId]["status"] = rdb["CacheClusterStatus"]
redis_dict_temp[CacheClusterId]["itype"] = rdb["Engine"]
redis_dict_temp[CacheClusterId]["ver"] = rdb["EngineVersion"]
redis_dict_temp[CacheClusterId]["mem"] = "无"
redis_dict_temp[CacheClusterId]["mem"] = "0"
redis_dict_temp[CacheClusterId]["exp"] = "按量"
redis_dict.update(redis_dict_temp)
@ -166,9 +166,9 @@ def rds(account,region):
rds_dict_temp[DBInstanceId]["itype"] = db["Engine"]
rds_dict_temp[DBInstanceId]["ver"] = db["EngineVersion"]
rds_dict_temp[DBInstanceId]["exp"] = "按量"
rds_dict_temp[DBInstanceId]["cpu"] = "无"
rds_dict_temp[DBInstanceId]["mem"] = "无"
rds_dict_temp[DBInstanceId]["disk"] = "无"
rds_dict_temp[DBInstanceId]["cpu"] = "0"
rds_dict_temp[DBInstanceId]["mem"] = "0"
rds_dict_temp[DBInstanceId]["disk"] = "0"
rds_dict.update(rds_dict_temp)
count = len(rds_dict)