Skip to content

Commit

Permalink
Merge pull request #1051 from alex-smile/ft_esb_update_apis_20221115
Browse files Browse the repository at this point in the history
update bk_log, monitor_v3 confapis
  • Loading branch information
alex-smile authored Nov 15, 2022
2 parents a4aafbe + d95abb7 commit 1ba4c92
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 15 deletions.
2 changes: 1 addition & 1 deletion paas2/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.14.36
2.14.37
42 changes: 38 additions & 4 deletions paas2/esb/components/confapis/bk_log/bk_log.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@
dest_http_method: POST
is_hidden: True

- path: /v2/bk_log/update_index_set/
- path: /v2/bk_log/update_index_set/{index_set_id}/
name: update_index_set
label: 日志平台-更新索引集
label_en: bk_log update index-set
method: PUT
api_type: query
comp_codename: generic.v2.bk_log.bk_log_component
dest_path: /api/v1/index_set/
dest_path: /api/v1/index_set/{index_set_id}/
dest_http_method: PUT
is_hidden: True

Expand All @@ -188,6 +188,28 @@
dest_http_method: GET
is_hidden: True

- path: /v2/bk_log/databus_collectors/list_bcs_clusters/
name: databus_collector_list_bcs_clusters
label: 日志平台-获取集群列表
label_en: bk_log list bcs clusters
method: GET
api_type: query
comp_codename: generic.v2.bk_log.bk_log_component
dest_path: /api/v1/databus/collectors/list_bcs_clusters/
dest_http_method: GET
is_hidden: True

- path: /v2/bk_log/databus_collectors/validate_container_config_yaml/
name: databus_collector_validate_container_config_yaml
label: 日志平台-集群日志采集Yaml配置校验
label_en: bk_log validate container config yaml
method: POST
api_type: query
comp_codename: generic.v2.bk_log.bk_log_component
dest_path: /api/v1/databus/collectors/validate_container_config_yaml/
dest_http_method: POST
is_hidden: True

- path: /v2/bk_log/databus_collectors/{collector_config_id}/task_status/
name: databus_collector_task_status
label: 日志平台-任务执行情况
Expand Down Expand Up @@ -243,14 +265,14 @@
dest_http_method: POST
is_hidden: True

- path: /v2/bk_log/databus_collectors/
- path: /v2/bk_log/databus_collectors/{collector_config_id}/
name: update_databus_collectors
label: 日志平台-更新采集项
label_en: bk_log update collector
method: PUT
api_type: query
comp_codename: generic.v2.bk_log.bk_log_component
dest_path: /api/v1/databus/collectors/
dest_path: /api/v1/databus/collectors/{collector_config_id}/
dest_http_method: PUT
is_hidden: True

Expand Down Expand Up @@ -760,3 +782,15 @@
dest_path: /api/v1/meta/projects/mine/
dest_http_method: GET
is_hidden: True

- path: /v1/bk_log/meta/spaces/mine/
name: meta_spaces_mine
label: 日志平台-获取用户空间列表
label_en: bk_log get spaces mine
method: GET
api_type: query
comp_codename: generic.v2.bk_log.bk_log_component
dest_path: /api/v1/meta/spaces/mine/
dest_http_method: GET
is_hidden: True

103 changes: 93 additions & 10 deletions paas2/esb/components/confapis/monitor_v3/monitor_v3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,7 @@
name: search_alert_by_event
path: /v2/monitor_v3/search_alert_by_event/
method: POST

- api_type: operate
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: POST
Expand Down Expand Up @@ -1518,23 +1519,34 @@
- api_type: operate
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: POST
dest_path: /apm_api/v1/application/create_application_simple/
is_hidden: false
label: 快速创建APM应用
dest_path: /apm_api/v1/application/create_application/
is_hidden: true
label: 创建APM应用
label_en: null
name: apm_create_application
path: /v2/monitor_v3/apm/create_application/
name: create_apm_application
path: /v2/monitor_v3/create_apm_application/
method: POST

- api_type: operate
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: POST
dest_path: /apm_api/v1/application/create_application/
dest_path: /apm_api/v1/application/delete_application/
is_hidden: true
label: 创建APM应用
label: 删除APM应用
label_en: null
name: create_apm_application
path: /v2/monitor_v3/create_apm_application/
name: delete_apm_application
path: /v2/monitor_v3/delete_apm_application/
method: POST

- api_type: operate
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: POST
dest_path: /apm_api/v1/application/create_application_simple/
is_hidden: false
label: 快速创建APM应用
label_en: null
name: apm_create_application
path: /v2/monitor_v3/apm/create_application/
method: POST

- api_type: operate
Expand Down Expand Up @@ -1918,6 +1930,77 @@
is_hidden: true
label: BCS集群接入监控
label_en: null
name: register_bcs_cluster
name: register_cluster_from_bcs
path: /v2/monitor_v3/register_cluster/
method: POST

- api_type: query
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: GET
dest_path: /api/v3/meta/list_space_types/
is_hidden: true
label: 查询空间类型列表
label_en: list space types
name: metadata_list_space_types
path: /v2/monitor_v3/metadata_list_space_types/
method: GET
- api_type: query
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: GET
dest_path: /api/v3/meta/list_spaces/
is_hidden: true
label: 查询空间实例列表
label_en: list spaces
name: metadata_list_spaces
path: /v2/monitor_v3/metadata_list_spaces/
method: GET
- api_type: query
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: GET
dest_path: /api/v3/meta/get_space_detail/
is_hidden: true
label: 查询空间实例详情
label_en: get space detail
name: metadata_get_space_detail
path: /v2/monitor_v3/metadata_get_space_detail/
method: GET
- api_type: query
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: GET
dest_path: /api/v3/meta/list_sticky_spaces/
is_hidden: true
label: 查询置顶空间列表
label_en: list sticky spaces
name: metadata_list_sticky_spaces
path: /v2/monitor_v3/metadata_list_sticky_spaces/
method: GET
- api_type: operate
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: POST
dest_path: /api/v3/meta/stick_space/
is_hidden: true
label: 取消置顶/置顶空间
label_en: stick space
name: metadata_stick_space
path: /v2/monitor_v3/metadata_stick_space/
method: POST
- api_type: query
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: GET
dest_path: /api/v3/meta/get_clusters_by_space_uid/
is_hidden: true
label: 查询空间下的集群信息
label_en: get cluster by space uid
name: metadata_get_clusters_by_space_uid
path: /v2/monitor_v3/metadata_get_clusters_by_space_uid/
method: GET
- api_type: operate
comp_codename: generic.v2.monitor_v3.monitor_v3_component
dest_http_method: POST
dest_path: /api/v3/meta/create_space/
is_hidden: true
label: 创建空间
label_en: create space
name: metadata_create_space
path: /v2/monitor_v3/metadata_create_space/
method: POST
3 changes: 3 additions & 0 deletions paas2/release.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Release Log
===============================
# 2.14.37
- update: esb update bk_log, monitor_v3 confapis

# 2.14.36
- update: esb update data, monitor_v3 confapis

Expand Down

0 comments on commit 1ba4c92

Please sign in to comment.