Skip to content

Commit ccd4fea

Browse files
jdcloud-apigatewayjdcloud-apigateway
committed
publish jdcloud-sdk-go version 2.0.1
1 parent 19864be commit ccd4fea

118 files changed

Lines changed: 7525 additions & 320 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎services/logs/ChangeLog.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ API版本：1.2.12
33

44
| 发布时间 | 版本号 |更新| 说明 |
55
|------------|--------|---|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
6+
| 2023-03-13 | 1.2.14 |日志服务| 新增日志下载相关接口； |
7+
| 2022-05-11 | 1.2.13 |日志服务| 新增K8S日志采集配置下发接口； |
68
| 2022-02-23 | 1.2.12 |日志服务| 日志预处理支持系统字段；新增直方图接口； |
79
| 2022-02-15 | 1.2.11 |日志服务| 调整默认Endpoint |
810
| 2022-01-18 | 1.2.10 |日志服务| 新增日志下载接口 |

‎services/logs/apis/CancelLogDownloadTask.go‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
// Copyright 2018 JDCLOUD.COM
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
//
15+
// NOTE: This class is auto generated by the jdcloud code generator program.
16+
17+
package apis
18+
19+
import (
20+
"github.com/jdcloud-api/jdcloud-sdk-go/core"
21+
)
22+
23+
type CancelLogDownloadTaskRequest struct {
24+
25+
core.JDCloudRequest
26+
27+
/* 地域 Id */
28+
RegionId string `json:"regionId"`
29+
30+
/* 日志主题 UID */
31+
LogtopicUID string `json:"logtopicUID"`
32+
33+
/* 日志下载任务 UID */
34+
DownloadTaskUID string `json:"downloadTaskUID"`
35+
}
36+
37+
/*
38+
* param regionId: 地域 Id (Required)
39+
* param logtopicUID: 日志主题 UID (Required)
40+
* param downloadTaskUID: 日志下载任务 UID (Required)
41+
*
42+
* @Deprecated, not compatible when mandatory parameters changed
43+
*/
44+
func NewCancelLogDownloadTaskRequest(
45+
regionId string,
46+
logtopicUID string,
47+
downloadTaskUID string,
48+
) *CancelLogDownloadTaskRequest {
49+
50+
return &CancelLogDownloadTaskRequest{
51+
JDCloudRequest: core.JDCloudRequest{
52+
URL: "/regions/{regionId}/logtopics/{logtopicUID}/downloadtask/{downloadTaskUID}/cancel",
53+
Method: "PUT",
54+
Header: nil,
55+
Version: "v1",
56+
},
57+
RegionId: regionId,
58+
LogtopicUID: logtopicUID,
59+
DownloadTaskUID: downloadTaskUID,
60+
}
61+
}
62+
63+
/*
64+
* param regionId: 地域 Id (Required)
65+
* param logtopicUID: 日志主题 UID (Required)
66+
* param downloadTaskUID: 日志下载任务 UID (Required)
67+
*/
68+
func NewCancelLogDownloadTaskRequestWithAllParams(
69+
regionId string,
70+
logtopicUID string,
71+
downloadTaskUID string,
72+
) *CancelLogDownloadTaskRequest {
73+
74+
return &CancelLogDownloadTaskRequest{
75+
JDCloudRequest: core.JDCloudRequest{
76+
URL: "/regions/{regionId}/logtopics/{logtopicUID}/downloadtask/{downloadTaskUID}/cancel",
77+
Method: "PUT",
78+
Header: nil,
79+
Version: "v1",
80+
},
81+
RegionId: regionId,
82+
LogtopicUID: logtopicUID,
83+
DownloadTaskUID: downloadTaskUID,
84+
}
85+
}
86+
87+
/* This constructor has better compatible ability when API parameters changed */
88+
func NewCancelLogDownloadTaskRequestWithoutParam() *CancelLogDownloadTaskRequest {
89+
90+
return &CancelLogDownloadTaskRequest{
91+
JDCloudRequest: core.JDCloudRequest{
92+
URL: "/regions/{regionId}/logtopics/{logtopicUID}/downloadtask/{downloadTaskUID}/cancel",
93+
Method: "PUT",
94+
Header: nil,
95+
Version: "v1",
96+
},
97+
}
98+
}
99+
100+
/* param regionId: 地域 Id(Required) */
101+
func (r *CancelLogDownloadTaskRequest) SetRegionId(regionId string) {
102+
r.RegionId = regionId
103+
}
104+
/* param logtopicUID: 日志主题 UID(Required) */
105+
func (r *CancelLogDownloadTaskRequest) SetLogtopicUID(logtopicUID string) {
106+
r.LogtopicUID = logtopicUID
107+
}
108+
/* param downloadTaskUID: 日志下载任务 UID(Required) */
109+
func (r *CancelLogDownloadTaskRequest) SetDownloadTaskUID(downloadTaskUID string) {
110+
r.DownloadTaskUID = downloadTaskUID
111+
}
112+
113+
114+
// GetRegionId returns path parameter 'regionId' if exist,
115+
// otherwise return empty string
116+
func (r CancelLogDownloadTaskRequest) GetRegionId() string {
117+
return r.RegionId
118+
}
119+
120+
type CancelLogDownloadTaskResponse struct {
121+
RequestID string `json:"requestId"`
122+
Error core.ErrorResponse `json:"error"`
123+
Result CancelLogDownloadTaskResult `json:"result"`
124+
}
125+
126+
type CancelLogDownloadTaskResult struct {
127+
DownloadTaskUID string `json:"downloadTaskUID"`
128+
}

‎services/logs/apis/CreateCollectInfo.go‎

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ type CreateCollectInfoRequest struct {
3737
/* 日志来源，只能是 custom/jdcloud */
3838
AppCode string `json:"appCode"`
3939

40+
/* (Optional) */
41+
BinlogSpec *logs.BinlogSpec `json:"binlogSpec"`
42+
4043
/* 采集状态，0-禁用，1-启用 */
4144
Enabled bool `json:"enabled"`
4245

4346
/* 过滤器是否启用。当appcode为custom时必填 (Optional) */
4447
FilterEnabled *bool `json:"filterEnabled"`
4548

46-
/* 自定义日志转发目的地, 只支持业务应用日志。支持类型："kafka"，"es"，默认为空:不进行自定义目的上报 (Optional) */
47-
LogCustomTarget *string `json:"logCustomTarget"`
48-
49-
/* 自定义日志转发目的地配置，KV 结构，具体配置参考 LogCustomTargetKafkaConf 和 LogCustomTargetEsConf (Optional) */
50-
LogCustomTargetConf *interface{} `json:"logCustomTargetConf"`
49+
/* (Optional) */
50+
K8sSpec *logs.K8sSpec `json:"k8sSpec"`
5151

5252
/* 日志文件名。当appcode为custom时为必填。日志文件名支持正则表达式。 (Optional) */
5353
LogFile *string `json:"logFile"`
@@ -61,6 +61,9 @@ type CreateCollectInfoRequest struct {
6161
/* 目的地是否是日志服务logtopic，只支持业务应用日志 (Optional) */
6262
LogtopicEnabled *bool `json:"logtopicEnabled"`
6363

64+
/* 采集配置名称 (Optional) */
65+
Name *string `json:"name"`
66+
6467
/* 首行正则 (Optional) */
6568
RegexpStr *string `json:"regexpStr"`
6669

@@ -73,7 +76,7 @@ type CreateCollectInfoRequest struct {
7376
/* 采集实例列表：jdcloud类型最多添加20个资源；custom类型支持的资源数量不限； (Optional) */
7477
Resources []logs.Resource `json:"resources"`
7578

76-
/* 产品线,当日志来源为jdcloud时，必填 */
79+
/* 产品线,当日志来源为jdcloud时,填写云产品serviceCode。否则填写自定义日志类型：vm,k8s,binlog,etc */
7780
ServiceCode string `json:"serviceCode"`
7881

7982
/* (Optional) */
@@ -89,7 +92,7 @@ type CreateCollectInfoRequest struct {
8992
* param appCode: 日志来源，只能是 custom/jdcloud (Required)
9093
* param enabled: 采集状态，0-禁用，1-启用 (Required)
9194
* param resourceType: 采集实例类型, 只能是 all/part 当选择all时，传入的实例列表无效；custom类型的采集配置目前仅支持part方式，即用户指定实例列表； (Required)
92-
* param serviceCode: 产品线,当日志来源为jdcloud时，必填 (Required)
95+
* param serviceCode: 产品线,当日志来源为jdcloud时,填写云产品serviceCode。否则填写自定义日志类型：vm,k8s,binlog,etc (Required)
9396
*
9497
* @Deprecated, not compatible when mandatory parameters changed
9598
*/
@@ -123,19 +126,20 @@ func NewCreateCollectInfoRequest(
123126
* param logtopicUID: 日志主题 UID (Required)
124127
* param agResource: 高可用组资源 (Optional)
125128
* param appCode: 日志来源，只能是 custom/jdcloud (Required)
129+
* param binlogSpec: (Optional)
126130
* param enabled: 采集状态，0-禁用，1-启用 (Required)
127131
* param filterEnabled: 过滤器是否启用。当appcode为custom时必填 (Optional)
128-
* param logCustomTarget: 自定义日志转发目的地, 只支持业务应用日志。支持类型："kafka"，"es"，默认为空:不进行自定义目的上报 (Optional)
129-
* param logCustomTargetConf: 自定义日志转发目的地配置，KV 结构，具体配置参考 LogCustomTargetKafkaConf 和 LogCustomTargetEsConf (Optional)
132+
* param k8sSpec: (Optional)
130133
* param logFile: 日志文件名。当appcode为custom时为必填。日志文件名支持正则表达式。 (Optional)
131134
* param logFilters: 过滤器。设置过滤器后可根据用户设定的关键词采集部分日志，如仅采集 Error 的日志。目前最大允许5个。 (Optional)
132135
* param logPath: 日志路径。当appcode为custom时为必填。目前仅支持对 Linux 云主机上的日志进行采集，路径支持通配符“*”和“？”，文件路径应符合 Linux 的文件路径规则 (Optional)
133136
* param logtopicEnabled: 目的地是否是日志服务logtopic，只支持业务应用日志 (Optional)
137+
* param name: 采集配置名称 (Optional)
134138
* param regexpStr: 首行正则 (Optional)
135139
* param resourceMode: 采集资源时选择的模式，1.正常的选择实例模式（默认模式）；2.选择标签tag模式 3.选择高可用组ag模式 (Optional)
136140
* param resourceType: 采集实例类型, 只能是 all/part 当选择all时，传入的实例列表无效；custom类型的采集配置目前仅支持part方式，即用户指定实例列表； (Required)
137141
* param resources: 采集实例列表：jdcloud类型最多添加20个资源；custom类型支持的资源数量不限； (Optional)
138-
* param serviceCode: 产品线,当日志来源为jdcloud时，必填 (Required)
142+
* param serviceCode: 产品线,当日志来源为jdcloud时,填写云产品serviceCode。否则填写自定义日志类型：vm,k8s,binlog,etc (Required)
139143
* param tagResource: (Optional)
140144
* param templateUID: 日志类型。当appcode为jdcloud时为必填 (Optional)
141145
*/
@@ -144,14 +148,15 @@ func NewCreateCollectInfoRequestWithAllParams(
144148
logtopicUID string,
145149
agResource []logs.AgResource,
146150
appCode string,
151+
binlogSpec *logs.BinlogSpec,
147152
enabled bool,
148153
filterEnabled *bool,
149-
logCustomTarget *string,
150-
logCustomTargetConf *interface{},
154+
k8sSpec *logs.K8sSpec,
151155
logFile *string,
152156
logFilters []string,
153157
logPath *string,
154158
logtopicEnabled *bool,
159+
name *string,
155160
regexpStr *string,
156161
resourceMode *int64,
157162
resourceType string,
@@ -172,14 +177,15 @@ func NewCreateCollectInfoRequestWithAllParams(
172177
LogtopicUID: logtopicUID,
173178
AgResource: agResource,
174179
AppCode: appCode,
180+
BinlogSpec: binlogSpec,
175181
Enabled: enabled,
176182
FilterEnabled: filterEnabled,
177-
LogCustomTarget: logCustomTarget,
178-
LogCustomTargetConf: logCustomTargetConf,
183+
K8sSpec: k8sSpec,
179184
LogFile: logFile,
180185
LogFilters: logFilters,
181186
LogPath: logPath,
182187
LogtopicEnabled: logtopicEnabled,
188+
Name: name,
183189
RegexpStr: regexpStr,
184190
ResourceMode: resourceMode,
185191
ResourceType: resourceType,
@@ -207,97 +213,84 @@ func NewCreateCollectInfoRequestWithoutParam() *CreateCollectInfoRequest {
207213
func (r *CreateCollectInfoRequest) SetRegionId(regionId string) {
208214
r.RegionId = regionId
209215
}
210-
211216
/* param logtopicUID: 日志主题 UID(Required) */
212217
func (r *CreateCollectInfoRequest) SetLogtopicUID(logtopicUID string) {
213218
r.LogtopicUID = logtopicUID
214219
}
215-
216220
/* param agResource: 高可用组资源(Optional) */
217221
func (r *CreateCollectInfoRequest) SetAgResource(agResource []logs.AgResource) {
218222
r.AgResource = agResource
219223
}
220-
221224
/* param appCode: 日志来源，只能是 custom/jdcloud(Required) */
222225
func (r *CreateCollectInfoRequest) SetAppCode(appCode string) {
223226
r.AppCode = appCode
224227
}
225-
228+
/* param binlogSpec: (Optional) */
229+
func (r *CreateCollectInfoRequest) SetBinlogSpec(binlogSpec *logs.BinlogSpec) {
230+
r.BinlogSpec = binlogSpec
231+
}
226232
/* param enabled: 采集状态，0-禁用，1-启用(Required) */
227233
func (r *CreateCollectInfoRequest) SetEnabled(enabled bool) {
228234
r.Enabled = enabled
229235
}
230-
231236
/* param filterEnabled: 过滤器是否启用。当appcode为custom时必填(Optional) */
232237
func (r *CreateCollectInfoRequest) SetFilterEnabled(filterEnabled bool) {
233238
r.FilterEnabled = &filterEnabled
234239
}
235-
236-
/* param logCustomTarget: 自定义日志转发目的地, 只支持业务应用日志。支持类型："kafka"，"es"，默认为空:不进行自定义目的上报(Optional) */
237-
func (r *CreateCollectInfoRequest) SetLogCustomTarget(logCustomTarget string) {
238-
r.LogCustomTarget = &logCustomTarget
239-
}
240-
241-
/* param logCustomTargetConf: 自定义日志转发目的地配置，KV 结构，具体配置参考 LogCustomTargetKafkaConf 和 LogCustomTargetEsConf(Optional) */
242-
func (r *CreateCollectInfoRequest) SetLogCustomTargetConf(logCustomTargetConf interface{}) {
243-
r.LogCustomTargetConf = &logCustomTargetConf
240+
/* param k8sSpec: (Optional) */
241+
func (r *CreateCollectInfoRequest) SetK8sSpec(k8sSpec *logs.K8sSpec) {
242+
r.K8sSpec = k8sSpec
244243
}
245-
246244
/* param logFile: 日志文件名。当appcode为custom时为必填。日志文件名支持正则表达式。(Optional) */
247245
func (r *CreateCollectInfoRequest) SetLogFile(logFile string) {
248246
r.LogFile = &logFile
249247
}
250-
251248
/* param logFilters: 过滤器。设置过滤器后可根据用户设定的关键词采集部分日志，如仅采集 Error 的日志。目前最大允许5个。(Optional) */
252249
func (r *CreateCollectInfoRequest) SetLogFilters(logFilters []string) {
253250
r.LogFilters = logFilters
254251
}
255-
256252
/* param logPath: 日志路径。当appcode为custom时为必填。目前仅支持对 Linux 云主机上的日志进行采集，路径支持通配符“*”和“？”，文件路径应符合 Linux 的文件路径规则(Optional) */
257253
func (r *CreateCollectInfoRequest) SetLogPath(logPath string) {
258254
r.LogPath = &logPath
259255
}
260-
261256
/* param logtopicEnabled: 目的地是否是日志服务logtopic，只支持业务应用日志(Optional) */
262257
func (r *CreateCollectInfoRequest) SetLogtopicEnabled(logtopicEnabled bool) {
263258
r.LogtopicEnabled = &logtopicEnabled
264259
}
265-
260+
/* param name: 采集配置名称(Optional) */
261+
func (r *CreateCollectInfoRequest) SetName(name string) {
262+
r.Name = &name
263+
}
266264
/* param regexpStr: 首行正则(Optional) */
267265
func (r *CreateCollectInfoRequest) SetRegexpStr(regexpStr string) {
268266
r.RegexpStr = &regexpStr
269267
}
270-
271268
/* param resourceMode: 采集资源时选择的模式，1.正常的选择实例模式（默认模式）；2.选择标签tag模式 3.选择高可用组ag模式(Optional) */
272269
func (r *CreateCollectInfoRequest) SetResourceMode(resourceMode int64) {
273270
r.ResourceMode = &resourceMode
274271
}
275-
276272
/* param resourceType: 采集实例类型, 只能是 all/part 当选择all时，传入的实例列表无效；custom类型的采集配置目前仅支持part方式，即用户指定实例列表；(Required) */
277273
func (r *CreateCollectInfoRequest) SetResourceType(resourceType string) {
278274
r.ResourceType = resourceType
279275
}
280-
281276
/* param resources: 采集实例列表：jdcloud类型最多添加20个资源；custom类型支持的资源数量不限；(Optional) */
282277
func (r *CreateCollectInfoRequest) SetResources(resources []logs.Resource) {
283278
r.Resources = resources
284279
}
285-
286-
/* param serviceCode: 产品线,当日志来源为jdcloud时，必填(Required) */
280+
/* param serviceCode: 产品线,当日志来源为jdcloud时,填写云产品serviceCode。否则填写自定义日志类型：vm,k8s,binlog,etc(Required) */
287281
func (r *CreateCollectInfoRequest) SetServiceCode(serviceCode string) {
288282
r.ServiceCode = serviceCode
289283
}
290-
291284
/* param tagResource: (Optional) */
292285
func (r *CreateCollectInfoRequest) SetTagResource(tagResource *logs.TagResource) {
293286
r.TagResource = tagResource
294287
}
295-
296288
/* param templateUID: 日志类型。当appcode为jdcloud时为必填(Optional) */
297289
func (r *CreateCollectInfoRequest) SetTemplateUID(templateUID string) {
298290
r.TemplateUID = &templateUID
299291
}
300292

293+
301294
// GetRegionId returns path parameter 'regionId' if exist,
302295
// otherwise return empty string
303296
func (r CreateCollectInfoRequest) GetRegionId() string {

0 commit comments

Comments
 (0)