Merge pull request #154 from jdcloud-apigateway/master

publish jdcloud-sdk-python 1.6.137

Author: jdcloud-apigateway

jdcloud_sdk/services/logs/ChangeLog.md

@@ -1,12 +1,18 @@
 # 更新历史 #
-API版本：1.2.4
+API版本：1.2.10
 
-|发布时间|版本号|更新|说明|
-|---|---|---|---|
-|2020-02-08|1.2.4| 日志服务| 更新search，searchLogContext接口，添加可选参数，兼容历史版本 |
-|2019-12-05|1.2.3| 更新接口| 增加/更新 search，searchContext 接口 |
-|2019-08-06|1.2.1 |日志服务二期|增加上下文检索 |
-|2019-06-01|1.2.0 |日志服务二期|增加自定义日志类型 |
-|2019-05-09|1.1.2 |删除和修改接口|* 删除BatchDeleteLogset 和BatchDeletelogtopic<br>* 更新DeleteLogset 支持批量删除 使用path参数，逗号分割多个logsetUID<br>* 增加DeleteLogtopic 支持批量删除 使用path参数，逗号分割<br>* 修改DescribeCollectInfo 返回结果中增加logsetUID 和 logtopicUID |
-|2018-12-14|1.1.1 |修改接口|添加DescribeCollecInfosPart |
-|2018-12-07|1.0.1 |修改接口|修复接口为internal |
+| 发布时间      | 版本号   |更新| 说明                                                                                                                                                                                           |
+|-----------|-------|---|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2022-01-18  | 1.2.10 |日志服务| 新增日志下载接口                                                                                                                                                                                     |
+| 2021-05-18 | 1.2.9 |日志服务| 部分接口说明更新                                                                                                                                                                                     |
+| 2020-08-19 | 1.2.8 |日志服务| 新增analysis 接口                                                                                                                                                                                |
+| 2020-07-15 | 1.2.7 |日志服务| 新增multilines 验证接口                                                                                                                                                                            |
+| 2020-06-16 | 1.2.6 |日志服务| describe logtopics                                                                                                                                                                           |
+| 2020-04-03 | 1.2.5 |日志服务| 高可用标签                                                                                                                                                                                        |
+| 2020-02-08 | 1.2.4 | 日志服务| 更新search，searchLogContext接口，添加可选参数，兼容历史版本                                                                                                                                                    |
+| 2019-12-05 | 1.2.3 | 更新接口| 增加/更新 search，searchContext 接口                                                                                                                                                                |
+| 2019-08-06 | 1.2.1 |日志服务二期| 增加上下文检索                                                                                                                                                                                      |
+| 2019-06-01 | 1.2.0 |日志服务二期| 增加自定义日志类型                                                                                                                                                                                    |
+| 2019-05-09 | 1.1.2 |删除和修改接口| * 删除BatchDeleteLogset 和BatchDeletelogtopic<br>* 更新DeleteLogset 支持批量删除 使用path参数，逗号分割多个logsetUID<br>* 增加DeleteLogtopic 支持批量删除 使用path参数，逗号分割<br>* 修改DescribeCollectInfo 返回结果中增加logsetUID 和 logtopicUID |
+| 2018-12-14 | 1.1.1 |修改接口| 添加DescribeCollecInfosPart                                                                                                                                                                    |
+| 2018-12-07 | 1.0.1 |修改接口| 修复接口为internal                                                                                                                                                                                |

jdcloud_sdk/services/logs/apis/CreateCollectInfoRequest.py

@@ -32,46 +32,59 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateCollectInfoParameters(object):
 
-    def __init__(self, regionId, logtopicUID, enabled, appCode, serviceCode, resourceType, ):
+    def __init__(self, regionId,logtopicUID,appCode, enabled, resourceType, serviceCode, ):
         """
         :param regionId: 地域 Id
         :param logtopicUID: 日志主题 UID
-        :param enabled: 采集状态，0-禁用，1-启用
         :param appCode: 日志来源，只能是 custom/jdcloud
-        :param serviceCode: 产品线,当日志来源为jdcloud时，必填
+        :param enabled: 采集状态，0-禁用，1-启用
         :param resourceType: 采集实例类型, 只能是 all/part  当选择all时，传入的实例列表无效；custom类型的采集配置目前仅支持part方式，即用户指定实例列表；
+        :param serviceCode: 产品线,当日志来源为jdcloud时，必填
         """
 
         self.regionId = regionId
         self.logtopicUID = logtopicUID
-        self.enabled = enabled
+        self.agResource = None
         self.appCode = appCode
-        self.serviceCode = serviceCode
+        self.enabled = enabled
+        self.filterEnabled = None
+        self.logCustomTarget = None
+        self.logCustomTargetConf = None
+        self.logFile = None
+        self.logFilters = None
+        self.logPath = None
+        self.logtopicEnabled = None
+        self.regexpStr = None
+        self.resourceMode = None
         self.resourceType = resourceType
         self.resources = None
+        self.serviceCode = serviceCode
+        self.tagResource = None
         self.templateUID = None
-        self.logPath = None
-        self.logFile = None
-        self.logFilters = None
-        self.filterEnabled = None
 
-    def setResources(self, resources):
+    def setAgResource(self, agResource):
         """
-        :param resources: (Optional) 采集实例列表：jdcloud类型最多添加20个资源；custom类型支持的资源数量不限；
+        :param agResource: (Optional) 高可用组资源
         """
-        self.resources = resources
+        self.agResource = agResource
 
-    def setTemplateUID(self, templateUID):
+    def setFilterEnabled(self, filterEnabled):
         """
-        :param templateUID: (Optional) 日志类型。当appcode为jdcloud时为必填
+        :param filterEnabled: (Optional) 过滤器是否启用。当appcode为custom时必填
         """
-        self.templateUID = templateUID
+        self.filterEnabled = filterEnabled
 
-    def setLogPath(self, logPath):
+    def setLogCustomTarget(self, logCustomTarget):
         """
-        :param logPath: (Optional) 日志路径。当appcode为custom时为必填。目前仅支持对 Linux 云主机上的日志进行采集，路径支持通配符“*”和“？”，文件路径应符合 Linux 的文件路径规则
+        :param logCustomTarget: (Optional) 自定义日志转发目的地, 只支持业务应用日志。支持类型："kafka"，"es"，默认为空:不进行自定义目的上报
         """
-        self.logPath = logPath
+        self.logCustomTarget = logCustomTarget
+
+    def setLogCustomTargetConf(self, logCustomTargetConf):
+        """
+        :param logCustomTargetConf: (Optional) 自定义日志转发目的地配置，KV 结构，具体配置参考 LogCustomTargetKafkaConf 和 LogCustomTargetEsConf
+        """
+        self.logCustomTargetConf = logCustomTargetConf
 
     def setLogFile(self, logFile):
         """
@@ -85,9 +98,45 @@ def setLogFilters(self, logFilters):
         """
         self.logFilters = logFilters
 
-    def setFilterEnabled(self, filterEnabled):
+    def setLogPath(self, logPath):
         """
-        :param filterEnabled: (Optional) 过滤器是否启用。当appcode为custom时必填
+        :param logPath: (Optional) 日志路径。当appcode为custom时为必填。目前仅支持对 Linux 云主机上的日志进行采集，路径支持通配符“*”和“？”，文件路径应符合 Linux 的文件路径规则
         """
-        self.filterEnabled = filterEnabled
+        self.logPath = logPath
+
+    def setLogtopicEnabled(self, logtopicEnabled):
+        """
+        :param logtopicEnabled: (Optional) 目的地是否是日志服务logtopic，只支持业务应用日志
+        """
+        self.logtopicEnabled = logtopicEnabled
+
+    def setRegexpStr(self, regexpStr):
+        """
+        :param regexpStr: (Optional) 首行正则
+        """
+        self.regexpStr = regexpStr
+
+    def setResourceMode(self, resourceMode):
+        """
+        :param resourceMode: (Optional) 采集资源时选择的模式，1.正常的选择实例模式（默认模式）；2.选择标签tag模式 3.选择高可用组ag模式
+        """
+        self.resourceMode = resourceMode
+
+    def setResources(self, resources):
+        """
+        :param resources: (Optional) 采集实例列表：jdcloud类型最多添加20个资源；custom类型支持的资源数量不限；
+        """
+        self.resources = resources
+
+    def setTagResource(self, tagResource):
+        """
+        :param tagResource: (Optional) 
+        """
+        self.tagResource = tagResource
+
+    def setTemplateUID(self, templateUID):
+        """
+        :param templateUID: (Optional) 日志类型。当appcode为jdcloud时为必填
+        """
+        self.templateUID = templateUID
 

jdcloud_sdk/services/logs/apis/CreateLogsetRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateLogsetParameters(object):
 
-    def __init__(self, regionId, name, lifeCycle):
+    def __init__(self, regionId,name, lifeCycle):
         """
         :param regionId: 地域 Id
         :param name: 日志集名称

jdcloud_sdk/services/logs/apis/CreateLogtopicRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class CreateLogtopicParameters(object):
 
-    def __init__(self, regionId, logsetUID, name, ):
+    def __init__(self, regionId,logsetUID,name, ):
         """
         :param regionId: 地域 Id
         :param logsetUID: 日志集 UID

jdcloud_sdk/services/logs/apis/CreateMetricTaskRequest.py

@@ -0,0 +1,109 @@
+# coding=utf8
+
+# Copyright 2018 JDCLOUD.COM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# NOTE: This class is auto generated by the jdcloud code generator program.
+
+from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
+
+
+class CreateMetricTaskRequest(JDCloudRequest):
+    """
+    创建监控任务，不可与当前日志主题下现有日志监控任务重名。
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(CreateMetricTaskRequest, self).__init__(
+            '/regions/{regionId}/logsets/{logsetUID}/logtopics/{logtopicUID}/metrictasks', 'POST', header, version)
+        self.parameters = parameters
+
+
+class CreateMetricTaskParameters(object):
+
+    def __init__(self, regionId,logsetUID,logtopicUID,customUnit, interval, name, unit):
+        """
+        :param regionId: 地域 Id
+        :param logsetUID: 日志集 UID
+        :param logtopicUID: 日志主题 UID
+        :param customUnit: 自定义单位
+        :param interval: 时间周期，固定60s
+        :param name: 监控任务名称,同一个日志主题下唯一，支持中文 大小写英文字母 下划线 中划线 数字，且不超过32字符
+        :param unit: 单位
+        """
+
+        self.regionId = regionId
+        self.logsetUID = logsetUID
+        self.logtopicUID = logtopicUID
+        self.aggregate = None
+        self.customUnit = customUnit
+        self.dataField = None
+        self.filterContent = None
+        self.filterOpen = None
+        self.filterType = None
+        self.interval = interval
+        self.metric = None
+        self.name = name
+        self.settingType = None
+        self.sqlSpec = None
+        self.unit = unit
+
+    def setAggregate(self, aggregate):
+        """
+        :param aggregate: (Optional) 聚合函数,支持 count sum max min avg; 配置方式(SettingType) 为 空或visual 时，必填；
+        """
+        self.aggregate = aggregate
+
+    def setDataField(self, dataField):
+        """
+        :param dataField: (Optional) 查询字段,支持 英文字母 数字 下划线 中划线 点（中文日志原文和各产品线的key）; 配置方式(SettingType) 为 空或visual 时，必填；
+        """
+        self.dataField = dataField
+
+    def setFilterContent(self, filterContent):
+        """
+        :param filterContent: (Optional) 过滤语法，可以为空
+        """
+        self.filterContent = filterContent
+
+    def setFilterOpen(self, filterOpen):
+        """
+        :param filterOpen: (Optional) 是否打开过滤; 配置方式(SettingType) 为 空或visual 时，必填；
+        """
+        self.filterOpen = filterOpen
+
+    def setFilterType(self, filterType):
+        """
+        :param filterType: (Optional) 过滤类型，只能是fulltext和 advance; 配置方式(SettingType) 为 空或visual 时，必填；
+        """
+        self.filterType = filterType
+
+    def setMetric(self, metric):
+        """
+        :param metric: (Optional) 监控项 , 支持大小写英文字母 下划线 数字 点，且不超过255byte（不支持中划线）; 配置方式(SettingType) 为 空或visual 时，必填；
+        """
+        self.metric = metric
+
+    def setSettingType(self, settingType):
+        """
+        :param settingType: (Optional) 配置方式: 可选参数；枚举值 visual，sql；分别代表可视化配置及sql配置方式，传空表示可视化配置；
+        """
+        self.settingType = settingType
+
+    def setSqlSpec(self, sqlSpec):
+        """
+        :param sqlSpec: (Optional) 
+        """
+        self.sqlSpec = sqlSpec
+

jdcloud_sdk/services/logs/apis/CreateParserRequest.py

@@ -0,0 +1,61 @@
+# coding=utf8
+
+# Copyright 2018 JDCLOUD.COM
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# NOTE: This class is auto generated by the jdcloud code generator program.
+
+from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
+
+
+class CreateParserRequest(JDCloudRequest):
+    """
+    创建日志的解析配置。
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(CreateParserRequest, self).__init__(
+            '/regions/{regionId}/logtopics/{logtopicUID}/createParser', 'POST', header, version)
+        self.parameters = parameters
+
+
+class CreateParserParameters(object):
+
+    def __init__(self, regionId,logtopicUID,parserFields, parserMode, ):
+        """
+        :param regionId: 地域 Id
+        :param logtopicUID: 日志主题 UID
+        :param parserFields: 
+        :param parserMode: 解析类型。oneline - 单行，split - 分割， json - json， regexp - regexp
+        """
+
+        self.regionId = regionId
+        self.logtopicUID = logtopicUID
+        self.parserFields = parserFields
+        self.parserMode = parserMode
+        self.parserPattern = None
+        self.parserSample = None
+
+    def setParserPattern(self, parserPattern):
+        """
+        :param parserPattern: (Optional) 解析语法
+        """
+        self.parserPattern = parserPattern
+
+    def setParserSample(self, parserSample):
+        """
+        :param parserSample: (Optional) 日志样例
+        """
+        self.parserSample = parserSample
+

…s/DescribeInstanceCollectConfsRequest.py …ices/logs/apis/CreateSubscribeRequest.pyjdcloud_sdk/services/logs/apis/DescribeInstanceCollectConfsRequest.py renamed to jdcloud_sdk/services/logs/apis/CreateSubscribeRequest.py jdcloud_sdk/services/logs/apis/DescribeInstanceCollectConfsRequest.py renamed to jdcloud_sdk/services/logs/apis/CreateSubscribeRequest.py

@@ -19,25 +19,27 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class DescribeInstanceCollectConfsRequest(JDCloudRequest):
+class CreateSubscribeRequest(JDCloudRequest):
     """
-    查询当前实例的采集配置列表：此接口会生成agent心跳监控数据，用以表征agent的可用性。请求中若添加了X-Jdcloud-Logs-md5的header，将按照md5的方式处理返回值。
+    创建日志消费
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(DescribeInstanceCollectConfsRequest, self).__init__(
-            '/regions/{regionId}/instances/{instanceId}/collectconfs', 'GET', header, version)
+        super(CreateSubscribeRequest, self).__init__(
+            '/regions/{regionId}/logsets/{logsetUID}/logtopics/{logtopicUID}/subscribe', 'POST', header, version)
         self.parameters = parameters
 
 
-class DescribeInstanceCollectConfsParameters(object):
+class CreateSubscribeParameters(object):
 
-    def __init__(self, regionId, instanceId, ):
+    def __init__(self, regionId,logsetUID,logtopicUID,):
         """
-        :param regionId: region
-        :param instanceId: instanceId
+        :param regionId: 地域 Id
+        :param logsetUID: 日志集 UID
+        :param logtopicUID: 日志主题 UID
         """
 
         self.regionId = regionId
-        self.instanceId = instanceId
+        self.logsetUID = logsetUID
+        self.logtopicUID = logtopicUID
 

jdcloud_sdk/services/logs/apis/DeleteLogsetRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"):
 
 class DeleteLogsetParameters(object):
 
-    def __init__(self, regionId, logsetUIDs, ):
+    def __init__(self, regionId,logsetUIDs,):
         """
         :param regionId: 地域 Id
         :param logsetUIDs: 日志集ID，多个日志集ID以逗号分割