Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 79 additions & 1 deletion ucloud/services/ulogservice/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,46 @@ def delete_u_log_service_topic(
resp = self.invoke("DeleteULogServiceTopic", d, **kwargs)
return apis.DeleteULogServiceTopicResponseSchema().loads(resp)

def describe_u_log_service_log_set(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
"""DescribeULogServiceLogSet - 获取日志集信息

**Request**

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
- **LogSetId** (str) - (Required) 日志集ID
- **Zone** (str) - (Required) 可用区。参见 `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_

**Response**

- **LogSetInfo** (dict) - 见 **LogSetInfo** 模型定义
- **TotalCount** (int) - 日志集总数

**Response Model**

**LogSetInfo**
- **CreateTime** (int) - 创建时间
- **LogSetId** (str) - 日志集ID
- **LogSetName** (str) - 日志集名称
- **LogSetRemark** (str) - 日志集备注
- **TopicCount** (int) - 日志集下主题数量
- **UpdateTime** (int) - 更新时间


"""
# build request
d = {
"ProjectId": self.config.project_id,
"Region": self.config.region,
}
req and d.update(req)
d = apis.DescribeULogServiceLogSetRequestSchema().dumps(d)

resp = self.invoke("DescribeULogServiceLogSet", d, **kwargs)
return apis.DescribeULogServiceLogSetResponseSchema().loads(resp)

def describe_u_log_service_machine_group(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
Expand Down Expand Up @@ -355,6 +395,44 @@ def describe_u_log_service_machine_group(
resp = self.invoke("DescribeULogServiceMachineGroup", d, **kwargs)
return apis.DescribeULogServiceMachineGroupResponseSchema().loads(resp)

def describe_u_log_service_topic(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
"""DescribeULogServiceTopic - 获取ULogService主题详情

**Request**

- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
- **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
- **TopicId** (str) - (Required) 主题Id

**Response**

- **Data** (dict) - 见 **TopicInfo** 模型定义

**Response Model**

**TopicInfo**
- **IsReserved** (int) - 是否保留:0 - NORMAL, 1 - RESERVED
- **ReserveAge** (int) - 保存时间 1~730 天
- **State** (str) - 日志主题状态
- **TopicId** (str) - 主题ID
- **TopicName** (str) - 主题名称
- **TopicShardNum** (int) - 分区数量,固定是2


"""
# build request
d = {
"ProjectId": self.config.project_id,
"Region": self.config.region,
}
req and d.update(req)
d = apis.DescribeULogServiceTopicRequestSchema().dumps(d)

resp = self.invoke("DescribeULogServiceTopic", d, **kwargs)
return apis.DescribeULogServiceTopicResponseSchema().loads(resp)

def get_u_log_service_topic_field(
self, req: typing.Optional[dict] = None, **kwargs
) -> dict:
Expand Down Expand Up @@ -555,7 +633,7 @@ def list_u_log_service_topic(
**TopicInfo**
- **IsReserved** (int) - 是否保留:0 - NORMAL, 1 - RESERVED
- **ReserveAge** (int) - 保存时间 1~730 天
- **TopicDesc** (str) - 主题描述
- **State** (str) - 日志主题状态
- **TopicId** (str) - 主题ID
- **TopicName** (str) - 主题名称
- **TopicShardNum** (int) - 分区数量,固定是2
Expand Down
52 changes: 52 additions & 0 deletions ucloud/services/ulogservice/schemas/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,33 @@ class DeleteULogServiceTopicResponseSchema(schema.ResponseSchema):
}


"""
API: DescribeULogServiceLogSet

获取日志集信息
"""


class DescribeULogServiceLogSetRequestSchema(schema.RequestSchema):
"""DescribeULogServiceLogSet - 获取日志集信息"""

fields = {
"LogSetId": fields.Str(required=True, dump_to="LogSetId"),
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
"Region": fields.Str(required=True, dump_to="Region"),
"Zone": fields.Str(required=True, dump_to="Zone"),
}


class DescribeULogServiceLogSetResponseSchema(schema.ResponseSchema):
"""DescribeULogServiceLogSet - 获取日志集信息"""

fields = {
"LogSetInfo": models.LogSetInfoSchema(),
"TotalCount": fields.Int(required=True, load_from="TotalCount"),
}


"""
API: DescribeULogServiceMachineGroup

Expand Down Expand Up @@ -298,6 +325,31 @@ class DescribeULogServiceMachineGroupResponseSchema(schema.ResponseSchema):
}


"""
API: DescribeULogServiceTopic

获取ULogService主题详情
"""


class DescribeULogServiceTopicRequestSchema(schema.RequestSchema):
"""DescribeULogServiceTopic - 获取ULogService主题详情"""

fields = {
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
"Region": fields.Str(required=True, dump_to="Region"),
"TopicId": fields.Str(required=True, dump_to="TopicId"),
}


class DescribeULogServiceTopicResponseSchema(schema.ResponseSchema):
"""DescribeULogServiceTopic - 获取ULogService主题详情"""

fields = {
"Data": models.TopicInfoSchema(),
}


"""
API: GetULogServiceTopicField

Expand Down
63 changes: 33 additions & 30 deletions ucloud/services/ulogservice/schemas/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
from ucloud.core.typesystem import schema, fields


class LogSetInfoSchema(schema.ResponseSchema):
"""LogSetInfo - 日志集信息"""

fields = {
"CreateTime": fields.Int(required=False, load_from="CreateTime"),
"LogSetId": fields.Str(required=False, load_from="LogSetId"),
"LogSetName": fields.Str(required=False, load_from="LogSetName"),
"LogSetRemark": fields.Str(required=False, load_from="LogSetRemark"),
"TopicCount": fields.Int(required=False, load_from="TopicCount"),
"UpdateTime": fields.Int(required=False, load_from="UpdateTime"),
}


class LogAgentSchema(schema.ResponseSchema):
"""LogAgent - logagent 信息"""

Expand All @@ -29,6 +42,22 @@ class MachineInfoSchema(schema.ResponseSchema):
}


class TopicInfoSchema(schema.ResponseSchema):
"""TopicInfo - 主题信息"""

fields = {
"IsReserved": fields.Int(required=False, load_from="IsReserved"),
"ReserveAge": fields.Int(required=False, load_from="ReserveAge"),
"State": fields.Str(required=False, load_from="State"),
"TopicDesc": fields.Str(
required=False, load_from="TopicDesc"
), # Deprecated, will be removed at 1.0
"TopicId": fields.Str(required=False, load_from="TopicId"),
"TopicName": fields.Str(required=False, load_from="TopicName"),
"TopicShardNum": fields.Int(required=False, load_from="TopicShardNum"),
}


class TopicFieldSchema(schema.ResponseSchema):
"""TopicField - 索引字段"""

Expand Down Expand Up @@ -83,29 +112,12 @@ class CollectConfSchema(schema.ResponseSchema):
}


class LogSetInfoSchema(schema.ResponseSchema):
"""LogSetInfo - 日志集信息"""

fields = {
"CreateTime": fields.Int(required=False, load_from="CreateTime"),
"LogSetId": fields.Str(required=False, load_from="LogSetId"),
"LogSetName": fields.Str(required=False, load_from="LogSetName"),
"LogSetRemark": fields.Str(required=False, load_from="LogSetRemark"),
"TopicCount": fields.Int(required=False, load_from="TopicCount"),
"UpdateTime": fields.Int(required=False, load_from="UpdateTime"),
}


class TopicInfoSchema(schema.ResponseSchema):
"""TopicInfo - 主题信息"""
class AnalysisFieldSchema(schema.ResponseSchema):
"""AnalysisField - 统计分析结果字段头"""

fields = {
"IsReserved": fields.Int(required=False, load_from="IsReserved"),
"ReserveAge": fields.Int(required=False, load_from="ReserveAge"),
"TopicDesc": fields.Str(required=False, load_from="TopicDesc"),
"TopicId": fields.Str(required=False, load_from="TopicId"),
"TopicName": fields.Str(required=False, load_from="TopicName"),
"TopicShardNum": fields.Int(required=False, load_from="TopicShardNum"),
"Name": fields.Str(required=True, load_from="Name"),
"Type": fields.Str(required=True, load_from="Type"),
}


Expand All @@ -121,15 +133,6 @@ class LogContentSchema(schema.ResponseSchema):
}


class AnalysisFieldSchema(schema.ResponseSchema):
"""AnalysisField - 统计分析结果字段头"""

fields = {
"Name": fields.Str(required=True, load_from="Name"),
"Type": fields.Str(required=True, load_from="Type"),
}


class LogQueryResultSchema(schema.ResponseSchema):
"""LogQueryResult - 日志检索结果"""

Expand Down
2 changes: 1 addition & 1 deletion ucloud/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "0.11.149"
version = "0.11.150"
Loading