Skip to content

Commit eee3b82

Browse files
authored
sdk: rolling update for 0.11.124 (#357)
1 parent 875a092 commit eee3b82

9 files changed

Lines changed: 968 additions & 152 deletions

File tree

‎ucloud/services/cloudwatch/client.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -270,19 +270,6 @@ def get_product_metrics(
270270
271271
**Response Model**
272272
273-
**ConversionRule**
274-
- **ConversionFactor** (int) - 转换因子
275-
- **From** (str) - 来源
276-
- **To** (str) - 目标
277-
278-
279-
**MetricUnitConfig**
280-
- **ConversionFactor** (int) - 转换因子
281-
- **ConversionRules** (list) - 见 **ConversionRule** 模型定义
282-
- **UnitCnNames** (list) - 指标中文名列表
283-
- **UnitEnNames** (list) - 指标英文名列表
284-
285-
286273
**MetricUnit**
287274
- **ConversionFactor** (int) - 转换因子
288275
- **CreatedAt** (str) - 创建时间
@@ -315,6 +302,19 @@ def get_product_metrics(
315302
- **UpdatedBy** (str) - 修改者
316303
317304
305+
**ConversionRule**
306+
- **ConversionFactor** (int) - 转换因子
307+
- **From** (str) - 来源
308+
- **To** (str) - 目标
309+
310+
311+
**MetricUnitConfig**
312+
- **ConversionFactor** (int) - 转换因子
313+
- **ConversionRules** (list) - 见 **ConversionRule** 模型定义
314+
- **UnitCnNames** (list) - 指标中文名列表
315+
- **UnitEnNames** (list) - 指标英文名列表
316+
317+
318318
**GetProductMetricsRespData**
319319
- **List** (list) - 见 **Metirc** 模型定义
320320
- **Total** (int) - 查询结果总数
@@ -661,16 +661,16 @@ def query_metric_data_set(
661661
- **TagName** (str) - 标签名称
662662
663663
664-
**MetricSample**
665-
- **Timestamp** (int) - 时间戳
666-
- **Value** (float) - 样本值
667-
668-
669664
**TagListItem**
670665
- **Tag** (str) - 标签名
671666
- **TagValue** (str) - 标签值
672667
673668
669+
**MetricSample**
670+
- **Timestamp** (int) - 时间戳
671+
- **Value** (float) - 样本值
672+
673+
674674
**MetricResult**
675675
- **ResourceId** (str) - 资源的短id
676676
- **ResourceName** (str) - 资源名称

‎ucloud/services/cloudwatch/schemas/models.py‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,18 @@ class MetricUnitSchema(schema.ResponseSchema):
6868
}
6969

7070

71+
class ConversionRuleSchema(schema.ResponseSchema):
72+
"""ConversionRule - 指标单位转换规则"""
73+
74+
fields = {
75+
"ConversionFactor": fields.Int(
76+
required=False, load_from="ConversionFactor"
77+
),
78+
"From": fields.Str(required=False, load_from="From"),
79+
"To": fields.Str(required=False, load_from="To"),
80+
}
81+
82+
7183
class MetircSchema(schema.ResponseSchema):
7284
"""Metirc - 指标"""
7385

@@ -90,18 +102,6 @@ class MetircSchema(schema.ResponseSchema):
90102
}
91103

92104

93-
class ConversionRuleSchema(schema.ResponseSchema):
94-
"""ConversionRule - 指标单位转换规则"""
95-
96-
fields = {
97-
"ConversionFactor": fields.Int(
98-
required=False, load_from="ConversionFactor"
99-
),
100-
"From": fields.Str(required=False, load_from="From"),
101-
"To": fields.Str(required=False, load_from="To"),
102-
}
103-
104-
105105
class MetricUnitConfigSchema(schema.ResponseSchema):
106106
"""MetricUnitConfig - 指标单位配置"""
107107

@@ -261,21 +261,21 @@ class ListMonitorProductSchema(schema.ResponseSchema):
261261
}
262262

263263

264-
class TagListItemSchema(schema.ResponseSchema):
265-
"""TagListItem - 标签键值项"""
264+
class MetricSampleSchema(schema.ResponseSchema):
265+
"""MetricSample - 指标数据点(代码结构体:MetricPoint)"""
266266

267267
fields = {
268-
"Tag": fields.Str(required=False, load_from="Tag"),
269-
"TagValue": fields.Str(required=False, load_from="TagValue"),
268+
"Timestamp": fields.Int(required=False, load_from="Timestamp"),
269+
"Value": fields.Float(required=False, load_from="Value"),
270270
}
271271

272272

273-
class MetricSampleSchema(schema.ResponseSchema):
274-
"""MetricSample - 指标数据点(代码结构体:MetricPoint)"""
273+
class TagListItemSchema(schema.ResponseSchema):
274+
"""TagListItem - 标签键值项"""
275275

276276
fields = {
277-
"Timestamp": fields.Int(required=False, load_from="Timestamp"),
278-
"Value": fields.Float(required=False, load_from="Value"),
277+
"Tag": fields.Str(required=False, load_from="Tag"),
278+
"TagValue": fields.Str(required=False, load_from="TagValue"),
279279
}
280280

281281

@@ -320,40 +320,40 @@ class QueryMetricDataRespSchema(schema.ResponseSchema):
320320
}
321321

322322

323-
class ResourceExtendAttrItemSchema(schema.ResponseSchema):
324-
"""ResourceExtendAttrItem - 资源扩展属性项"""
323+
class MetricSingleSampleSchema(schema.ResponseSchema):
324+
"""MetricSingleSample - 指标单个样本点结果"""
325325

326326
fields = {
327-
"Key": fields.Str(required=False, load_from="Key"),
328-
"Value": fields.Str(required=False, load_from="Value"),
327+
"Metric": fields.Str(required=False, load_from="Metric"),
328+
"TagsList": fields.List(TagListItemSchema()),
329+
"Value": MetricSampleSchema(),
329330
}
330331

331332

332-
class LabelAttrItemSchema(schema.ResponseSchema):
333-
"""LabelAttrItem - 标签扩展属性项"""
333+
class ResourceMonitorItemSchema(schema.ResponseSchema):
334+
"""ResourceMonitorItem - 资源监控的单个指标数据"""
334335

335336
fields = {
336-
"Key": fields.Str(required=False, load_from="Key"),
337-
"Value": fields.Str(required=False, load_from="Value"),
337+
"Metric": fields.Str(required=False, load_from="Metric"),
338+
"MetricValues": fields.List(MetricSingleSampleSchema()),
338339
}
339340

340341

341-
class MetricSingleSampleSchema(schema.ResponseSchema):
342-
"""MetricSingleSample - 指标单个样本点结果"""
342+
class ResourceExtendAttrItemSchema(schema.ResponseSchema):
343+
"""ResourceExtendAttrItem - 资源扩展属性项"""
343344

344345
fields = {
345-
"Metric": fields.Str(required=False, load_from="Metric"),
346-
"TagsList": fields.List(TagListItemSchema()),
347-
"Value": MetricSampleSchema(),
346+
"Key": fields.Str(required=False, load_from="Key"),
347+
"Value": fields.Str(required=False, load_from="Value"),
348348
}
349349

350350

351-
class ResourceMonitorItemSchema(schema.ResponseSchema):
352-
"""ResourceMonitorItem - 资源监控的单个指标数据"""
351+
class LabelAttrItemSchema(schema.ResponseSchema):
352+
"""LabelAttrItem - 标签扩展属性项"""
353353

354354
fields = {
355-
"Metric": fields.Str(required=False, load_from="Metric"),
356-
"MetricValues": fields.List(MetricSingleSampleSchema()),
355+
"Key": fields.Str(required=False, load_from="Key"),
356+
"Value": fields.Str(required=False, load_from="Value"),
357357
}
358358

359359

0 commit comments

Comments
 (0)