Skip to content

Commit c85f5c3

Browse files
Merge pull request #163 from jdcloud-apigateway/master
publish jdcloud-sdk-python 1.6.154
2 parents 6463679 + f2535fb commit c85f5c3

14 files changed

Lines changed: 163 additions & 150 deletions
Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
# 更新历史 #
2-
API版本:1.2.10
2+
API版本:1.2.12
33

4-
| 发布时间 | 版本号 |更新| 说明 |
5-
|-----------|-------|---|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
6-
| 2022-01-18 | 1.2.10 |日志服务| 新增日志下载接口 |
7-
| 2021-05-18 | 1.2.9 |日志服务| 部分接口说明更新 |
8-
| 2020-08-19 | 1.2.8 |日志服务| 新增analysis 接口 |
9-
| 2020-07-15 | 1.2.7 |日志服务| 新增multilines 验证接口 |
10-
| 2020-06-16 | 1.2.6 |日志服务| describe logtopics |
11-
| 2020-04-03 | 1.2.5 |日志服务| 高可用标签 |
12-
| 2020-02-08 | 1.2.4 | 日志服务| 更新search,searchLogContext接口,添加可选参数,兼容历史版本 |
13-
| 2019-12-05 | 1.2.3 | 更新接口| 增加/更新 search,searchContext 接口 |
14-
| 2019-08-06 | 1.2.1 |日志服务二期| 增加上下文检索 |
15-
| 2019-06-01 | 1.2.0 |日志服务二期| 增加自定义日志类型 |
16-
| 2019-05-09 | 1.1.2 |删除和修改接口| * 删除BatchDeleteLogset 和BatchDeletelogtopic<br>* 更新DeleteLogset 支持批量删除 使用path参数,逗号分割多个logsetUID<br>* 增加DeleteLogtopic 支持批量删除 使用path参数,逗号分割<br>* 修改DescribeCollectInfo 返回结果中增加logsetUID 和 logtopicUID |
17-
| 2018-12-14 | 1.1.1 |修改接口| 添加DescribeCollecInfosPart |
18-
| 2018-12-07 | 1.0.1 |修改接口| 修复接口为internal |
4+
| 发布时间 | 版本号 |更新| 说明 |
5+
|------------|--------|---|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
6+
| 2022-02-23 | 1.2.12 |日志服务| 日志预处理支持系统字段;新增直方图接口; |
7+
| 2022-02-15 | 1.2.11 |日志服务| 调整默认Endpoint |
8+
| 2022-01-18 | 1.2.10 |日志服务| 新增日志下载接口 |
9+
| 2021-05-18 | 1.2.9 |日志服务| 部分接口说明更新 |
10+
| 2020-08-19 | 1.2.8 |日志服务| 新增analysis 接口 |
11+
| 2020-07-15 | 1.2.7 |日志服务| 新增multilines 验证接口 |
12+
| 2020-06-16 | 1.2.6 |日志服务| describe logtopics |
13+
| 2020-04-03 | 1.2.5 |日志服务| 高可用标签 |
14+
| 2020-02-08 | 1.2.4 | 日志服务| 更新search,searchLogContext接口,添加可选参数,兼容历史版本 |
15+
| 2019-12-05 | 1.2.3 | 更新接口| 增加/更新 search,searchContext 接口 |
16+
| 2019-08-06 | 1.2.1 |日志服务二期| 增加上下文检索 |
17+
| 2019-06-01 | 1.2.0 |日志服务二期| 增加自定义日志类型 |
18+
| 2019-05-09 | 1.1.2 |删除和修改接口| * 删除BatchDeleteLogset 和BatchDeletelogtopic<br>* 更新DeleteLogset 支持批量删除 使用path参数,逗号分割多个logsetUID<br>* 增加DeleteLogtopic 支持批量删除 使用path参数,逗号分割<br>* 修改DescribeCollectInfo 返回结果中增加logsetUID 和 logtopicUID |
19+
| 2018-12-14 | 1.1.1 |修改接口| 添加DescribeCollecInfosPart |
20+
| 2018-12-07 | 1.0.1 |修改接口| 修复接口为internal |

jdcloud_sdk/services/logs/apis/CreateParserRequest.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def __init__(self, regionId,logtopicUID,parserFields, parserMode, ):
4646
self.parserMode = parserMode
4747
self.parserPattern = None
4848
self.parserSample = None
49+
self.pipelines = None
4950

5051
def setParserPattern(self, parserPattern):
5152
"""
@@ -59,3 +60,9 @@ def setParserSample(self, parserSample):
5960
"""
6061
self.parserSample = parserSample
6162

63+
def setPipelines(self, pipelines):
64+
"""
65+
:param pipelines: (Optional) 预处理任务列表。按照数组的顺序执行。
66+
"""
67+
self.pipelines = pipelines
68+
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
20+
21+
22+
class HistogramsRequest(JDCloudRequest):
23+
"""
24+
日志检索结果直方图
25+
"""
26+
27+
def __init__(self, parameters, header=None, version="v1"):
28+
super(HistogramsRequest, self).__init__(
29+
'/regions/{regionId}/logsets/{logsetUID}/logtopics/{logtopicUID}/histograms', 'GET', header, version)
30+
self.parameters = parameters
31+
32+
33+
class HistogramsParameters(object):
34+
35+
def __init__(self, regionId,logsetUID,logtopicUID,action, ):
36+
"""
37+
:param regionId: 地域 Id
38+
:param logsetUID: 日志集ID
39+
:param logtopicUID: 日志主题ID
40+
:param action: "preview"表示预览, "fulltext"表示全文检索, "advance"表示按照搜索语句检索
41+
"""
42+
43+
self.regionId = regionId
44+
self.logsetUID = logsetUID
45+
self.logtopicUID = logtopicUID
46+
self.action = action
47+
self.expr = None
48+
self.caseSensitive = None
49+
self.startTime = None
50+
self.endTime = None
51+
52+
def setExpr(self, expr):
53+
"""
54+
:param expr: (Optional) Base64编码的搜索表达式,
55+
"""
56+
self.expr = expr
57+
58+
def setCaseSensitive(self, caseSensitive):
59+
"""
60+
:param caseSensitive: (Optional) 搜索关键字大小写敏感, 默认false
61+
"""
62+
self.caseSensitive = caseSensitive
63+
64+
def setStartTime(self, startTime):
65+
"""
66+
:param startTime: (Optional) 开始时间。格式 “YYYY-MM-DDThh:mm:ssTZD”, 比如 “2018-11-09T15:34:46+0800”.当action != preview时,必填
67+
"""
68+
self.startTime = startTime
69+
70+
def setEndTime(self, endTime):
71+
"""
72+
:param endTime: (Optional) 结束时间。格式 “YYYY-MM-DDThh:mm:ssTZD”, 比如 “2018-11-09T15:34:46+0800”.当action != preview时,必填
73+
"""
74+
self.endTime = endTime
75+

jdcloud_sdk/services/logs/apis/PushRequest.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

jdcloud_sdk/services/logs/apis/PutRequest.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

jdcloud_sdk/services/logs/apis/UpdateParserRequest.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def __init__(self, regionId,logtopicUID,parserFields, parserMode, ):
4646
self.parserMode = parserMode
4747
self.parserPattern = None
4848
self.parserSample = None
49+
self.pipelines = None
4950

5051
def setParserPattern(self, parserPattern):
5152
"""
@@ -59,3 +60,9 @@ def setParserSample(self, parserSample):
5960
"""
6061
self.parserSample = parserSample
6162

63+
def setPipelines(self, pipelines):
64+
"""
65+
:param pipelines: (Optional) 预处理任务列表。按照数组的顺序执行。
66+
"""
67+
self.pipelines = pipelines
68+

jdcloud_sdk/services/logs/apis/ValidateParserRequest.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def __init__(self, parserMode, ):
4040
self.parserMode = parserMode
4141
self.parserPattern = None
4242
self.parserSample = None
43+
self.pipelines = None
4344

4445
def setParserPattern(self, parserPattern):
4546
"""
@@ -53,3 +54,9 @@ def setParserSample(self, parserSample):
5354
"""
5455
self.parserSample = parserSample
5556

57+
def setPipelines(self, pipelines):
58+
"""
59+
:param pipelines: (Optional) 预处理任务列表。按照数组的顺序执行。
60+
"""
61+
self.pipelines = pipelines
62+

jdcloud_sdk/services/logs/client/LogsClient.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
2626
if config is None:
2727
config = Config('logs.jdcloud-api.com')
2828

29-
super(LogsClient, self).__init__(credential, config, 'logs', '1.2.10', logger)
29+
super(LogsClient, self).__init__(credential, config, 'logs', '1.2.12', logger)

jdcloud_sdk/services/logs/models/CreateParserSpec.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919

2020
class CreateParserSpec(object):
2121

22-
def __init__(self, parserFields, parserMode, parserPattern=None, parserSample=None):
22+
def __init__(self, parserFields, parserMode, parserPattern=None, parserSample=None, pipelines=None):
2323
"""
2424
:param parserFields:
2525
:param parserMode: 解析类型。oneline - 单行,split - 分割, json - json, regexp - regexp
2626
:param parserPattern: (Optional) 解析语法
2727
:param parserSample: (Optional) 日志样例
28+
:param pipelines: (Optional) 预处理任务列表。按照数组的顺序执行。
2829
"""
2930

3031
self.parserFields = parserFields
3132
self.parserMode = parserMode
3233
self.parserPattern = parserPattern
3334
self.parserSample = parserSample
35+
self.pipelines = pipelines
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
20+
class PipelineSpec(object):
21+
22+
def __init__(self, field, parserMode, fieldType=None, parserPattern=None, parserSample=None):
23+
"""
24+
:param field: 字段名称
25+
:param fieldType: (Optional) 字段类型。 system, custom。 不填写默认为custom
26+
:param parserMode: 解析类型。目前仅支持 regexp。
27+
:param parserPattern: (Optional) 解析语法
28+
:param parserSample: (Optional) 日志样例
29+
"""
30+
31+
self.field = field
32+
self.fieldType = fieldType
33+
self.parserMode = parserMode
34+
self.parserPattern = parserPattern
35+
self.parserSample = parserSample

0 commit comments

Comments
 (0)