Merge pull request #160 from jdcloud-apigateway/master

publish jdcloud-sdk-python 1.6.150

Author: jdcloud-apigateway

jdcloud_sdk/services/monitor/ChangeLog.md

@@ -44,8 +44,10 @@ def __init__(self, clientToken, product, resourceOption, ruleName, ruleOption, )
         self.autoScalingPolicyId = None
         self.baseContact = None
         self.clientToken = clientToken
+        self.dataOwner = None
         self.dimension = None
         self.enabled = None
+        self.multiWebHook = None
         self.noticeOption = None
         self.product = product
         self.resourceOption = resourceOption
@@ -67,6 +69,12 @@ def setBaseContact(self, baseContact):
         """
         self.baseContact = baseContact
 
+    def setDataOwner(self, dataOwner):
+        """
+        :param dataOwner: (Optional) 数据所有者，1云监控控制台; 2云鼎。默认为1
+        """
+        self.dataOwner = dataOwner
+
     def setDimension(self, dimension):
         """
         :param dimension: (Optional) 资源维度，可用的维度请使用 describeProductsForAlarm接口查询
@@ -79,6 +87,12 @@ def setEnabled(self, enabled):
         """
         self.enabled = enabled
 
+    def setMultiWebHook(self, multiWebHook):
+        """
+        :param multiWebHook: (Optional) url回调设置数组
+        """
+        self.multiWebHook = multiWebHook
+
     def setNoticeOption(self, noticeOption):
         """
         :param noticeOption: (Optional) 通知策略

jdcloud_sdk/services/monitor/apis/CreateAlarmRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v2"):
 
 class DeleteAlarmsParameters(object):
 
-    def __init__(self, alarmId, ):
+    def __init__(self, alarmId,):
         """
         :param alarmId: 规则id
         """

jdcloud_sdk/services/monitor/apis/DeleteAlarmsRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v2"):
 
 class DescribeAlarmContactsParameters(object):
 
-    def __init__(self, alarmId, ):
+    def __init__(self, alarmId,):
         """
         :param alarmId: 规则id
         """

jdcloud_sdk/services/monitor/apis/DescribeAlarmContactsRequest.py

@@ -38,6 +38,7 @@ def __init__(self, ):
 
         self.pageNumber = None
         self.pageSize = None
+        self.dataOwner = None
         self.serviceCode = None
         self.product = None
         self.dimension = None
@@ -62,6 +63,12 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
+    def setDataOwner(self, dataOwner):
+        """
+        :param dataOwner: (Optional) 数据所有者，1云监控控制台; 2云鼎。默认为1
+        """
+        self.dataOwner = dataOwner
+
     def setServiceCode(self, serviceCode):
         """
         :param serviceCode: (Optional) 产品线标识，同一个产品线下可能存在多个product，如(redis下有redis2.8cluster、redis4.0)

jdcloud_sdk/services/monitor/apis/DescribeAlarmHistoryRequest.py

@@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v2"):
 
 class DescribeAlarmParameters(object):
 
-    def __init__(self, alarmId, ):
+    def __init__(self, alarmId,):
         """
         :param alarmId: 规则id
         """

jdcloud_sdk/services/monitor/apis/DescribeAlarmRequest.py

@@ -38,6 +38,7 @@ def __init__(self, ):
 
         self.pageNumber = None
         self.pageSize = None
+        self.dataOwner = None
         self.serviceCode = None
         self.product = None
         self.dimension = None
@@ -59,6 +60,12 @@ def setPageSize(self, pageSize):
         """
         self.pageSize = pageSize
 
+    def setDataOwner(self, dataOwner):
+        """
+        :param dataOwner: (Optional) 数据所有者，1云监控控制台; 2云鼎。默认为1
+        """
+        self.dataOwner = dataOwner
+
     def setServiceCode(self, serviceCode):
         """
         :param serviceCode: (Optional) 产品线标识，同一个产品线下可能存在多个product，如(redis下有redis2.8cluster、redis4.0)

jdcloud_sdk/services/monitor/apis/DescribeAlarmsRequest.py

@@ -0,0 +1,66 @@
+# 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 DescribeCustomMetricDataRequest(JDCloudRequest):
+    """
+    通过指定维度查询自定义监控的数据
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(DescribeCustomMetricDataRequest, self).__init__(
+            '/regions/{regionId}/namespaces/{namespaceUID}/metricData', 'POST', header, version)
+        self.parameters = parameters
+
+
+class DescribeCustomMetricDataParameters(object):
+
+    def __init__(self, regionId,namespaceUID,query, ):
+        """
+        :param regionId: region
+        :param namespaceUID: namespace
+        :param query: 
+        """
+
+        self.regionId = regionId
+        self.namespaceUID = namespaceUID
+        self.endTime = None
+        self.query = query
+        self.startTime = None
+        self.timeInterval = None
+
+    def setEndTime(self, endTime):
+        """
+        :param endTime: (Optional) 查询时间范围的结束时间， UTC时间，格式：2016-12-11T00:00:00+0800（为空时，将由startTime与timeInterval计算得出）
+        """
+        self.endTime = endTime
+
+    def setStartTime(self, startTime):
+        """
+        :param startTime: (Optional) 查询时间范围的开始时间， UTC时间，格式：2016-12-11T00:00:00+0800
+        """
+        self.startTime = startTime
+
+    def setTimeInterval(self, timeInterval):
+        """
+        :param timeInterval: (Optional) 时间间隔：1h，6h，12h，1d，3d，7d，14d，固定时间间隔，timeInterval默认为1h，当前时间往 前1h
+        """
+        self.timeInterval = timeInterval
+

jdcloud_sdk/services/monitor/apis/DescribeCustomMetricDataRequest.py

@@ -21,7 +21,11 @@
 
 class DescribeMetricDataRequest(JDCloudRequest):
     """
-    查看某资源单个监控项数据，metric介绍：<a href="https://docs.jdcloud.com/cn/monitoring/metrics">Metrics</a>，可以使用接口<a href="https://docs.jdcloud.com/cn/monitoring/metrics">describeMetrics</a>：查询产品线可用的metric列表。
+    查看某资源单个监控项数据.
+metric介绍: <a href="https://docs.jdcloud.com/cn/monitoring/metrics">Metrics</a>
+可以使用接口:<a href="https://docs.jdcloud.com/cn/monitoring/metrics">describeMetrics</a>:查询产品线可用的metric列表。
+查询起止时间统一向下对齐10s, 举例:开始时间为 08:45:45 会对齐到08:45:40
+
     """
 
     def __init__(self, parameters, header=None, version="v2"):
@@ -32,7 +36,7 @@ def __init__(self, parameters, header=None, version="v2"):
 
 class DescribeMetricDataParameters(object):
 
-    def __init__(self, regionId, metric, resourceId):
+    def __init__(self, regionId,metric,resourceId):
         """
         :param regionId: 地域 Id
         :param metric: 监控项英文标识(id)
@@ -68,18 +72,27 @@ def setDownSampleType(self, downSampleType):
     def setStartTime(self, startTime):
         """
         :param startTime: (Optional) 查询时间范围的开始时间， UTC时间，格式：2016-12-11T00:00:00+0800（注意在url中+要转译为%2B故url中为2016-12-11T00:00:00%2B0800）
+开始时间不得晚于当前时间,开始时间不得早于 30 天前
+
         """
         self.startTime = startTime
 
     def setEndTime(self, endTime):
         """
-        :param endTime: (Optional) 查询时间范围的结束时间， UTC时间，格式：2016-12-11T00:00:00+0800（为空时，将由startTime与timeInterval计算得出）（注意在url中+要转译为%2B故url中为2016-12-11T00:00:00%2B0800）
+        :param endTime: (Optional) 查询时间范围的结束时间, UTC时间，格式：2016-12-11T00:00:00+0800（为空时，将由startTime与timeInterval计算得出）（注意在url中+要转译为%2B故url中为2016-12-11T00:00:00%2B0800）
+默认为当前时间,结束时间不得晚于当前时间. 如果晚于, 会被默认设成当前时间, 结束时间不得早于 30 天前.
+
         """
         self.endTime = endTime
 
     def setTimeInterval(self, timeInterval):
         """
         :param timeInterval: (Optional) 时间间隔：1h，6h，12h，1d，3d，7d，14d，固定时间间隔，timeInterval默认为1h，当前时间往 前1h
+如果指定了 startTime 和 endTime,可以不用设置. 默认的,三个参数都不设置查询 1h 内数据.
+timeInterval 默认值 1h
+endTime 默认值, 当前时间
+startTime 默认值,  endTime - timeInterval
+
         """
         self.timeInterval = timeInterval
 
@@ -97,7 +110,7 @@ def setGroupBy(self, groupBy):
 
     def setRate(self, rate):
         """
-        :param rate: (Optional) 是否求速率
+        :param rate: (Optional) 是否求速率。仅对累积类型指标有意义, 默认 false
         """
         self.rate = rate
 

jdcloud_sdk/services/monitor/apis/DescribeMetricDataRequest.py

@@ -0,0 +1,82 @@
+# 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 DescribeTagValuesRequest(JDCloudRequest):
+    """
+    查询某资源下指定tag key的tag value
+    """
+
+    def __init__(self, parameters, header=None, version="v2"):
+        super(DescribeTagValuesRequest, self).__init__(
+            '/regions/{regionId}/tagValues/{tagKey}', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeTagValuesParameters(object):
+
+    def __init__(self, regionId,tagKey,serviceCode, resourceId, ):
+        """
+        :param regionId: region
+        :param tagKey: region
+        :param serviceCode: serviceCode
+        :param resourceId: 资源标识
+        """
+
+        self.regionId = regionId
+        self.tagKey = tagKey
+        self.serviceCode = serviceCode
+        self.resourceId = resourceId
+        self.metric = None
+        self.startTime = None
+        self.endTime = None
+        self.timeInterval = None
+        self.tags = None
+
+    def setMetric(self, metric):
+        """
+        :param metric: (Optional) metric
+        """
+        self.metric = metric
+
+    def setStartTime(self, startTime):
+        """
+        :param startTime: (Optional) 查询时间范围的开始时间(如不传,则默认为1时前)， UTC时间，格式：2016-12-11T00:00:00+0800（注意在url中+,:要转译,如2019-10-23T10%3A33%3A31%2B0800）。对于非连续的时序数据，开始时间无法保证准确性
+        """
+        self.startTime = startTime
+
+    def setEndTime(self, endTime):
+        """
+        :param endTime: (Optional) 查询时间范围的结束时间(如不传,则默认为当前)， UTC时间，格式：2016-12-11T00:00:00+0800（注意在url中+,:要转译,如2019-10-23T10%3A33%3A31%2B0800）.对于非连续的时序数据，结束时间无法保证准确性
+        """
+        self.endTime = endTime
+
+    def setTimeInterval(self, timeInterval):
+        """
+        :param timeInterval: (Optional) 时间间隔：1h，6h，12h，1d，3d，7d，14d，固定时间间隔，timeInterval默认为1h，当前时间往 前1h
+        """
+        self.timeInterval = timeInterval
+
+    def setTags(self, tags):
+        """
+        :param tags: (Optional) 根据tags进行筛选(传入*和不传的效果一致)
+        """
+        self.tags = tags
+