feat: 修改time_series.py 和ds_rt.py 文件下租户id取默认值的逻辑 --story=126984615 #7910

1StephenCurry1 · 2025-09-02T07:33:17Z

No description provided.

…1126913310' into feat/metadata-time_series-ds_rt-tenant_id/#1010158081126984615

…#1010158081126984615

Copilot

Pull Request Overview

This PR modifies the tenant ID default value logic in time_series.py and ds_rt.py files by standardizing the handling of tenant IDs across multiple modules. The changes ensure proper tenant ID management in multi-tenant environments by requiring explicit tenant ID parameters instead of using default values internally.

Key changes:

Modified function signatures to require explicit bk_tenant_id parameters
Updated test files to pass tenant ID parameters explicitly
Added proper tenant ID retrieval logic using space_uid mapping functions

Reviewed Changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
bkmonitor/metadata/tests/space/test_space_router.py	Updated test to pass DEFAULT_TENANT_ID as bk_tenant_id parameter
bkmonitor/metadata/tests/space/test_compose_space_to_result_table_data.py	Modified test calls to include DEFAULT_TENANT_ID parameter
bkmonitor/metadata/task/tasks.py	Added tenant ID retrieval logic using space_uid mapping
bkmonitor/metadata/task/sync_space.py	Implemented tenant-based grouping for space router operations
bkmonitor/metadata/resources/vm.py	Updated RequestSerializer to include bk_tenant_id field
bkmonitor/metadata/resources/resources.py	Standardized tenant ID handling across multiple resource classes
bkmonitor/metadata/models/storage.py	Updated function call to include bk_tenant_id parameter
bkmonitor/metadata/models/space/space_table_id_redis.py	Modified method signatures to require explicit bk_tenant_id parameters
bkmonitor/metadata/models/space/ds_rt.py	Updated function signatures to make bk_tenant_id a required parameter
bkmonitor/metadata/models/record_rule/rules.py	Added tenant ID retrieval logic for space operations
bkmonitor/metadata/management/commands/access_bkdata_vm.py	Added tenant ID retrieval using space_uid mapping
bkmonitor/bkmonitor/utils/tenant.py	Added new utility function for tenant ID conversion
bkmonitor/apm/models/datasource.py	Updated APM models to use proper tenant ID retrieval
bkmonitor/apm/core/handlers/bk_data/virtual_metric.py	Modified to use tenant ID conversion functions
bkmonitor/apm/core/handlers/bk_data/flow.py	Updated flow handling to use proper tenant ID retrieval
bkmonitor/apm/core/discover/precalculation/storage.py	Added tenant ID parameters for storage operations
bkmonitor/apm/core/discover/precalculation/consul_handler.py	Updated to use application tenant ID

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-09-02T07:46:18Z

bkmonitor/metadata/task/sync_space.py

+    bk_tenant_id: str | None = DEFAULT_TENANT_ID,
    space_type: str | None = None,
    space_id: str | None = None,
    space_id_list: list[str] | None = None,
    is_publish: bool | None = True,


Moving bk_tenant_id to the first parameter position changes the function signature. This is a breaking change that could affect existing callers. Consider maintaining backward compatibility by keeping the original parameter order or providing a deprecation period.

Suggested change

bk_tenant_id: str | None = DEFAULT_TENANT_ID,

space_type: str | None = None,

space_id: str | None = None,

space_id_list: list[str] | None = None,

is_publish: bool | None = True,

space_type: str | None = None,

space_id: str | None = None,

space_id_list: list[str] | None = None,

is_publish: bool | None = True,

bk_tenant_id: str | None = DEFAULT_TENANT_ID,

Copilot · 2025-09-02T07:46:18Z

bkmonitor/metadata/task/sync_space.py

+                tid_ds = get_space_table_id_data_id(
+                    space_type=space["space_type"], space_id=space["space_id"], bk_tenant_id=DEFAULT_TENANT_ID


Using DEFAULT_TENANT_ID instead of the actual tenant ID space['bk_tenant_id'] defeats the purpose of multi-tenant support. This should use the space's actual tenant ID.

Suggested change

tid_ds = get_space_table_id_data_id(

space_type=space["space_type"], space_id=space["space_id"], bk_tenant_id=DEFAULT_TENANT_ID

space_type=space["space_type"], space_id=space["space_id"], bk_tenant_id=space["bk_tenant_id"]

Copilot · 2025-09-02T07:46:18Z

bkmonitor/metadata/task/sync_space.py

+        space_client.push_table_id_detail(
+            table_id_list=table_id_list,
+            is_publish=is_publish,
+            include_es_table_ids=True,
+            bk_tenant_id=DEFAULT_TENANT_ID,
+        )


Using DEFAULT_TENANT_ID hardcoded value contradicts the multi-tenant logic implemented elsewhere in this function. This should use the appropriate tenant ID from the space context.

Copilot · 2025-09-02T07:46:19Z

bkmonitor/metadata/models/space/ds_rt.py

-def get_cluster_data_ids(
-    cluster_id_list: list, table_id_list: list | None = None, bk_tenant_id: str | None = DEFAULT_TENANT_ID
-) -> dict:
+def get_cluster_data_ids(cluster_id_list: list, bk_tenant_id: str, table_id_list: list | None = None) -> dict:


The parameter order change (moving bk_tenant_id to the second position) is a breaking change. Consider maintaining backward compatibility or documenting this as a breaking change.

Suggested change

def get_cluster_data_ids(cluster_id_list: list, bk_tenant_id: str, table_id_list: list | None = None) -> dict:

def get_cluster_data_ids(bk_tenant_id: str, cluster_id_list: list, table_id_list: list | None = None) -> dict:

Copilot · 2025-09-02T07:46:19Z

bkmonitor/apm/core/handlers/bk_data/virtual_metric.py

+        apm_flow_ins = ApmFlow(
+            bk_biz_id=self.bk_biz_id, app_name=self.app_name, data_id=self.metric_datasource.bk_data_id, config=None
+        )
+        params = apm_flow_ins.get_deploy_params(


Creating an ApmFlow instance just to call get_deploy_params is inefficient. Since get_deploy_params was changed from a class method to an instance method, consider if this instantiation is necessary or if the method should remain as a class method.

Suggested change

apm_flow_ins = ApmFlow(

bk_biz_id=self.bk_biz_id, app_name=self.app_name, data_id=self.metric_datasource.bk_data_id, config=None

)

params = apm_flow_ins.get_deploy_params(

params = ApmFlow.get_deploy_params(

…6984615' of github.com:1StephenCurry1/bk-monitor into feat/metadata-time_series-ds_rt-tenant_id/#1010158081126984615

1StephenCurry1 added 4 commits August 29, 2025 15:05

修改resource的租户id逻辑

202b5ec

解决分支冲突

d52d5b0

Merge branch 'feat/metadata-resource-bkdata_link-tenant_id/#101015808…

58b7a96

…1126913310' into feat/metadata-time_series-ds_rt-tenant_id/#1010158081126984615

修改models下ds_rt的默认租户id逻辑

85eb21c

1StephenCurry1 added feat A new feature. Correlates with MINOR in SemVer project/monitor project monitor labels Sep 2, 2025

1StephenCurry1 requested a review from Copilot September 2, 2025 07:43

Merge branch 'master' into feat/metadata-time_series-ds_rt-tenant_id/…

e7d6e75

…#1010158081126984615

Copilot AI reviewed Sep 2, 2025

View reviewed changes

1StephenCurry1 added 2 commits September 8, 2025 11:57

修改 push_and_publish_space_router 被command调用时，租户id没有传入的问题

6d4d99c

Merge branch 'feat/metadata-time_series-ds_rt-tenant_id/#101015808112…

ed01e8c

…6984615' of github.com:1StephenCurry1/bk-monitor into feat/metadata-time_series-ds_rt-tenant_id/#1010158081126984615

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

feat: 修改time_series.py 和ds_rt.py 文件下租户id取默认值的逻辑 --story=126984615 #7910

feat: 修改time_series.py 和ds_rt.py 文件下租户id取默认值的逻辑 --story=126984615 #7910

Uh oh!

1StephenCurry1 commented Sep 2, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Copilot AI Sep 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		tid_ds = get_space_table_id_data_id(
		space_type=space["space_type"], space_id=space["space_id"], bk_tenant_id=DEFAULT_TENANT_ID

	def get_cluster_data_ids(cluster_id_list: list, bk_tenant_id: str, table_id_list: list \| None = None) -> dict:
	def get_cluster_data_ids(bk_tenant_id: str, cluster_id_list: list, table_id_list: list \| None = None) -> dict:

Uh oh!

feat: 修改time_series.py 和ds_rt.py 文件下租户id取默认值的逻辑 --story=126984615 #7910

Are you sure you want to change the base?

feat: 修改time_series.py 和ds_rt.py 文件下租户id取默认值的逻辑 --story=126984615 #7910

Uh oh!

Conversation

1StephenCurry1 commented Sep 2, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant