feat(backend): 多租户巡检报告改造 #13481

ygcyao · ygcyao · commit de0b593d7339 · 2025-10-15T15:22:24.000+08:00
# Reviewed, transaction id: 60634
diff --git a/dbm-ui/backend/db_periodic_task/local_tasks/mysql_backup/bklog_query.py b/dbm-ui/backend/db_periodic_task/local_tasks/mysql_backup/bklog_query.py
@@ -15,6 +15,7 @@
 from backend import env
 from backend.components.bklog.client import BKLogApi
 from backend.utils.string import pascal_to_snake
+from backend.utils.tenant import TenantHandler
 from backend.utils.time import datetime2str
 
 
@@ -37,6 +38,7 @@ def _get_log_from_bklog(bk_biz_id, collector, start_time, end_time, query_string
             "start": 0,
             "size": 6000,
             "sort_list": [["dtEventTimeStamp", "asc"], ["gseIndex", "asc"], ["iterationIndex", "asc"]],
+            "tenant_id": TenantHandler.get_tenant_id_by_biz(bk_biz_id),
         },
         use_admin=True,
     )
diff --git a/dbm-ui/backend/db_periodic_task/local_tasks/redis_backup/bklog_query.py b/dbm-ui/backend/db_periodic_task/local_tasks/redis_backup/bklog_query.py
@@ -18,6 +18,7 @@
 from backend import env
 from backend.components.bklog.client import BKLogApi
 from backend.utils.string import pascal_to_snake
+from backend.utils.tenant import TenantHandler
 from backend.utils.time import datetime2str
 
 logger = logging.getLogger("root")
@@ -43,6 +44,7 @@ def _get_log_from_bklog(
             "start": 0,
             "size": 6000,
             "sort_list": [["dtEventTimeStamp", "asc"], ["gseIndex", "asc"], ["iterationIndex", "asc"]],
+            "tenant_id": TenantHandler.get_tenant_id_by_biz(env.DBA_APP_BK_BIZ_ID),
         },
         use_admin=True,
     )
diff --git a/dbm-ui/backend/db_periodic_task/local_tasks/sqlserver/backup_file_check.py b/dbm-ui/backend/db_periodic_task/local_tasks/sqlserver/backup_file_check.py
@@ -22,6 +22,7 @@
 from backend.db_meta.models import Cluster
 from backend.db_report.models.sqlserver_check_report import SqlserverFullBackupInfoReport, SqlserverLogBackupInfoReport
 from backend.flow.utils.sqlserver.sqlserver_db_function import get_app_setting_data, get_routine_backup_dbs
+from backend.utils.tenant import TenantHandler
 
 logger = logging.getLogger("root")
 
@@ -96,7 +97,11 @@ def check_task(self):
             try:
                 if cluster.cluster_type == ClusterType.SqlserverSingle:
                     instance = cluster.storageinstance_set.get(instance_role=InstanceRole.ORPHAN)
-                    data, err = get_app_setting_data(instance=instance, bk_cloud_id=cluster.bk_cloud_id)
+                    data, err = get_app_setting_data(
+                        instance=instance,
+                        bk_cloud_id=cluster.bk_cloud_id,
+                        tenant_id=TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id),
+                    )
                     if err:
                         common_data["status"] = False
                         common_data["msg"] = err
diff --git a/dbm-ui/backend/db_periodic_task/local_tasks/sqlserver/check_app_setting_data.py b/dbm-ui/backend/db_periodic_task/local_tasks/sqlserver/check_app_setting_data.py
@@ -31,6 +31,7 @@
     get_app_setting_data,
     insert_sqlserver_config,
 )
+from backend.utils.tenant import TenantHandler
 
 logger = logging.getLogger("root")
 
@@ -156,7 +157,11 @@ def check_app_setting_data(self, cluster: Cluster):
 
         # 按照集群维度查询所有的实例，状态running中的
         for instance in cluster.storageinstance_set.filter(status=InstanceStatus.RUNNING):
-            data, err = get_app_setting_data(instance=instance, bk_cloud_id=cluster.bk_cloud_id)
+            data, err = get_app_setting_data(
+                instance=instance,
+                bk_cloud_id=cluster.bk_cloud_id,
+                tenant_id=TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id),
+            )
             if data is None:
                 # 如果返回是空则,则大概率是访问异常，录入异常信息,跳过这次的校验
                 SqlserverCheckAppSettingReport.objects.create(
@@ -204,6 +209,7 @@ def check_user(master_instance: StorageInstance, slave_instance: StorageInstance
             slave_instance=slave_instance,
             bk_cloud_id=cluster.bk_cloud_id,
             check_tag="user",
+            tenant_id=TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id),
         )
         if not status:
             SqlserverCheckUserSyncReport.objects.create(
@@ -229,6 +235,7 @@ def check_job(master_instance: StorageInstance, slave_instance: StorageInstance,
             slave_instance=slave_instance,
             bk_cloud_id=cluster.bk_cloud_id,
             check_tag="job",
+            tenant_id=TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id),
         )
         if not status:
             SqlserverCheckJobSyncReport.objects.create(
@@ -254,6 +261,7 @@ def check_link_server(master_instance: StorageInstance, slave_instance: StorageI
             slave_instance=slave_instance,
             bk_cloud_id=cluster.bk_cloud_id,
             check_tag="link_server",
+            tenant_id=TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id),
         )
         if not status:
             SqlserverCheckLinkServerReport.objects.create(
diff --git a/dbm-ui/backend/db_periodic_task/migrations/0014_mysqlbackuprecovertask_tenant_id.py b/dbm-ui/backend/db_periodic_task/migrations/0014_mysqlbackuprecovertask_tenant_id.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2025-10-11 10:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("db_periodic_task", "0013_auto_20250917_2108"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="mysqlbackuprecovertask",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+    ]
diff --git a/dbm-ui/backend/db_report/migrations/0020_auto_20251011_1758.py b/dbm-ui/backend/db_report/migrations/0020_auto_20251011_1758.py
@@ -0,0 +1,83 @@
+# Generated by Django 3.2.25 on 2025-10-11 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("db_report", "0019_auto_20250925_1446"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="checksumcheckreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="dbmonheartbeatreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="failoverdrillreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="metacheckreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="mongodbbackupcheckreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="mysqlbackupcheckreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="redisbackupcheckreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="sqlservercheckappsettingreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="sqlservercheckjobsyncreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="sqlserverchecklinkserverreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="sqlserverchecksysjobstatureport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="sqlservercheckusersyncreport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="sqlserverfullbackupinforeport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+        migrations.AddField(
+            model_name="sqlserverlogbackupinforeport",
+            name="tenant_id",
+            field=models.CharField(default="default", help_text="租户ID", max_length=128),
+        ),
+    ]
diff --git a/dbm-ui/backend/db_report/report_basemodel.py b/dbm-ui/backend/db_report/report_basemodel.py
@@ -12,6 +12,21 @@
 from django.utils.translation import ugettext_lazy as _
 
 from backend.bk_web.models import AuditedModel
+from backend.utils.tenant import TenantHandler
+
+
+class BaseReportManager(models.Manager):
+    def create(self, **kwargs):
+        # 获取租户id
+        bk_biz_id = kwargs.get("bk_biz_id")
+        kwargs["tenant_id"] = TenantHandler.get_tenant_id_by_biz(bk_biz_id)
+        return super().create(**kwargs)
+
+    def bulk_create(self, objs, **kwargs):
+        for obj in objs:
+            if not obj.tenant_id:
+                obj.tenant_id = TenantHandler.get_tenant_id_by_biz(obj.bk_biz_id)
+        return super().bulk_create(objs, **kwargs)
 
 
 class BaseReportABS(AuditedModel):
@@ -22,6 +37,9 @@ class BaseReportABS(AuditedModel):
     state = models.CharField(default="", max_length=64, help_text=_("巡检结果状态"))
     failed_days = models.IntegerField(default=0, help_text=_("失败持续天数"))
     msg = models.TextField(default="", help_text=_("备注信息"))
+    tenant_id = models.CharField(help_text=_("租户ID"), max_length=128, default="default")
+
+    objects = BaseReportManager()
 
     class Meta:
         abstract = True
diff --git a/dbm-ui/backend/db_report/report_baseview.py b/dbm-ui/backend/db_report/report_baseview.py
@@ -64,6 +64,9 @@ def summary_state_count(self):
         state_map.update({info["state"]: info["count"] for info in state_count_info})
         return state_map
 
+    def get_queryset(self):
+        return self.filter_by_tenant_id(super().get_queryset())
+
     def list(self, request, *args, **kwargs):
         response = super().list(request, *args, **kwargs)
         response.data["name"] = self.report_name or ReportType.get_choice_label(self.report_type)
diff --git a/dbm-ui/backend/flow/utils/sqlserver/sqlserver_bk_config.py b/dbm-ui/backend/flow/utils/sqlserver/sqlserver_bk_config.py
@@ -13,6 +13,7 @@
 from backend.db_meta.enums import ClusterType
 from backend.db_services.version.constants import SqlserverVersion
 from backend.flow.consts import ConfigTypeEnum
+from backend.utils.tenant import TenantHandler
 
 
 def get_module_infos(bk_biz_id: int, db_module_id: int, cluster_type: ClusterType) -> dict:
@@ -31,6 +32,7 @@ def get_module_infos(bk_biz_id: int, db_module_id: int, cluster_type: ClusterTyp
             "conf_type": "deploy",
             "namespace": cluster_type,
             "format": FormatType.MAP,
+            "tenant_id": TenantHandler.get_tenant_id_by_biz(bk_biz_id),
         }
     )["content"]
     return data
@@ -59,6 +61,7 @@ def get_sqlserver_config(
             "namespace": cluster_type,
             "format": FormatType.MAP_LEVEL,
             "method": ReqType.GENERATE_AND_PUBLISH,
+            "tenant_id": TenantHandler.get_tenant_id_by_biz(bk_biz_id),
         }
     )
     return data["content"]
@@ -82,6 +85,7 @@ def get_sqlserver_backup_config(bk_biz_id: int, cluster_domain: str, db_module_i
             "conf_type": "backup",
             "namespace": "sqlservercomm",
             "format": FormatType.MAP,
+            "tenant_id": TenantHandler.get_tenant_id_by_biz(bk_biz_id),
         }
     )["content"]
     return data
@@ -106,6 +110,7 @@ def get_sqlserver_alarm_config(bk_biz_id: int, cluster_domain: str, db_module_id
             "conf_type": "alarm",
             "namespace": "sqlservercomm",
             "format": FormatType.MAP,
+            "tenant_id": TenantHandler.get_tenant_id_by_biz(bk_biz_id),
         }
     )["content"]
     init_sql = data.pop("init_sql")
diff --git a/dbm-ui/backend/flow/utils/sqlserver/sqlserver_db_function.py b/dbm-ui/backend/flow/utils/sqlserver/sqlserver_db_function.py
@@ -29,17 +29,19 @@
 )
 from backend.flow.utils.mysql.db_table_filter import DbTableFilter
 from backend.flow.utils.mysql.get_mysql_sys_user import generate_mysql_tmp_user
+from backend.utils.tenant import TenantHandler
 
 logger = logging.getLogger("flow")
 
 
-def base_sqlserver_drs(instances: list, bk_cloud_id: int, sqls: list):
+def base_sqlserver_drs(instances: list, bk_cloud_id: int, sqls: list, tenant_id: str):
     return DRSApi.sqlserver_rpc(
         {
             "bk_cloud_id": bk_cloud_id,
             "addresses": instances,
             "cmds": sqls,
             "force": False,
+            "tenant_id": tenant_id,
         }
     )
 
@@ -681,6 +683,10 @@ def insert_sqlserver_config(
     else:
         sync_mode = ""
     drop_sql = "use Monitor truncate table [Monitor].[dbo].[APP_SETTING]"
+
+    # 获取租户id
+    tenant_id = TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id)
+
     for storage in storages:
         if is_get_old_backup_config:
             # 按照需求获取旧的备份配置
@@ -690,6 +696,7 @@ def insert_sqlserver_config(
                     "addresses": [storage.ip_port],
                     "cmds": [f"select * from [{SQLSERVER_CUSTOM_SYS_DB}].[dbo].[BACKUP_SETTING_OLD]"],
                     "force": False,
+                    "tenant_id": tenant_id,
                 }
             )
             if ret[0]["error_msg"]:
@@ -823,12 +830,12 @@ def insert_sqlserver_config(
     return True
 
 
-def get_app_setting_data(instance: StorageInstance, bk_cloud_id: int):
+def get_app_setting_data(instance: StorageInstance, bk_cloud_id: int, tenant_id: str):
     """
     根据实例查询app_setting表的结果
     """
     sql = f"select * from [{SQLSERVER_CUSTOM_SYS_DB}].[dbo].[APP_SETTING]"
-    ret = base_sqlserver_drs(bk_cloud_id=bk_cloud_id, instances=[instance.ip_port], sqls=[sql])
+    ret = base_sqlserver_drs(bk_cloud_id=bk_cloud_id, instances=[instance.ip_port], sqls=[sql], tenant_id=tenant_id)
     if ret[0]["error_msg"]:
         return None, f"select app_setting failed: {ret[0]['error_msg']}"
 
@@ -856,7 +863,12 @@ def fix_app_setting_data(cluster: Cluster, instance: StorageInstance, sync_mode:
 [MASTER_IP] = '{master.machine.ip}',
 [MASTER_PORT]= {master.port}
 """
-    ret = base_sqlserver_drs(bk_cloud_id=cluster.bk_cloud_id, instances=[instance.ip_port], sqls=[sql])
+    ret = base_sqlserver_drs(
+        bk_cloud_id=cluster.bk_cloud_id,
+        instances=[instance.ip_port],
+        sqls=[sql],
+        tenant_id=TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id),
+    )
     if ret[0]["error_msg"]:
         return False, f"fix app_setting failed: {ret[0]['error_msg']}"
 
@@ -871,7 +883,12 @@ def check_sys_job_status(cluster: Cluster, instance: StorageInstance):
         "select name, enabled from msdb.dbo.sysjobs where name like 'TC_%' and name "
         "not in('TC_SNAPSHOT_DAY','TC_SNAPSHOT_ONE','TC_REPORT_LOAD')"
     )
-    ret = base_sqlserver_drs(bk_cloud_id=cluster.bk_cloud_id, instances=[instance.ip_port], sqls=[sql])
+    ret = base_sqlserver_drs(
+        bk_cloud_id=cluster.bk_cloud_id,
+        instances=[instance.ip_port],
+        sqls=[sql],
+        tenant_id=TenantHandler.get_tenant_id_by_biz(cluster.bk_biz_id),
+    )
     msg = ""
     if ret[0]["error_msg"]:
         msg = f"[{instance.ip_port}] select sys job failed: {ret[0]['error_msg']}"
@@ -891,7 +908,7 @@ def check_sys_job_status(cluster: Cluster, instance: StorageInstance):
 
 
 def check_ha_config(
-    master_instance: StorageInstance, slave_instance: StorageInstance, bk_cloud_id: int, check_tag: str
+    master_instance: StorageInstance, slave_instance: StorageInstance, bk_cloud_id: int, check_tag: str, tenant_id: str
 ):
     """
     检查传入的源和目的的实例的业务账号是否一致
@@ -916,6 +933,7 @@ def check_ha_config(
         bk_cloud_id=bk_cloud_id,
         instances=[master_instance.ip_port, slave_instance.ip_port],
         sqls=[check_sql_map[check_tag]],
+        tenant_id=tenant_id,
     )
 
     if ret[0]["error_msg"] or ret[1]["error_msg"]:
diff --git a/dbm-ui/backend/utils/tenant.py b/dbm-ui/backend/utils/tenant.py
