From e58c26f49ec56d66add753d5e8799b7a26a1d204 Mon Sep 17 00:00:00 2001 From: ZZYhho <39549651+ZZYhho@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:52:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20tencent=20redis=20other=20version=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flask-consul/units/cloud/tencent_cloud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask-consul/units/cloud/tencent_cloud.py b/flask-consul/units/cloud/tencent_cloud.py index 3d5b2ac..bd8093b 100644 --- a/flask-consul/units/cloud/tencent_cloud.py +++ b/flask-consul/units/cloud/tencent_cloud.py @@ -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", From d317f134e7de80743ffbed494713a9c0e07aff85 Mon Sep 17 00:00:00 2001 From: ZZYhho <39549651+ZZYhho@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:00:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20DescribeDBInstancesAsCsv=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=8B=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flask-consul/units/cloud/alicloud.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flask-consul/units/cloud/alicloud.py b/flask-consul/units/cloud/alicloud.py index 1dcafd1..f2788c9 100644 --- a/flask-consul/units/cloud/alicloud.py +++ b/flask-consul/units/cloud/alicloud.py @@ -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()}')