Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: 提供步骤详情与步骤执行结果查询的APIGW接口 #2596 #2716

Merged
merged 2 commits into from
Jan 3, 2024
Merged

perf: 提供步骤详情与步骤执行结果查询的APIGW接口 #2596 #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0834078
perf: 提供步骤详情与步骤执行结果查询的APIGW接口 #2596
jsonwan Jan 3, 2024
9b9a49c
perf: 提供步骤详情与步骤执行结果查询的APIGW接口 #2596
jsonwan Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions docs/apidoc/bk-api-gateway/v3/zh/get_step_instance_detail.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@
"bk_host_id": 1,
"bk_cloud_id": 0,
"ip": "192.168.1.1",
"ipv6": null
"ipv6": null,
"bk_agent_id": "020000000052540079809816967513755991",
"alive": 1
}],
"topo_node_list": [{
"node_type": "set",
Expand Down Expand Up @@ -88,7 +90,9 @@
"bk_host_id": 1,
"bk_cloud_id": 0,
"ip": "192.168.1.1",
"ipv6": null
"ipv6": null,
"bk_agent_id": "020000000052540079809816967513755991",
"alive": 1
}],
"topo_node_list": [{
"node_type": "set",
Expand Down Expand Up @@ -118,7 +122,9 @@
"bk_host_id": 1,
"bk_cloud_id": 0,
"ip": "192.168.1.1",
"ipv6": null
"ipv6": null,
"bk_agent_id": "020000000052540079809816967513755991",
"alive": 1
}],
"topo_node_list": [{
"node_type": "set",
Expand Down Expand Up @@ -203,6 +209,8 @@
| bk_cloud_id | long | 否 | 管控区域ID |
| ip | string | 否 | IP |
| ipv6 | string | 否 | IPv6 |
| bk_agent_id | string | 否 | Agent ID |
| alive | int | 否 | Agent是否正常，取值为：1-正常，0-异常 |

##### topo_node

Expand Down
10 changes: 10 additions & 0 deletions ...ckend/commons/esb-sdk/src/main/java/com/tencent/bk/job/common/esb/model/job/EsbIpDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ public class EsbIpDTO {
@JsonPropertyDescription("ipv6")
private String ipv6;

@JsonProperty("bk_agent_id")
@JsonPropertyDescription("Agent Id")
private String agentId;

@JsonProperty("alive")
@JsonPropertyDescription("Agent是否正常")
private Integer alive;

public EsbIpDTO(Long hostId, Long bkCloudId, String ip) {
this.hostId = hostId;
this.bkCloudId = bkCloudId;
Expand All @@ -90,6 +98,8 @@ public static EsbIpDTO fromHost(HostDTO host) {
esbIp.setIp(host.getIp());
esbIp.setIpv6(host.getIpv6());
esbIp.setHostId(host.getHostId());
esbIp.setAgentId(host.getAgentId());
esbIp.setAlive(host.getAlive());
return esbIp;
}

Expand Down
Loading