From a54bed0850c5c0004af5a533958625e28bcb3887 Mon Sep 17 00:00:00 2001 From: alex-smile <443677891@qq.com> Date: Mon, 21 Jun 2021 17:21:15 +0800 Subject: [PATCH 1/2] up --- paas2/esb/esb/component/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paas2/esb/esb/component/base.py b/paas2/esb/esb/component/base.py index 02e0730cf..4e4085e32 100644 --- a/paas2/esb/esb/component/base.py +++ b/paas2/esb/esb/component/base.py @@ -76,7 +76,7 @@ def current_user(self): def current_user(self, value): self._current_user = value - def invoke(self, kwargs={}, use_test_env=False, request_id=None, is_dummy=False, app_code="", timeout=None): + def invoke(self, kwargs={}, use_test_env=False, request_id="", is_dummy=False, app_code="", timeout=None): """ 调用一个组件,需要注意的是,当这个组件实例被一个wsgi_request初始化过以后, 是不需要传入后面这些额外的参数的。 From d6348243496b64e546066bbb15bd61e2ad2a9bcb Mon Sep 17 00:00:00 2001 From: alex-smile <443677891@qq.com> Date: Tue, 22 Jun 2021 17:31:08 +0800 Subject: [PATCH 2/2] update bk_log confapis --- paas2/esb/components/confapis/bk_log/bk_log.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/paas2/esb/components/confapis/bk_log/bk_log.yaml b/paas2/esb/components/confapis/bk_log/bk_log.yaml index 59ea4ec70..924b22e05 100644 --- a/paas2/esb/components/confapis/bk_log/bk_log.yaml +++ b/paas2/esb/components/confapis/bk_log/bk_log.yaml @@ -233,6 +233,17 @@ dest_http_method: POST is_hidden: True +- path: /v2/bk_log/databus_collectors/list_collectors_by_host/ + name: list_collectors_by_host + label: 日志平台-根据IP获取采集项列表 + label_en: bk_log list collector by host + method: GET + api_type: query + comp_codename: generic.v2.bk_log.bk_log_component + dest_path: /api/v1/databus/collectors/list_collectors_by_host/ + dest_http_method: GET + is_hidden: True + - path: /v2/bk_log/databus_storage/ name: list_databus_storage label: 日志平台-存储列表