Skip to content

Commit 330d6fd

Browse files
wyyaltwyyalt
committed
feat: 配置检查功能 (closed #389)
1 parent 5e6cd1b commit 330d6fd

File tree

10 files changed

+716
-16
lines changed

10 files changed

+716
-16
lines changed

‎apps/api/modules/cc.py‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,28 @@ class _CCApi(BaseApi):
6868

6969
def __init__(self):
7070
self.search_business = DataAPI(
71-
method="POST", url=CC_APIGATEWAY_ROOT + "search_business/", module=self.MODULE, description="查询业务列表",
71+
method="POST",
72+
url=CC_APIGATEWAY_ROOT + "search_business/",
73+
module=self.MODULE,
74+
description="查询业务列表",
7275
)
7376
self.search_cloud_area = DataAPI(
74-
method="POST", url=CC_APIGATEWAY_ROOT + "search_cloud_area/", module=self.MODULE, description="查询云区域",
77+
method="POST",
78+
url=CC_APIGATEWAY_ROOT + "search_cloud_area/",
79+
module=self.MODULE,
80+
description="查询云区域",
7581
)
7682
self.search_biz_inst_topo = DataAPI(
77-
method="POST", url=CC_APIGATEWAY_ROOT + "search_biz_inst_topo/", module=self.MODULE, description="查询业务实例拓扑",
83+
method="POST",
84+
url=CC_APIGATEWAY_ROOT + "search_biz_inst_topo/",
85+
module=self.MODULE,
86+
description="查询业务实例拓扑",
7887
)
7988
self.find_module_batch = DataAPI(
80-
method="POST", url=CC_APIGATEWAY_ROOT + "find_module_batch/", module=self.MODULE, description="批量获取模块详情",
89+
method="POST",
90+
url=CC_APIGATEWAY_ROOT + "find_module_batch/",
91+
module=self.MODULE,
92+
description="批量获取模块详情",
8193
)
8294
self.list_service_template = DataAPI(
8395
method="POST",
@@ -98,7 +110,10 @@ def __init__(self):
98110
description="查询进程实例列表",
99111
)
100112
self.list_proc_template = DataAPI(
101-
method="POST", url=CC_APIGATEWAY_ROOT + "list_proc_template/", module=self.MODULE, description="查询进程模板信息",
113+
method="POST",
114+
url=CC_APIGATEWAY_ROOT + "list_proc_template/",
115+
module=self.MODULE,
116+
description="查询进程模板信息",
102117
)
103118
self.batch_create_proc_template = DataAPI(
104119
method="POST",
@@ -113,7 +128,10 @@ def __init__(self):
113128
description="批量更新进程信息",
114129
)
115130
self.update_proc_template = DataAPI(
116-
method="POST", url=CC_APIGATEWAY_ROOT + "update_proc_template/", module=self.MODULE, description="更新进程模板信息",
131+
method="POST",
132+
url=CC_APIGATEWAY_ROOT + "update_proc_template/",
133+
module=self.MODULE,
134+
description="更新进程模板信息",
117135
)
118136
self.list_process_related_info = DataAPI(
119137
method="POST",
@@ -123,13 +141,22 @@ def __init__(self):
123141
description="根据规则批量查询进程实例信息",
124142
)
125143
self.find_set_batch = DataAPI(
126-
method="POST", url=CC_APIGATEWAY_ROOT + "find_set_batch/", module=self.MODULE, description="批量获取指定业务下集群",
144+
method="POST",
145+
url=CC_APIGATEWAY_ROOT + "find_set_batch/",
146+
module=self.MODULE,
147+
description="批量获取指定业务下集群",
127148
)
128149
self.search_set = DataAPI(
129-
method="POST", url=CC_APIGATEWAY_ROOT + "search_set/", module=self.MODULE, description="查询集群",
150+
method="POST",
151+
url=CC_APIGATEWAY_ROOT + "search_set/",
152+
module=self.MODULE,
153+
description="查询集群",
130154
)
131155
self.search_module = DataAPI(
132-
method="POST", url=CC_APIGATEWAY_ROOT + "search_module/", module=self.MODULE, description="查询模块",
156+
method="POST",
157+
url=CC_APIGATEWAY_ROOT + "search_module/",
158+
module=self.MODULE,
159+
description="查询模块",
133160
)
134161
self.search_object_attribute = DataAPI(
135162
method="POST",
@@ -168,7 +195,10 @@ def __init__(self):
168195
description="删除进程实例",
169196
)
170197
self.delete_proc_template = DataAPI(
171-
method="POST", url=CC_APIGATEWAY_ROOT + "delete_proc_template/", module=self.MODULE, description="删除进程模板",
198+
method="POST",
199+
url=CC_APIGATEWAY_ROOT + "delete_proc_template/",
200+
module=self.MODULE,
201+
description="删除进程模板",
172202
)
173203
self.list_service_template_difference = DataAPI(
174204
method="POST",
@@ -177,5 +207,14 @@ def __init__(self):
177207
description="列出服务模版和服务实例之间的差异",
178208
)
179209
self.resource_watch = DataAPI(
180-
method="POST", url=CC_APIGATEWAY_ROOT + "resource_watch/", module=self.MODULE, description="监听资源变化事件",
210+
method="POST",
211+
url=CC_APIGATEWAY_ROOT + "resource_watch/",
212+
module=self.MODULE,
213+
description="监听资源变化事件",
214+
)
215+
self.list_biz_hosts = DataAPI(
216+
method="POST",
217+
url=CC_APIGATEWAY_ROOT + "list_biz_hosts/",
218+
module=self.MODULE,
219+
description="查询业务主机列表",
181220
)

‎apps/api/modules/job.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,16 @@ def __init__(self):
2626
description="快速执行脚本",
2727
)
2828
self.fast_transfer_file = DataAPI(
29-
method="POST", url=JOB_APIGATEWAY_ROOT_V3 + "fast_transfer_file/", module=self.MODULE, description="快速分发文件",
29+
method="POST",
30+
url=JOB_APIGATEWAY_ROOT_V3 + "fast_transfer_file/",
31+
module=self.MODULE,
32+
description="快速分发文件",
3033
)
3134
self.push_config_file = DataAPI(
32-
method="POST", url=JOB_APIGATEWAY_ROOT_V3 + "push_config_file/", module=self.MODULE, description="快速分发配置",
35+
method="POST",
36+
url=JOB_APIGATEWAY_ROOT_V3 + "push_config_file/",
37+
module=self.MODULE,
38+
description="快速分发配置",
3339
)
3440
self.get_job_instance_status = DataAPI(
3541
method="GET",
@@ -43,3 +49,9 @@ def __init__(self):
4349
module=self.MODULE,
4450
description="根据作业实例ID查询作业执行日志",
4551
)
52+
self.batch_get_job_instance_ip_log = DataAPI(
53+
method="POST",
54+
url=JOB_APIGATEWAY_ROOT_V3 + "batch_get_job_instance_ip_log/",
55+
module=self.MODULE,
56+
description="批量查询作业执行日志",
57+
)

‎apps/gsekit/meta/models.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class KEYS:
3838
# 记录所有业务ID,用于同步新业务到灰度列表对比使用
3939
ALL_BIZ_IDS = "ALL_BIZ_IDS"
4040
SYNC_PROC_STATUS_TIME = "SYNC_PROC_STATUS_TIME"
41+
CHECK_PROC_SCRIPT = "CHECK_PROC_SCRIPT"
4142

4243
@classmethod
4344
def process_task_aggregate_info(cls, bk_biz_id: int) -> typing.Dict[str, str]:

0 commit comments

Comments
 (0)