fix(backend): 修复 redis 详情查询失败的问题 #2413

dbm-ui/backend/bk_web/middleware.py

@@ -8,7 +8,6 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-import json
 import logging
 
 from blueapps.account.middlewares import LoginRequiredMiddleware

dbm-ui/backend/components/bkmonitorv3/client.py

@@ -9,7 +9,6 @@
 specific language governing permissions and limitations under the License.
 """
 import logging
-from urllib.parse import urljoin
 
 from django.utils.translation import ugettext_lazy as _
 

dbm-ui/backend/components/domains.py

@@ -9,8 +9,6 @@
 specific language governing permissions and limitations under the License.
 """
 
-from django.conf import settings
-
 from backend import env
 
 ESB_PREFIX = "/api/c/compapi/v2/"

dbm-ui/backend/configuration/admin.py

@@ -15,8 +15,8 @@
 
 @admin.register(models.DBAdministrator)
 class DBAAdmin(admin.ModelAdmin):
-    list_display = ("bk_biz_id", "db_type")
-    list_filter = ("db_type", "users")
+    list_display = ("bk_biz_id", "db_type", "users")
+    list_filter = ("db_type",)
     search_fields = ("users",)
 
 

dbm-ui/backend/configuration/handlers/password.py

@@ -10,7 +10,7 @@
 """
 import base64
 from collections import defaultdict
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List
 
 from django.utils.translation import ugettext as _
 from django_celery_beat.schedulers import ModelEntry

dbm-ui/backend/configuration/models/ip_whitelist.py

@@ -16,9 +16,9 @@
 from django.forms.models import model_to_dict
 from django.utils.translation import ugettext_lazy as _
 
-from backend.bk_web.constants import LEN_LONG, LEN_SHORT
+from backend.bk_web.constants import LEN_LONG
 from backend.bk_web.models import AuditedModel
-from backend.configuration.constants import PLAT_BIZ_ID, DBType
+from backend.configuration.constants import PLAT_BIZ_ID
 
 
 class IPWhitelist(AuditedModel):

dbm-ui/backend/configuration/models/system.py

@@ -19,7 +19,6 @@
 from backend.bk_web.constants import LEN_LONG, LEN_NORMAL
 from backend.bk_web.models import AuditedModel
 from backend.configuration import constants
-from backend.configuration.constants import BizSettingsEnum, SystemSettingsEnum
 
 logger = logging.getLogger("root")
 

dbm-ui/backend/configuration/serializers.py

@@ -16,7 +16,7 @@
 from backend.bk_web.constants import LEN_NORMAL, LEN_SHORT
 from backend.bk_web.serializers import AuditedSerializer
 from backend.configuration import mock_data
-from backend.configuration.constants import DEFAULT_SETTINGS, DBType
+from backend.configuration.constants import DBType
 from backend.configuration.mock_data import BIZ_SETTINGS_DATA, PASSWORD_POLICY, VERIFY_PASSWORD_DATA
 from backend.configuration.models.function_controller import FunctionController
 from backend.configuration.models.ip_whitelist import IPWhitelist

dbm-ui/backend/configuration/views/system.py

@@ -8,10 +8,7 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-import operator
-from functools import reduce
 
-from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import status
 from rest_framework.decorators import action
@@ -20,7 +17,6 @@
 from backend import env
 from backend.bk_web import viewsets
 from backend.bk_web.swagger import common_swagger_auto_schema
-from backend.components import domains
 from backend.configuration.constants import DISK_CLASSES, SystemSettingsEnum
 from backend.configuration.models.system import BizSettings, SystemSettings
 from backend.configuration.serializers import (

dbm-ui/backend/db_dirty/constants.py

@@ -11,6 +11,4 @@
 
 from django.utils.translation import ugettext_lazy as _
 
-from backend.ticket.constants import TicketType
-
 SWAGGER_TAG = _("污点池")

dbm-ui/backend/db_dirty/filters.py

@@ -13,7 +13,6 @@
 from django_filters import rest_framework as filters
 
 from backend.db_dirty.models import DirtyMachine
-from backend.ticket.constants import TicketType
 
 
 class DirtyMachineFilter(filters.FilterSet):

dbm-ui/backend/db_dirty/views.py

@@ -8,7 +8,6 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-from collections import defaultdict
 
 from django.utils.translation import ugettext_lazy as _
 from django_filters import rest_framework
@@ -19,7 +18,6 @@
 from backend.bk_web import viewsets
 from backend.bk_web.pagination import AuditedLimitOffsetPagination
 from backend.bk_web.swagger import common_swagger_auto_schema
-from backend.components import CCApi
 from backend.db_dirty.constants import SWAGGER_TAG
 from backend.db_dirty.filters import DirtyMachineFilter
 from backend.db_dirty.handlers import DBDirtyMachineHandler

dbm-ui/backend/db_event/apps.py

@@ -11,7 +11,6 @@
 import logging
 
 from django.apps import AppConfig
-from django.db.models.signals import post_migrate
 
 logger = logging.getLogger("root")
 

dbm-ui/backend/db_meta/admin.py

@@ -22,23 +22,23 @@ class AppAdmin(admin.ModelAdmin):
 
 @admin.register(models.app.AppCache)
 class AppCacheAdmin(admin.ModelAdmin):
-    list_display = ("bk_biz_id", "bk_biz_name")
+    list_display = ("bk_biz_id", "bk_biz_name", "db_app_abbr")
     list_filter = ("bk_biz_name",)
-    search_fields = (
-        "bk_biz_id",
-        "bk_biz_name",
-    )
+    search_fields = ("bk_biz_id", "bk_biz_name", "db_app_abbr")
 
 
 @admin.register(models.city_map.LogicalCity)
 class LogicalCityAdmin(admin.ModelAdmin):
-    list_display = ("name",)
+    list_display = (
+        "id",
+        "name",
+    )
     search_fields = ("name",)
 
 
 @admin.register(models.city_map.BKCity)
 class BKCityAdmin(admin.ModelAdmin):
-    list_display = ("bk_idc_city_id", "bk_idc_city_name", "logical_city")
+    list_display = ("bk_idc_city_id", "bk_idc_city_name", "logical_city_id", "logical_city")
     list_filter = ("logical_city",)
     search_fields = ("bk_idc_city_name",)
 

dbm-ui/backend/db_meta/api/cluster/base/handler.py

@@ -12,7 +12,6 @@
 
 from django.db import transaction
 
-from backend.constants import DEFAULT_BK_CLOUD_ID
 from backend.db_meta.exceptions import ClusterNotExistException
 from backend.db_meta.models import Cluster
 

dbm-ui/backend/db_meta/api/cluster/es/create.py

@@ -15,9 +15,8 @@
 
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import ClusterEntryType, ClusterPhase, ClusterStatus, ClusterType, InstanceRole, MachineType
-from backend.db_meta.models import Cluster, ClusterEntry, ClusterMonitorTopo, StorageInstance
-from backend.flow.consts import InstanceFuncAliasEnum
+from backend.db_meta.enums import ClusterEntryType, ClusterPhase, ClusterStatus, ClusterType, InstanceRole
+from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance
 from backend.flow.utils.es.es_module_operate import EsCCTopoOperator
 
 logger = logging.getLogger("root")

dbm-ui/backend/db_meta/api/cluster/es/scale_up.py

@@ -15,7 +15,7 @@
 
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import InstanceRole, MachineType
+from backend.db_meta.enums import InstanceRole
 from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance
 from backend.flow.utils.es.es_module_operate import EsCCTopoOperator
 

dbm-ui/backend/db_meta/api/cluster/es/shrink.py

@@ -16,8 +16,7 @@
 
 from backend.db_meta import request_validator
 from backend.db_meta.enums import ClusterType, InstanceRole, MachineType
-from backend.db_meta.models import Cluster, ClusterEntry, ClusterMonitorTopo, StorageInstance
-from backend.flow.consts import InstanceFuncAliasEnum
+from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance
 from backend.flow.utils.cc_manage import CcManage
 from backend.flow.utils.es.es_module_operate import EsCCTopoOperator
 

dbm-ui/backend/db_meta/api/cluster/mongocluster/create.py

@@ -17,11 +17,7 @@
 from backend.constants import DEFAULT_BK_CLOUD_ID
 from backend.db_meta import request_validator
 from backend.db_meta.api.cluster.nosqlcomm.create_cluster import update_cluster_type
-from backend.db_meta.api.cluster.nosqlcomm.create_instances import (
-    create_mongo_instances,
-    create_mongo_mutil_instances,
-    create_proxies,
-)
+from backend.db_meta.api.cluster.nosqlcomm.create_instances import create_mongo_mutil_instances, create_proxies
 from backend.db_meta.api.cluster.nosqlcomm.precheck import (
     before_create_domain_precheck,
     before_create_proxy_precheck,

dbm-ui/backend/db_meta/api/cluster/nosqlcomm/create_instances.py

@@ -12,7 +12,6 @@
 import traceback
 
 from django.db import transaction
-from django.utils.translation import gettext_lazy as _
 
 from backend.db_meta.api import machine, proxy_instance, storage_instance, storage_instance_tuple
 from backend.db_meta.enums import InstanceRole

dbm-ui/backend/db_meta/api/cluster/nosqlcomm/detail_cluster.py

@@ -9,15 +9,12 @@
 specific language governing permissions and limitations under the License.
 """
 import logging
-from typing import Dict, List, Optional
 
-from django.db.models import Q
 from django.utils.translation import gettext as _
 
-from backend.db_meta import flatten, request_validator, validators
 from backend.db_meta.api.cluster.base.graph import ForeignRelationType, Graphic, Group, LineLabel
-from backend.db_meta.enums import ClusterType, InstanceInnerRole, InstanceRole, MachineType
-from backend.db_meta.models import Cluster, ProxyInstance, StorageInstance, StorageInstanceTuple
+from backend.db_meta.enums import InstanceInnerRole
+from backend.db_meta.models import Cluster, StorageInstanceTuple
 
 logger = logging.getLogger("root")
 

dbm-ui/backend/db_meta/api/cluster/nosqlcomm/other.py

@@ -11,7 +11,7 @@
 
 import logging
 import traceback
-from typing import List, Optional
+from typing import List
 
 from backend.db_meta import flatten
 from backend.db_meta.models import Cluster

dbm-ui/backend/db_meta/api/cluster/nosqlcomm/precheck.py

@@ -8,10 +8,6 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-import logging
-import traceback
-
-from django.utils.translation import gettext_lazy as _
 
 from backend.db_meta.api import common
 from backend.db_meta.enums import ClusterEntryType

dbm-ui/backend/db_meta/api/cluster/pulsar/create.py

@@ -15,9 +15,8 @@
 
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import ClusterEntryType, ClusterPhase, ClusterStatus, ClusterType, InstanceRole, MachineType
-from backend.db_meta.models import Cluster, ClusterEntry, ClusterMonitorTopo, StorageInstance
-from backend.flow.consts import InstanceFuncAliasEnum
+from backend.db_meta.enums import ClusterEntryType, ClusterPhase, ClusterStatus, ClusterType, InstanceRole
+from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance
 from backend.flow.utils.pulsar.pulsar_module_operate import PulsarCCTopoOperator
 
 logger = logging.getLogger("root")

dbm-ui/backend/db_meta/api/cluster/pulsar/replace.py

@@ -13,11 +13,8 @@
 
 from django.db import transaction
 
-from backend import env
-from backend.components import CCApi
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import MachineType
 from backend.db_meta.models import Cluster, StorageInstance
 from backend.flow.utils.cc_manage import CcManage
 from backend.flow.utils.pulsar.pulsar_module_operate import PulsarCCTopoOperator

dbm-ui/backend/db_meta/api/cluster/pulsar/scale_up.py

@@ -15,7 +15,6 @@
 
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import MachineType
 from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance
 from backend.flow.utils.pulsar.pulsar_module_operate import PulsarCCTopoOperator
 

dbm-ui/backend/db_meta/api/cluster/pulsar/shrink.py

@@ -13,8 +13,6 @@
 
 from django.db import transaction
 
-from backend import env
-from backend.components import CCApi
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
 from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance

dbm-ui/backend/db_meta/api/cluster/riak/create.py

@@ -16,10 +16,9 @@
 
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import ClusterEntryType, ClusterPhase, ClusterStatus, ClusterType, MachineType
+from backend.db_meta.enums import ClusterEntryType, ClusterPhase, ClusterStatus, ClusterType
 from backend.db_meta.exceptions import DBMetaException
-from backend.db_meta.models import Cluster, ClusterEntry, ClusterMonitorTopo, StorageInstance
-from backend.flow.consts import InstanceFuncAliasEnum
+from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance
 from backend.flow.utils.riak.riak_module_operate import RiakCCTopoOperator
 
 logger = logging.getLogger("root")

dbm-ui/backend/db_meta/api/cluster/riak/detail.py

@@ -11,7 +11,7 @@
 
 from django.utils.translation import gettext as _
 
-from backend.db_meta.api.cluster.base.graph import Graphic, LineLabel
+from backend.db_meta.api.cluster.base.graph import Graphic
 from backend.db_meta.enums import InstanceRole
 from backend.db_meta.models import Cluster
 

dbm-ui/backend/db_meta/api/cluster/riak/scale_out.py

@@ -15,7 +15,6 @@
 
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import MachineType
 from backend.db_meta.models import Cluster, ClusterEntry, StorageInstance
 from backend.flow.utils.riak.riak_module_operate import RiakCCTopoOperator
 

dbm-ui/backend/db_meta/api/cluster/tendbcluster/create_slave_cluster.py

@@ -7,7 +7,6 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-from typing import List, Optional
 
 from django.db import transaction
 from django.utils.translation import ugettext as _

dbm-ui/backend/db_meta/api/cluster/tendbha/add_proxy.py

@@ -12,7 +12,7 @@
 
 from django.db import transaction
 
-from backend.db_meta.enums import ClusterEntryType, InstanceInnerRole, InstanceStatus, MachineType
+from backend.db_meta.enums import ClusterEntryType, InstanceInnerRole, InstanceStatus
 from backend.db_meta.models import Cluster, ProxyInstance, StorageInstance
 from backend.flow.utils.mysql.mysql_module_operate import MysqlCCTopoOperator
 

dbm-ui/backend/db_meta/api/cluster/tendbsingle/create_cluster.py

@@ -14,7 +14,6 @@
 from django.db import transaction
 from django.utils.translation import ugettext as _
 
-from backend.constants import DEFAULT_BK_CLOUD_ID, DEFAULT_TIME_ZONE
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
 from backend.db_meta.enums import ClusterEntryType, ClusterPhase, ClusterStatus, ClusterType

dbm-ui/backend/db_meta/api/cluster/tendispluscluster/create.py

@@ -18,7 +18,7 @@
 from backend.constants import DEFAULT_BK_CLOUD_ID
 from backend.db_meta import request_validator
 from backend.db_meta.api import common
-from backend.db_meta.enums import ClusterEntryType, ClusterType, MachineType
+from backend.db_meta.enums import ClusterEntryType, ClusterType
 from backend.db_meta.models import Cluster, ClusterEntry, ProxyInstance, StorageInstance
 from backend.flow.utils.redis.redis_module_operate import RedisCCTopoOperator
 

dbm-ui/backend/db_meta/api/cluster/tendissingle/handler.py

@@ -8,13 +8,13 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-from typing import Dict, List, Optional
+from typing import List, Optional
 
 from django.db import transaction
 
 from backend.constants import DEFAULT_BK_CLOUD_ID
 from backend.db_meta.api.cluster.base.handler import ClusterHandler
-from backend.db_meta.api.cluster.nosqlcomm.decommission import decommission_backends, decommission_cluster
+from backend.db_meta.api.cluster.nosqlcomm.decommission import decommission_cluster
 from backend.db_meta.api.cluster.nosqlcomm.detail_cluster import scan_cluster
 from backend.db_meta.api.cluster.nosqlcomm.scale_tendis import make_sync_mms
 from backend.db_meta.enums import ClusterType

dbm-ui/backend/db_meta/api/common/common.py

@@ -13,9 +13,6 @@
 
 from django.db.models import Q, QuerySet
 
-from backend import env
-from backend.components import CCApi
-
 logger = logging.getLogger("root")