diff --git a/paas2/VERSION b/paas2/VERSION index ec2744f08..0b235fae1 100644 --- a/paas2/VERSION +++ b/paas2/VERSION @@ -1 +1 @@ -2.12.54 +2.12.55 diff --git a/paas2/esb/components/bk/apis/bk_login/get_batch_user_platform_role.py b/paas2/esb/components/bk/apis/bk_login/get_batch_user_platform_role.py deleted file mode 100644 index 6c938b90c..000000000 --- a/paas2/esb/components/bk/apis/bk_login/get_batch_user_platform_role.py +++ /dev/null @@ -1,95 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS -Community Edition) available. -Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved. -Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. -You may obtain a copy of the License at http://opensource.org/licenses/MIT -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. -""" - -import json -from django import forms - -from common.forms import BaseComponentForm, ListField -from common.constants import API_TYPE_Q -from components.component import Component -from .toolkit import configs - - -class GetBatchUserPlatformRole(Component): - """ - apiLabel {{ _("获取多个用户在平台应用的角色") }} - apiMethod GET - - ### {{ _("功能描述") }} - - {{ _("获取多个用户在平台应用的角色") }} - - ### {{ _("请求参数") }} - - {{ common_args_desc }} - - #### {{ _("接口参数") }} - - | {{ _("字段") }} | {{ _("类型") }} | {{ _("必选") }} | {{ _("描述") }} | - |-----------|------------|--------|------------| - | username_list | string | {{ _("是") }} | {{ _("待获取信息的用户名列表") }} | - - ### {{ _("请求参数示例") }} - - ```python - { - "app_code": "esb_test", - "app_secret": "xxx", - "bk_token": "xxx", - "username_list": "admin;test" - } - ``` - - ### {{ _("返回结果示例") }} - - ```python - { - "result": true, - "code": "00", - "message": "OK", - "data": { - "admin": { - "bkdata": [1], - "job": [1], - "cmdb": [1, 2], - } - } - } - ``` - - ### {{ _("返回结果参数说明") }} - - | {{ _("字段") }} | {{ _("类型") }} | {{ _("描述") }} | - |-----------|-----------|-----------| - | data | object | {{ _("返回数据，成功返回请求数据") }} | - - #### data - - | {{ _("字段") }} | {{ _("类型") }} | {{ _("描述") }} | - |-----------|-----------|-----------| - | [user].[app].role | list | {{ _("用户角色，0：普通用户，1：超级管理员，2：开发者，3：职能化用户，4：审计员") }} | - """ - - sys_name = configs.SYSTEM_NAME - api_type = API_TYPE_Q - - class Form(BaseComponentForm): - bk_token = forms.CharField(label="login token", required=False) - username_list = ListField(label="username list", required=True) - - def handle(self): - self.response.payload = self.outgoing.http_client.post( - configs.host, - "/login/accounts/get_batch_user_platform_role/", - data=json.dumps(self.form_data), - headers=configs.headers, - ) diff --git a/paas2/esb/components/bk/apisv2/bk_login/get_batch_users_platform_role.py b/paas2/esb/components/bk/apisv2/bk_login/get_batch_users_platform_role.py deleted file mode 100644 index bd8eb8d75..000000000 --- a/paas2/esb/components/bk/apisv2/bk_login/get_batch_users_platform_role.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS -Community Edition) available. -Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved. -Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. -You may obtain a copy of the License at http://opensource.org/licenses/MIT -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on -an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. -""" - -import json -from django import forms - -from common.forms import BaseComponentForm, ListField -from common.constants import API_TYPE_Q, HTTP_METHOD -from components.component import Component -from .toolkit import configs, tools - - -class GetBatchUsersPlatformRole(Component): - suggest_method = HTTP_METHOD.POST - label = u"批量获取用户各平台角色信息" - label_en = "get role of the users in platforms" - - sys_name = configs.SYSTEM_NAME - api_type = API_TYPE_Q - - class Form(BaseComponentForm): - bk_username_list = ListField(label="username list", required=True) - bk_token = forms.CharField(label="login token", required=False) - - def handle(self): - client = tools.LOGINClient(self.outgoing.http_client) - self.response.payload = client.post( - host=configs.host, - path="/login/api/v2/get_batch_users_platform_role/", - data=json.dumps(self.form_data), - ) diff --git a/paas2/esb/components/confapis/bk_log/bk_log.yaml b/paas2/esb/components/confapis/bk_log/bk_log.yaml index defed6200..8c3368b98 100644 --- a/paas2/esb/components/confapis/bk_log/bk_log.yaml +++ b/paas2/esb/components/confapis/bk_log/bk_log.yaml @@ -287,6 +287,17 @@ dest_http_method: POST is_hidden: True +- path: /v2/bk_log/databus_collectors/pre_check/ + name: databus_collector_pre_check + label: 日志平台-预检查采集项英文名 + label_en: bk_log collector pre check + method: GET + api_type: query + comp_codename: generic.v2.bk_log.bk_log_component + dest_path: /api/v1/databus/collectors/pre_check/ + dest_http_method: GET + is_hidden: True + - path: /v2/bk_log/databus_collectors/{collector_config_id}/subscription_status/ name: databus_collector_subscription_status label: 日志平台-获取采集项订阅任务 diff --git a/paas2/esb/components/confapis/gsekit/apidocs/zh_hans/access_overview.md b/paas2/esb/components/confapis/gsekit/apidocs/zh_hans/access_overview.md new file mode 100644 index 000000000..0ff08c780 --- /dev/null +++ b/paas2/esb/components/confapis/gsekit/apidocs/zh_hans/access_overview.md @@ -0,0 +1,62 @@ +### 请求地址 + +/v2/gsekit/api/meta/access_overview/ + +### 请求方式 + +GET + +### 功能描述 + +业务接入情况概览 + +### 请求参数 + +{{ common_args_desc }} + +#### 接口参数 + +| 字段 | 类型 | 必选 | 描述 | +| --------- | ---- | ---- | ------ | +| bk_biz_id | int | 是 | 业务ID | + +### 请求参数示例 + +``` json +{ + "bk_biz_id": 2 +} +``` + +### 返回结果示例 + +```json +{ + "result": true, + "data": { + "is_access": true, + "process": true, + "configfile": true + }, + "code": 0, + "message": "" +} +``` + +### 返回结果参数说明 + +| 字段 | 类型 | 描述 | +| ------- | ------ | --------------------------------- | +| result | bool | 返回结果，true为成功，false为失败 | +| code | int | 返回码，0表示成功，其他值表示失败 | +| message | string | 返回信息 | +| data | dict | 详细结果，详见data定义 | + + +#### data + +| 字段 | 类型 | 描述 | +|------------|------|------------------------------------| +| is_access | bool | 是否已接入本系统，以下模块其中一个为 `true` 视为已接入本系统 | +| process | bool | 是否已接入进程相关功能 | +| configfile | bool | 是否已接入配置相关功能 | diff --git a/paas2/esb/components/confapis/gsekit/gsekit.yaml b/paas2/esb/components/confapis/gsekit/gsekit.yaml index d92e0586e..25df67408 100644 --- a/paas2/esb/components/confapis/gsekit/gsekit.yaml +++ b/paas2/esb/components/confapis/gsekit/gsekit.yaml @@ -57,3 +57,13 @@ path: /v2/gsekit/api/job/job_status/ dest_http_method: POST suggest_method: POST + +- api_type: query + comp_codename: generic.v2.gsekit.gsekit_component + name: access_overview + label: 业务接入情况概览 + label_en: null + dest_path: /o/bk_gsekit/api/{bk_biz_id}/meta/access_overview/ + path: /v2/gsekit/api/meta/access_overview/ + dest_http_method: GET + suggest_method: GET diff --git a/paas2/esb/components/confapis/itsm/apidocs/en/create_service_catalog.md b/paas2/esb/components/confapis/itsm/apidocs/en/create_service_catalog.md new file mode 100644 index 000000000..d03934b66 --- /dev/null +++ b/paas2/esb/components/confapis/itsm/apidocs/en/create_service_catalog.md @@ -0,0 +1,60 @@ +### Functional description + +ticket comment interface + +### Request Parameters + +{{ common_args_desc }} + +#### Interface Parameters + +| Field | Type | Required | Description | +| --------- | ------ | --- | -------------------------- | +| parent__id | int | YES | The parent catalog id | +| name | string | YES | catalog name | +| desc | string | NO | catalog desc | +| project_key | string | YES | project_id, default "0" | + + +### Request Parameters Example + +```json +{ + "parent__id": 2, + "name": "test", + "desc": "123", + "project_key": "0" +} +``` + +### Return Result Example + +```json +{ + "result": true, + "code": 0, + "message": "success", + "data": { + "id": 38, + "key": "4018b68b7987b5b0fdafcde492715ea1", + "level": 2, + "parent": 2, + "parent_name": "root>xxxx", + "parent_key": "FUWUFANKUI", + "parent__id": "2", + "parent__name": "xxxx", + "name": "test", + "desc": "", + "project_key": "0" + } +} +``` + +### Return Result Description + +| Field | Type | Description | +| ------- | --------- | ----------------------- | +| result | bool | true/false, indicate success or failure | +| code | int | return code. 0 indicates success, other values indicate failure | +| message | string | error message returned when result is false | +| data | object | return data | diff --git a/paas2/esb/components/confapis/itsm/apidocs/en/import_service.md b/paas2/esb/components/confapis/itsm/apidocs/en/import_service.md new file mode 100644 index 000000000..bbbf226bc --- /dev/null +++ b/paas2/esb/components/confapis/itsm/apidocs/en/import_service.md @@ -0,0 +1,78 @@ +### Functional description + +Import the service. Obtain the metadata from the service list and export the service. + +### Request Parameters + +{{ common_args_desc }} + +#### Interface Parameters + +| Field | Type | Required | Description | +|-----------|------------|--------|------------| +| key | string | YES | Service type | +| name | string | YES | service_name | +| catalog_id | int | YES | catalog id | +| desc | string | NO | service desc| +| owners | string | NO | service owners | +| can_ticket_agency | bool | YES | Could you replace the BILL of lading | +| is_valid | bool | YES | Whether to enable or disable the default value is false | +| display_type | string | YES | display type | +| display_role | string | YES | display role，Display_type is open and the value is null| +| source | string | YES | source| +| project_key | string | YES | project key| +| workflow | json | YES | workflow data| + + + +### Request Parameters Example + +``` json +{ + "key": "request", + "name": "测试服务", + "catalog_id":38, + "desc": "", + "owners": "admin", + "can_ticket_agency": false, + "is_valid": true, + "display_type": "OPEN", + "display_role": "", + "source": "custom", + "project_key": "0", + "workflow":{} +} +``` +### Return Result Example + +```json +{ + "result": true, + "code": 0, + "message": "success", + "data": { + "id": 94, + "name": "测试服务", + "service_type": "request", + "desc": "" + } +} +``` + +### Return Result Description + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|result| bool | 返回结果，true为成功，false为失败 | +|code|int|返回码，0表示成功，其他值表示失败| +|message|string|错误信息 +|data| object| 返回数据 | + +### data + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|id| int | 服务id | +|name|string|服务名| +|service_type|string|服务类型| +|desc| string| 服务描述 | diff --git a/paas2/esb/components/confapis/itsm/apidocs/en/operate_node.md b/paas2/esb/components/confapis/itsm/apidocs/en/operate_node.md index 61df81dd0..f2e35956c 100644 --- a/paas2/esb/components/confapis/itsm/apidocs/en/operate_node.md +++ b/paas2/esb/components/confapis/itsm/apidocs/en/operate_node.md @@ -28,6 +28,7 @@ operate ticket's state ### demo1：submit +The three keys correspond to the keys of the three fields of the approval node. The mandatory remarks are the remarks required when the approval is rejected ```json { "bk_app_secret": "xxxx", @@ -40,16 +41,21 @@ operate ticket's state "state_id": 4, "fields": [ { - "key": "SHENPIJIEGUO", - "value": "TONGYI" + "key": "11e8ac30a2247ddfaeef0cefd67c3d74", + "value": "true" }, { - "key": "SHENPIBEIZHU", - "value": "hello" + "key": "dda3d1ad8325d2c9b1f1bc913fa5ec15", + "value": "approve" + }, + { + "key": "322b6095ff3638e413ac772295b6d8e2", + "value": "reject" } ] } ``` +``` ### demo2：deliver diff --git a/paas2/esb/components/confapis/itsm/apidocs/en/update_service.md b/paas2/esb/components/confapis/itsm/apidocs/en/update_service.md new file mode 100644 index 000000000..b2c4a2c97 --- /dev/null +++ b/paas2/esb/components/confapis/itsm/apidocs/en/update_service.md @@ -0,0 +1,80 @@ +### Functional description + +Import the service. Obtain the metadata from the service list and export the service. + +### Request Parameters + +{{ common_args_desc }} + +#### Interface Parameters + +| Field | Type | Required | Description | +|-----------|------------|--------|------------| +| key | int | YES | Service Id | +| key | string | YES | Service type | +| name | string | YES | service_name | +| catalog_id | int | YES | catalog id | +| desc | string | NO | service desc| +| owners | string | NO | service owners | +| can_ticket_agency | bool | YES | Could you replace the BILL of lading | +| is_valid | bool | YES | Whether to enable or disable the default value is false | +| display_type | string | YES | display type | +| display_role | string | YES | display role，Display_type is open and the value is null| +| source | string | YES | source| +| project_key | string | YES | project key| +| workflow | json | YES | workflow data| + + + +### Request Parameters Example + +``` json +{ + "id":94, + "key": "request", + "name": "测试服务", + "catalog_id":38, + "desc": "", + "owners": "admin", + "can_ticket_agency": false, + "is_valid": true, + "display_type": "OPEN", + "display_role": "", + "source": "custom", + "project_key": "0", + "workflow":{} +} +``` +### Return Result Example + +```json +{ + "result": true, + "code": 0, + "message": "success", + "data": { + "id": 94, + "name": "测试服务", + "service_type": "request", + "desc": "" + } +} +``` + +### Return Result Description + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|result| bool | 返回结果，true为成功，false为失败 | +|code|int|返回码，0表示成功，其他值表示失败| +|message|string|错误信息 +|data| object| 返回数据 | + +### data + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|id| int | 服务id | +|name|string|服务名| +|service_type|string|服务类型| +|desc| string| 服务描述 | diff --git a/paas2/esb/components/confapis/itsm/apidocs/zh_hans/create_service_catalog.md b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/create_service_catalog.md new file mode 100644 index 000000000..2eca140d9 --- /dev/null +++ b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/create_service_catalog.md @@ -0,0 +1,61 @@ +### 功能描述 + +单据评论接口 + +### 请求参数 + +{{ common_args_desc }} + +#### 接口参数 + +| 字段 | 类型 | 必选 | 描述 | +| --------- | ------ | --- | -------------------------- | +| parent__id | int | 是 | 父级目录的id | +| name | string | 是 | 目录名 | +| desc | string | 否 | 目录描述 | +| project_key | string | 是 | 项目id，默认为"0" | + + +### 请求参数示例 + +```json +{ + "parent__id": 2, + "name": "测试目录", + "desc": "123", + "project_key": "0" +} +``` + +### 返回结果示例 + +```json +{ + "result": true, + "code": 0, + "message": "success", + "data": { + "id": 38, + "key": "4018b68b7987b5b0fdafcde492715ea1", + "level": 2, + "parent": 2, + "parent_name": "根目录>服务反馈", + "parent_key": "FUWUFANKUI", + "parent__id": "2", + "parent__name": "服务反馈", + "name": "测试目录", + "desc": "", + "project_key": "0" + } +} +``` + +### 返回结果参数说明 + +| 字段 | 类型 | 描述 | +| ------- | --------- | ----------------------- | +| result | bool | 返回结果，true为成功，false为失败 | +| code | int | 返回码，0表示成功，其他值表示失败 | +| message | string | 错误信息 | +| data | object | 返回数据 | + diff --git a/paas2/esb/components/confapis/itsm/apidocs/zh_hans/import_service.md b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/import_service.md new file mode 100644 index 000000000..120262eea --- /dev/null +++ b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/import_service.md @@ -0,0 +1,78 @@ +### 功能描述 + +导入服务，数据获取方式: 元数据在服务列表，导出服务即可。 + +### 请求参数 + +{{ common_args_desc }} + +#### 接口参数 + +| 字段 | 类型 | 必选 | 描述 | +|-----------|------------|--------|------------| +| key | array | 是 | 服务类型 | +| name | string | 是 | 服务名称 | +| catalog_id | int | 是 | 服务关联的目录ID | +| desc | string | 否 | 服务描述| +| owners | string | 否 | 服务负责人 | +| can_ticket_agency | bool | 是 | 是否可以代提单 | +| is_valid | bool | 是 | 是否启用，不传默认为false | +| display_type | string | 是 | 显示类型 | +| display_role | string | 是 | 显示角色，display_type 为open是值为空| +| source | string | 是 | 来源| +| project_key | string | 是 | 项目key| +| workflow | json | 是 | 流程数据| + + + +### 请求参数示例 + +``` json +{ + "key": "request", + "name": "测试服务", + "catalog_id":38, + "desc": "", + "owners": "admin", + "can_ticket_agency": false, + "is_valid": true, + "display_type": "OPEN", + "display_role": "", + "source": "custom", + "project_key": "0", + "workflow":{} +} +``` +### 返回结果示例 + +```json +{ + "result": true, + "code": 0, + "message": "success", + "data": { + "id": 94, + "name": "测试服务", + "service_type": "request", + "desc": "" + } +} +``` + +### 返回结果参数说明 + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|result| bool | 返回结果，true为成功，false为失败 | +|code|int|返回码，0表示成功，其他值表示失败| +|message|string|错误信息 +|data| object| 返回数据 | + +### data + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|id| int | 服务id | +|name|string|服务名| +|service_type|string|服务类型| +|desc| string| 服务描述 | diff --git a/paas2/esb/components/confapis/itsm/apidocs/zh_hans/operate_node.md b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/operate_node.md index 1233130ac..692799460 100644 --- a/paas2/esb/components/confapis/itsm/apidocs/zh_hans/operate_node.md +++ b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/operate_node.md @@ -27,6 +27,7 @@ | value | string |是 | 字段值 | ### 请求参数示例一：审批 +其中三个key对应的是审批节点三个字段的key, 其中必填的备注为拒绝审批时需要填的备注 ```json { @@ -40,12 +41,16 @@ "state_id": 4, "fields": [ { - "key": "SHENPIJIEGUO", - "value": "TONGYI" + "key": "11e8ac30a2247ddfaeef0cefd67c3d74", + "value": "true" }, { - "key": "SHENPIBEIZHU", - "value": "hello" + "key": "dda3d1ad8325d2c9b1f1bc913fa5ec15", + "value": "通过备注" + }, + { + "key": "322b6095ff3638e413ac772295b6d8e2", + "value": "拒绝备注" } ] } diff --git a/paas2/esb/components/confapis/itsm/apidocs/zh_hans/update_service.md b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/update_service.md new file mode 100644 index 000000000..0e18f0580 --- /dev/null +++ b/paas2/esb/components/confapis/itsm/apidocs/zh_hans/update_service.md @@ -0,0 +1,81 @@ +### 功能描述 + +导入服务，数据获取方式: 元数据在服务列表，导出服务即可。 + +### 请求参数 + +{{ common_args_desc }} + +#### 接口参数 + +| 字段 | 类型 | 必选 | 描述 | +|-----------|------------|--------|------------| +| id | int | 是 | 服务id | +| key | string | 是 | 服务类型 | +| name | string | 是 | 服务名称 | +| catalog_id | int | 是 | 服务关联的目录ID | +| desc | string | 否 | 服务描述| +| owners | string | 否 | 服务负责人 | +| can_ticket_agency | bool | 是 | 是否可以代提单 | +| is_valid | bool | 是 | 是否启用，不传默认为false | +| display_type | string | 是 | 显示类型 | +| display_role | string | 是 | 显示角色，display_type 为open是值为空| +| source | string | 是 | 来源| +| project_key | string | 是 | 项目key| +| workflow | json | 是 | 流程数据| + + + +### 请求参数示例 + +``` json +{ + "id":94, + "key": "request", + "name": "测试服务", + "catalog_id":38, + "desc": "", + "owners": "admin", + "can_ticket_agency": false, + "is_valid": true, + "display_type": "OPEN", + "display_role": "", + "source": "custom", + "project_key": "0", + "workflow":{} +} +``` +### 返回结果示例 + +```json +{ + "result": true, + "code": 0, + "message": "success", + "data": { + "id": 94, + "name": "测试服务", + "service_type": "request", + "desc": "" + } +} +``` + +### 返回结果参数说明 + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|result| bool | 返回结果，true为成功，false为失败 | +|code|int|返回码，0表示成功，其他值表示失败| +|message|string|错误信息 +|data| object| 返回数据 | + +### data + +| 字段 | 类型 | 描述 | +|-----------|-----------|-----------| +|id| int | 服务id | +|name|string|服务名| +|service_type|string|服务类型| +|desc| string| 服务描述 | +# -*- coding: utf-8 -*- diff --git a/paas2/esb/components/confapis/itsm/itsm.yaml b/paas2/esb/components/confapis/itsm/itsm.yaml index 2ef8e2752..d3b2d0085 100644 --- a/paas2/esb/components/confapis/itsm/itsm.yaml +++ b/paas2/esb/components/confapis/itsm/itsm.yaml @@ -160,3 +160,34 @@ comp_codename: generic.v2.itsm.itsm_component dest_path: /o/bk_itsm/openapi/ticket/comment/ dest_http_method: POST + +- path: /v2/itsm/create_service_catalog/ + name: create_service_catalog + label: 创建服务目录 + label_en: Create Service Catalog + suggest_method: POST + api_type: operate + comp_codename: generic.v2.itsm.itsm_component + dest_path: /o/bk_itsm/openapi/service_catalog/ + dest_http_method: POST + + +- path: /v2/itsm/import_service/ + name: import_service + label: 导入服务 + label_en: Import Service + suggest_method: POST + api_type: operate + comp_codename: generic.v2.itsm.itsm_component + dest_path: /o/bk_itsm/openapi/service/import_service/ + dest_http_method: POST + +- path: /v2/itsm/update_service/ + name: update_service + label: 更新服务 + label_en: Update Service + suggest_method: POST + api_type: operate + comp_codename: generic.v2.itsm.itsm_component + dest_path: /o/bk_itsm/openapi/service/update_service/ + dest_http_method: POST diff --git a/paas2/esb/components/confapis/monitor_v3/monitor_v3.yaml b/paas2/esb/components/confapis/monitor_v3/monitor_v3.yaml index 19e85412c..9d73d34a2 100644 --- a/paas2/esb/components/confapis/monitor_v3/monitor_v3.yaml +++ b/paas2/esb/components/confapis/monitor_v3/monitor_v3.yaml @@ -1715,6 +1715,17 @@ path: /v2/monitor_v3/query_apm_es/ method: POST +- api_type: query + comp_codename: generic.v2.monitor_v3.monitor_v3_component + dest_http_method: POST + dest_path: /apm_api/v1/application/query_es_mapping/ + is_hidden: true + label: 查询apm应用es映射 + label_en: query apm es mapping + name: query_apm_es_mapping + path: /v2/monitor_v3/query_apm_es_mapping/ + method: POST + - api_type: query comp_codename: generic.v2.monitor_v3.monitor_v3_component dest_http_method: POST diff --git a/paas2/esb/components/esb_conf.py b/paas2/esb/components/esb_conf.py index 250ca4bf8..abd3c0eca 100644 --- a/paas2/esb/components/esb_conf.py +++ b/paas2/esb/components/esb_conf.py @@ -228,9 +228,6 @@ def _rel_path(x): "is_deprecated": True, }, ), - # ('/v2/bk_login/get_batch_users_platform_role/', { - # 'comp_codename': 'generic.v2.bk_login.get_batch_users_platform_role', - # }), ("/v2/bk_login/get_user/", {"comp_codename": "generic.v2.bk_login.get_user"}), ( "/v2/bk_login/is_login/", @@ -282,11 +279,6 @@ def _rel_path(x): "is_deprecated": True, }, ), - # ('/bk_login/get_batch_user_platform_role/', { - # 'comp_codename': 'generic.bk_login.get_batch_user_platform_role', - # 'request_validators': [AppAuthValidator()], - # 'is_deprecated': True, - # }), ( "/bk_login/is_login/", { diff --git a/paas2/release.md b/paas2/release.md index 068fa2a6f..ecdf1a613 100644 --- a/paas2/release.md +++ b/paas2/release.md @@ -1,5 +1,9 @@ Release Log =============================== +# 2.12.55 + - update: esb update monitor_v3, bk_log, itsm, gsekit confapis + - update: esb remove get_batch_users_platform_role.py, get_batch_user_platform_role.py + # 2.12.54 - update: esb update monitor_v3, bk_log, iam confapis