feat(backend): 全局检索接口优化 #2827

TencentBlueKing · Dec 26, 2023 · b21f86c · b21f86c
1 parent 2a5cf9a
commit b21f86c
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 14 deletions.
diff --git a/dbm-ui/backend/bk_dataview/datasources/bk_monitor_datasource.yaml b/dbm-ui/backend/bk_dataview/datasources/bk_monitor_datasource.yaml
@@ -28,10 +28,16 @@ datasources:
       keepCookies:
         - bk_uid
       baseUrl: ${BKMONITOR_URL}/rest/v2/grafana/
-#  - name: 日志平台
-#    type: bk_log_datasource
-#    access: direct
-#    isDefault: false
-#    url: ""
-#    jsonData:
-#      baseUrl: ${BKMONITOR_URL}/rest/v2/grafana/bk_log_search/
+  - name: 日志平台
+    type: bk_log_datasource
+    access: proxy
+    isDefault: false
+    url: ""
+    secureJsonData:
+      token: ${BKM_DBM_TOKEN}
+    jsonData:
+      bizId: ${DBA_APP_BK_BIZ_ID}
+      useToken: true
+      keepCookies:
+        - bk_uid
+      baseUrl: ${BKMONITOR_URL}/rest/v2/grafana/bk_log_search/
diff --git a/dbm-ui/backend/db_services/quick_search/constants.py b/dbm-ui/backend/db_services/quick_search/constants.py
@@ -20,6 +20,7 @@ class ResourceType(str, StructuredEnum):
     TICKET = EnumField("ticket", _("单号"))
     TASK = EnumField("task", _("任务"))
     MACHINE = EnumField("machine", _("主机"))
+    RESOURCE_POOL = EnumField("resource_pool", _("资源池主机"))
 
 
 class FilterType(str, StructuredEnum):

diff --git a/dbm-ui/backend/db_services/quick_search/handlers.py b/dbm-ui/backend/db_services/quick_search/handlers.py
@@ -11,6 +11,7 @@
 from django.db.models import F, Q
 from django.forms import model_to_dict
 
+from backend.components.dbresource.client import DBResourceApi
 from backend.db_meta.enums import ClusterType
 from backend.db_meta.models import Cluster, Machine, ProxyInstance, StorageInstance
 from backend.db_services.quick_search.constants import FilterType, ResourceType
@@ -205,3 +206,6 @@ def filter_ticket(self, keyword_list: list):
                 "id", "creator", "create_at", "bk_biz_id", "ticket_type", "group", "status", "is_reviewed"
             )
         )
+
+    def filter_resource_pool(self, keyword_list: list):
+        return DBResourceApi.resource_list({"hosts": keyword_list, "limit": self.limit, "offset": 0})["details"]
diff --git a/dbm-ui/backend/utils/excel.py b/dbm-ui/backend/utils/excel.py
@@ -157,9 +157,10 @@ def response(cls, wb: Workbook, excel_name: str) -> HttpResponse:
         # 设置response格式并写入bytes
         response = HttpResponse(
             content=save_virtual_workbook(wb),
-            content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            content_type="application/octet-stream",
         )
         response["Content-Disposition"] = f"attachment;filename={excel_name}"
+        response["Access-Control-Expose-Headers"] = "content-disposition"
         return response
 
     @classmethod

diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml
@@ -79,5 +79,5 @@ dependencies:
 description: A Helm chart for bk-dbm
 name: bk-dbm
 type: application
-version: 1.3.0-alpha.30
-appVersion: 1.3.0-alpha.30
+version: 1.3.0-alpha.31
+appVersion: 1.3.0-alpha.31
diff --git a/helm-charts/bk-dbm/charts/backup-server/Chart.yaml b/helm-charts/bk-dbm/charts/backup-server/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.0.1-alpha.46
+appVersion: 0.0.1-alpha.47
 description: A Helm chart for backup-server
 name: backup-server
 type: application

diff --git a/helm-charts/bk-dbm/charts/db-resource/Chart.yaml b/helm-charts/bk-dbm/charts/db-resource/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.0.1-alpha.80
+appVersion: 0.0.1-alpha.81
 description: A Helm chart for Kubernetes
 name: db-resource
 type: application

diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.3.0-alpha.231
+appVersion: 1.3.0-alpha.237
 description: A Helm chart for dbm
 name: dbm
 type: application

diff --git a/helm-charts/bk-dbm/charts/hadb-api/Chart.yaml b/helm-charts/bk-dbm/charts/hadb-api/Chart.yaml
@@ -3,4 +3,4 @@ name: hadb-api
 description: A Helm chart for Kubernetes
 type: application
 version: 0.0.11
-appVersion: 0.0.1-alpha.25
+appVersion: 0.0.1-alpha.26