fix(backend): redis集群遗留问题 #10131

# Reviewed, transaction id: 39503

Author: ygcyao

dbm-ui/backend/db_services/dbbase/resources/query.py

@@ -855,8 +855,8 @@ def _list_machines(
             "bk_agent_id": Q(bk_agent_id=query_params.get("bk_agent_id")),
             "cluster_type": Q(cluster_type=query_params.get("cluster_type")),
             "instance_role": (
-                Q(storageinstance__instance_role=query_params.get("instance_role"))
-                | Q(proxyinstance__access_layer=query_params.get("instance_role"))
+                Q(storageinstance__instance_role=query_params.get("instance_role", "").split(","))
+                | Q(proxyinstance__access_layer=query_params.get("instance_role", "").split(","))
             ),
             "instance_status": (
                 Q(storageinstance__status=query_params.get("instance_status"))

dbm-ui/backend/db_services/dbbase/resources/serializers.py

@@ -150,7 +150,7 @@ class ListMachineSLZ(serializers.Serializer):
     bk_os_name = serializers.CharField(help_text=_("os名字"), required=False)
     bk_cloud_id = serializers.IntegerField(help_text=_("云区域ID"), required=False)
     bk_agent_id = serializers.CharField(help_text=_("agent id"), required=False)
-    instance_role = serializers.CharField(help_text=_("机器部署的实例角色"), required=False)
+    instance_role = serializers.CharField(help_text=_("机器部署的实例角色(多个过滤以逗号分隔)"), required=False)
     instance_status = serializers.ChoiceField(
         help_text=_("集群状态"), choices=InstanceStatus.get_choices(), required=False
     )

dbm-ui/backend/flow/engine/bamboo/scene/redis/redis_proxy_scale.py

@@ -285,7 +285,7 @@ def redis_proxy_scale_down_flow(self):
                 info.get("target_proxy_count", 0),
                 info.get("proxy_reduced_hosts", []),
             )
-            cluster_tpl = {**cluster_info, "bk_biz_id": self.data["bk_biz_id"]}
+            cluster_tpl = {**cluster_info, "bk_biz_id": self.data["bk_biz_id"], "cluster_id": info["cluster_id"]}
             act_kwargs = ActKwargs()
             act_kwargs.set_trans_data_dataclass = CommonContext.__name__
             act_kwargs.is_update_trans_data = True

dbm-ui/backend/ticket/builders/common/base.py

@@ -497,7 +497,10 @@ def patch_spec_details(self):
         spec_ids = set([int(spec_id) for spec_id in spec_ids if isinstance(spec_id, (int, str))])
         if not spec_ids:
             return
-        specs = {spec.spec_id: spec.get_spec_info() for spec in Spec.objects.filter(spec_id__in=spec_ids)}
+        specs = {
+            spec.spec_id: {**spec.get_spec_info(), "capacity": spec.capacity}
+            for spec in Spec.objects.filter(spec_id__in=spec_ids)
+        }
         self.ticket.details["specs"] = specs
 
     def patch_instance_details(self):

dbm-ui/backend/ticket/builders/tendbcluster/tendb_node_reblance.py

@@ -37,6 +37,7 @@ class NodeRebalanceItemSerializer(serializers.Serializer):
         # 前端额外需要参数，用于详情展示
         prev_cluster_spec_name = serializers.CharField(help_text=_("变更前的规格名"))
         prev_machine_pair = serializers.CharField(help_text=_("变更前机器组数"))
+        spec_id = serializers.IntegerField(help_text=_("变更前的规格id"), required=False)
 
     infos = serializers.ListSerializer(help_text=_("集群扩缩容信息"), child=NodeRebalanceItemSerializer())
     backup_source = serializers.ChoiceField(