Merge pull request #474 from TencentBlueKing/feat_bkbase_data_source

fix: 新建采集时选择计算平台已有数据源进行上报报错 --bug=135106919
TencentBlueKing · Dec 16, 2024 · d7e617c · d7e617c
2 parents 8f14504 + 8c79c7e
commit d7e617c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/src/backend/config/default.py b/src/backend/config/default.py
@@ -251,6 +251,7 @@
     "watermark": os.getenv("BKAPP_FEATURE_WATERMARK", "deny"),
     "bkvision": os.getenv("BKAPP_FEATURE_BKVISION", "deny"),
     "bknotice": os.getenv("BKAPP_FEATURE_BKNOTICE", "deny"),
+    "bkbase_data_source": os.getenv("BKAPP_FEATURE_BKBASE_DATA_SOURCE", "on"),
 }
 
 # BkLog

diff --git a/src/frontend/env.d.ts b/src/frontend/env.d.ts
@@ -41,7 +41,9 @@ declare interface Window {
   timezone: string;
 }
 
-declare module 'js-cookie'
+declare module 'js-cookie';
+
+declare module 'dompurify';
 
 declare module '@blueking/notice-component';
 

diff --git a/src/frontend/src/domain/service/collector-manage.ts b/src/frontend/src/domain/service/collector-manage.ts
@@ -317,4 +317,11 @@ export default {
     return CollectorSource.createApiPush(params)
       .then(({ data }) => data);
   },
+  /**
+   * @desc 是否显示：上报方式，计算平台已有数据源
+   */
+  fetchBkbaseFeature(params: {feature_id: string}) {
+    return CollectorSource.getBkbaseFeature(params)
+      .then(({ data }) => data);
+  },
 };
diff --git a/src/frontend/src/domain/source/collector-manage.ts b/src/frontend/src/domain/source/collector-manage.ts
@@ -238,6 +238,10 @@ class CollectorManage extends ModuleBase {
       payload,
     });
   }
+  // 判断上报方式，计算平台已有数据源是否显示
+  getBkbaseFeature(params: {feature_id: string}) {
+    return Request.get<Record<'enabled', boolean>>(`/api/v1/feature/${params.feature_id}/`);
+  }
 }
 
 export default new CollectorManage();
diff --git a/src/frontend/src/views/system-manage/collector-create/pages/step1/index.vue b/src/frontend/src/views/system-manage/collector-create/pages/step1/index.vue
@@ -30,7 +30,7 @@
             property="test">
             <bk-radio-group v-model="reportMethod">
               <bk-radio-button
-                v-for="item in reportMethodRadioList"
+                v-for="item in reportMethodRadioList.filter(item => showBkbase.enabled || item.id !== 'bkbase')"
                 :key="item.id"
                 class="form-raido-common"
                 :disabled="isEditMode"
@@ -334,7 +334,7 @@
     yaml_config: '',
   });
   const reportMethod = ref('newlog');
-  const reportMethodRadioList = [
+  const reportMethodRadioList = ref([
     {
       id: 'newlog',
       name: t('新建日志采集'),
@@ -343,7 +343,7 @@
       id: 'bkbase',
       name: t('计算平台已有数据源'),
     },
-  ];
+  ]);
   type environmentType = keyof typeof comMap
   const isEditMode = route.name === 'collectorEdit' || route.name === 'dataIdEdit';
   const formRef = ref();
@@ -518,6 +518,18 @@
     });
   }
 
+  const {
+    data: showBkbase,
+  }  = useRequest(CollectorManageService.fetchBkbaseFeature, {
+    defaultValue: {
+      enabled: false,
+    },
+    defaultParams: {
+      feature_id: 'bkbase_data_source',
+    },
+    manual: true,
+  });
+
 
   const {
     run: fecthDetail,