tccli 3.0.1144.1__py2.py3-none-any.whl → 3.0.1145.1__py2.py3-none-any.whl

tccli/services/dbdc/v20201029/api.json

@@ -1110,7 +1110,7 @@
         {
           "disabled": false,
           "document": "集群类型: 0 一主一备, 1 一主两备...N-1 一主N备",
-          "example": "",
+          "example": "[0]",
           "member": "int64",
           "name": "InstanceTypes",
           "required": false,
@@ -1119,7 +1119,7 @@
         {
           "disabled": false,
           "document": "产品ID:  0 MYSQL，1 TDSQL",
-          "example": "",
+          "example": "[1]",
           "member": "int64",
           "name": "ProductIds",
           "required": false,
@@ -1128,7 +1128,7 @@
         {
           "disabled": false,
           "document": "集群uuid: 如 dbdc-q810131s",
-          "example": "",
+          "example": "[\"dbdc-qhdgwfs\"]",
           "member": "string",
           "name": "InstanceIds",
           "required": false,
@@ -1137,7 +1137,7 @@
         {
           "disabled": false,
           "document": "是否按金融围笼标志搜索",
-          "example": "",
+          "example": "false",
           "member": "bool",
           "name": "FenceFlag",
           "required": false,
@@ -1146,7 +1146,7 @@
         {
           "disabled": false,
           "document": "按实例名字模糊匹配",
-          "example": "",
+          "example": "exclust",
           "member": "string",
           "name": "InstanceName",
           "required": false,
@@ -1155,7 +1155,7 @@
         {
           "disabled": false,
           "document": "每页数目, 整型",
-          "example": "",
+          "example": "100",
           "member": "int64",
           "name": "PageSize",
           "required": false,
@@ -1164,7 +1164,7 @@
         {
           "disabled": false,
           "document": "页码, 整型",
-          "example": "",
+          "example": "1",
           "member": "int64",
           "name": "PageNumber",
           "required": false,
@@ -1173,7 +1173,7 @@
         {
           "disabled": false,
           "document": "排序字段，枚举：createtime,groupname",
-          "example": "",
+          "example": "createtime",
           "member": "string",
           "name": "OrderBy",
           "required": false,
@@ -1182,7 +1182,7 @@
         {
           "disabled": false,
           "document": "排序方式: asc升序, desc降序",
-          "example": "",
+          "example": "asc",
           "member": "string",
           "name": "OrderByType",
           "required": false,
@@ -1191,7 +1191,7 @@
         {
           "disabled": false,
           "document": "集群状态: -2 已删除, -1 已隔离, 0 创建中, 1 运行中, 2 扩容中, 3 删除中",
-          "example": "",
+          "example": "1",
           "member": "int64",
           "name": "InstanceStatus",
           "required": false,
@@ -1206,18 +1206,20 @@
         {
           "disabled": false,
           "document": "集群数量",
-          "example": "",
+          "example": "1",
           "member": "int64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "集群扩展信息",
-          "example": "",
+          "example": "[             {                 \"AppId\": 1252328453,                 \"AutoRenewFlag\": 0,                 \"CreateTime\": \"2021-02-25T16:08:47+08:00\",                 \"InstanceDetail\": {                     \"InstanceDeviceInfos\": [                         {                             \"FreeDevice\": [],                             \"InstanceId\": \"szjr-3-7\",                             \"ReadOnlyDevice\": [],                             \"ReadWriteDevice\": [                                 {                                     \"DevClass\": \"SH12\",                                     \"DeviceId\": 191108504,                                     \"DeviceNo\": \"\",                                     \"InstanceNum\": 29,                                     \"MaxDisk\": 28000,                                     \"MaxMemory\": 576,                                     \"RawDeviceNum\": 3,                                     \"RestDisk\": 8800,                                     \"RestMemory\": 248                                 }                             ]                         }                     ],                     \"ReadOnlyTotalDisk\": 0,                     \"ReadOnlyTotalLeaveDisk\": 0,                     \"ReadOnlyTotalLeaveMemory\": 0,                     \"ReadOnlyTotalMemory\": 0,                     \"ReadWriteTotalDisk\": 28000,                     \"ReadWriteTotalLeaveDisk\": 8800,                     \"ReadWriteTotalLeaveMemory\": 248,                     \"ReadWriteTotalMemory\": 576,                     \"Status\": 0                 },                 \"InstanceId\": \"dbdc-qhdgwfs\",                 \"InstanceName\": \"exclust\",                 \"InstanceStatus\": 1,                 \"InstanceType\": 1,                 \"Machine\": \"SH12\",                 \"PeriodEndTime\": \"2021-09-25T16:08:47+08:00\",                 \"Pid\": 10875,                 \"Region\": \"ap-shenzhen-fsi\",                 \"Zone\": \"ap-shenzhen-fsi-3\"             }         ]",
           "member": "InstanceExpand",
           "name": "Instances",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },

tccli/services/dbdc/v20201029/examples.json

@@ -36,7 +36,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: dbdc.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstances\n<公共请求参数>\n\n{}",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 1,\n        \"RequestId\": \"xx\",\n        \"Instances\": [\n            {\n                \"InstanceStatus\": 0,\n                \"Zone\": \"xx\",\n                \"InstanceId\": \"xx\",\n                \"Region\": \"xx\",\n                \"Pid\": 10875,\n                \"CreateTime\": \"xx\",\n                \"Machine\": \"xx\",\n                \"AutoRenewFlag\": 0,\n                \"InstanceDetail\": {\n                    \"Status\": 0,\n                    \"ReadWriteTotalMemory\": 1,\n                    \"ReadWriteTotalLeaveMemory\": 1,\n                    \"ReadWriteTotalLeaveDisk\": 1,\n                    \"ReadOnlyTotalLeaveDisk\": 1,\n                    \"ReadOnlyTotalMemory\": 1,\n                    \"ReadOnlyTotalLeaveMemory\": 1,\n                    \"ReadOnlyTotalDisk\": 1,\n                    \"InstanceDeviceInfos\": [\n                        {\n                            \"InstanceId\": \"xx\",\n                            \"FreeDevice\": [\n                                {\n                                    \"RawDeviceNum\": 1,\n                                    \"InstanceNum\": 1,\n                                    \"DevClass\": \"xx\",\n                                    \"RestDisk\": 1,\n                                    \"DeviceId\": 0,\n                                    \"DeviceNo\": \"xx\",\n                                    \"MaxDisk\": 1\n                                }\n                            ],\n                            \"ReadWriteDevice\": [\n                                {\n                                    \"RawDeviceNum\": 1,\n                                    \"InstanceNum\": 1,\n                                    \"DevClass\": \"xx\",\n                                    \"RestDisk\": 1,\n                                    \"DeviceId\": 0,\n                                    \"DeviceNo\": \"xx\",\n                                    \"MaxDisk\": 1\n                                }\n                            ],\n                            \"ReadOnlyDevice\": [\n                                {\n                                    \"RawDeviceNum\": 1,\n                                    \"InstanceNum\": 1,\n                                    \"DevClass\": \"xx\",\n                                    \"RestDisk\": 1,\n                                    \"DeviceId\": 0,\n                                    \"DeviceNo\": \"xx\",\n                                    \"MaxDisk\": 1\n                                }\n                            ]\n                        }\n                    ],\n                    \"ReadWriteTotalDisk\": 1\n                },\n                \"AppId\": 1,\n                \"PeriodEndTime\": \"xx\",\n                \"InstanceName\": \"xx\",\n                \"InstanceType\": 0\n            },\n            {\n                \"InstanceStatus\": 0,\n                \"Zone\": \"xx\",\n                \"InstanceId\": \"xx\",\n                \"Region\": \"xx\",\n                \"Pid\": 10875,\n                \"InstanceType\": 0,\n                \"Machine\": \"xx\",\n                \"AutoRenewFlag\": 0,\n                \"InstanceDetail\": {\n                    \"Status\": 0,\n                    \"ReadWriteTotalMemory\": 1,\n                    \"ReadWriteTotalLeaveMemory\": 1,\n                    \"ReadWriteTotalLeaveDisk\": 1,\n                    \"ReadOnlyTotalLeaveDisk\": 1,\n                    \"ReadOnlyTotalMemory\": 1,\n                    \"ReadOnlyTotalLeaveMemory\": 1,\n                    \"ReadOnlyTotalDisk\": 1,\n                    \"InstanceDeviceInfos\": [\n                        {\n                            \"InstanceId\": \"xx\",\n                            \"FreeDevice\": [\n                                {\n                                    \"RawDeviceNum\": 1,\n                                    \"InstanceNum\": 1,\n                                    \"DevClass\": \"xx\",\n                                    \"RestDisk\": 1,\n                                    \"DeviceId\": 0,\n                                    \"DeviceNo\": \"xx\",\n                                    \"MaxDisk\": 1\n                                }\n                            ],\n                            \"ReadWriteDevice\": [\n                                {\n                                    \"RawDeviceNum\": 1,\n                                    \"InstanceNum\": 1,\n                                    \"DevClass\": \"xx\",\n                                    \"RestDisk\": 1,\n                                    \"DeviceId\": 0,\n                                    \"DeviceNo\": \"xx\",\n                                    \"MaxDisk\": 1\n                                }\n                            ],\n                            \"ReadOnlyDevice\": [\n                                {\n                                    \"RawDeviceNum\": 1,\n                                    \"InstanceNum\": 1,\n                                    \"DevClass\": \"xx\",\n                                    \"RestDisk\": 1,\n                                    \"DeviceId\": 0,\n                                    \"DeviceNo\": \"xx\",\n                                    \"MaxDisk\": 1\n                                }\n                            ]\n                        }\n                    ],\n                    \"ReadWriteTotalDisk\": 1\n                },\n                \"AppId\": 1,\n                \"PeriodEndTime\": \"xx\",\n                \"InstanceName\": \"xx\",\n                \"CreateTime\": \"xx\"\n            }\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"Instances\": [\n            {\n                \"AppId\": 1252328453,\n                \"AutoRenewFlag\": 0,\n                \"CreateTime\": \"2021-02-25T16:08:47+08:00\",\n                \"InstanceDetail\": {\n                    \"InstanceDeviceInfos\": [\n                        {\n                            \"FreeDevice\": [],\n                            \"InstanceId\": \"szjr-3-7\",\n                            \"ReadOnlyDevice\": [],\n                            \"ReadWriteDevice\": [\n                                {\n                                    \"DevClass\": \"SH12\",\n                                    \"DeviceId\": 191108504,\n                                    \"DeviceNo\": \"\",\n                                    \"InstanceNum\": 29,\n                                    \"MaxDisk\": 28000,\n                                    \"MaxMemory\": 576,\n                                    \"RawDeviceNum\": 3,\n                                    \"RestDisk\": 8800,\n                                    \"RestMemory\": 248\n                                }\n                            ]\n                        }\n                    ],\n                    \"ReadOnlyTotalDisk\": 0,\n                    \"ReadOnlyTotalLeaveDisk\": 0,\n                    \"ReadOnlyTotalLeaveMemory\": 0,\n                    \"ReadOnlyTotalMemory\": 0,\n                    \"ReadWriteTotalDisk\": 28000,\n                    \"ReadWriteTotalLeaveDisk\": 8800,\n                    \"ReadWriteTotalLeaveMemory\": 248,\n                    \"ReadWriteTotalMemory\": 576,\n                    \"Status\": 0\n                },\n                \"InstanceId\": \"dbdc-qhdgwfs\",\n                \"InstanceName\": \"exclust\",\n                \"InstanceStatus\": 1,\n                \"InstanceType\": 1,\n                \"Machine\": \"SH12\",\n                \"PeriodEndTime\": \"2021-09-25T16:08:47+08:00\",\n                \"Pid\": 10875,\n                \"Region\": \"ap-shenzhen-fsi\",\n                \"Zone\": \"ap-shenzhen-fsi-3\"\n            }\n        ],\n        \"RequestId\": \"d82b7fa2-090c-4cf6-aefe-376510cebd81\",\n        \"TotalCount\": 1\n    }\n}",
         "title": "请求示例DEMO"
       }
     ],

tccli/services/dlc/v20210125/api.json

@@ -507,7 +507,7 @@
     "DescribeNotebookSessionStatementSqlResult": {
       "document": "本接口（DescribeNotebookSessionStatementSqlResult）用于获取statement运行结果。",
       "input": "DescribeNotebookSessionStatementSqlResultRequest",
-      "name": "获取statement运行结果。",
+      "name": "获取statement运行结果（作用于：Spark交互式SQL任务、Notebook任务）。",
       "output": "DescribeNotebookSessionStatementSqlResultResponse",
       "status": "online"
     },
@@ -633,7 +633,7 @@
     "DescribeTaskResult": {
       "document": "查询任务结果",
       "input": "DescribeTaskResultRequest",
-      "name": "查询任务结果",
+      "name": "查询任务结果(用于: SparkSQL、PrestoSQL、Spark作业任务)",
       "output": "DescribeTaskResultResponse",
       "status": "online"
     },
@@ -995,6 +995,34 @@
     "serviceShortName": "dlc"
   },
   "objects": {
+    "AccessInfo": {
+      "document": "引擎的访问信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "访问引擎的方法\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "DLCJDBC",
+          "member": "string",
+          "name": "AccessType",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "访问引擎的url，内部的部分参数需要根据实际情况替换\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "jdbc:dlc:xxxx-xxxx",
+          "member": "string",
+          "name": "AccessConnectionInfos",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
     "AddDMSPartitionsRequest": {
       "document": "AddDMSPartitions请求参数结构体",
       "members": [
@@ -6233,6 +6261,28 @@
           "required": false,
           "type": "int",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "引擎的访问信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "AccessInfo",
+          "name": "AccessInfos",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "引擎所在网络名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "default-network",
+          "member": "string",
+          "name": "EngineNetworkName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"

tccli/services/es/es_client.py

@@ -537,7 +537,7 @@ def doCreateIndex(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doStartLogstashPipelines(args, parsed_globals):
+def doUpdateRequestTargetNodeTypes(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -566,11 +566,11 @@ def doStartLogstashPipelines(args, parsed_globals):
     client = mod.EsClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.StartLogstashPipelinesRequest()
+    model = models.UpdateRequestTargetNodeTypesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.StartLogstashPipelines(model)
+        rsp = client.UpdateRequestTargetNodeTypes(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2045,7 +2045,7 @@ def doUpdateServerlessSpace(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doUpdateRequestTargetNodeTypes(args, parsed_globals):
+def doStartLogstashPipelines(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2074,11 +2074,11 @@ def doUpdateRequestTargetNodeTypes(args, parsed_globals):
     client = mod.EsClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.UpdateRequestTargetNodeTypesRequest()
+    model = models.StartLogstashPipelinesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.UpdateRequestTargetNodeTypes(model)
+        rsp = client.StartLogstashPipelines(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2253,6 +2253,58 @@ def doDescribeLogstashInstanceLogs(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeServerlessMetrics(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.EsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeServerlessMetricsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeServerlessMetrics(model)
+        result = rsp.to_json_string()
+        try:
+            json_obj = json.loads(result)
+        except TypeError as e:
+            json_obj = json.loads(result.decode('utf-8'))  # python3.3
+        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+            break
+        cur_time = time.time()
+        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+        else:
+            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doRestartNodes(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2846,7 +2898,7 @@ ACTION_MAP = {
     "DeleteInstance": doDeleteInstance,
     "GetDiagnoseSettings": doGetDiagnoseSettings,
     "CreateIndex": doCreateIndex,
-    "StartLogstashPipelines": doStartLogstashPipelines,
+    "UpdateRequestTargetNodeTypes": doUpdateRequestTargetNodeTypes,
     "UpdateDiagnoseSettings": doUpdateDiagnoseSettings,
     "CreateCosMigrateToServerlessInstance": doCreateCosMigrateToServerlessInstance,
     "UpdatePlugins": doUpdatePlugins,
@@ -2875,10 +2927,11 @@ ACTION_MAP = {
     "UpdateIndex": doUpdateIndex,
     "DescribeInstances": doDescribeInstances,
     "UpdateServerlessSpace": doUpdateServerlessSpace,
-    "UpdateRequestTargetNodeTypes": doUpdateRequestTargetNodeTypes,
+    "StartLogstashPipelines": doStartLogstashPipelines,
     "UpgradeInstance": doUpgradeInstance,
     "DeleteServerlessSpaceUser": doDeleteServerlessSpaceUser,
     "DescribeLogstashInstanceLogs": doDescribeLogstashInstanceLogs,
+    "DescribeServerlessMetrics": doDescribeServerlessMetrics,
     "RestartNodes": doRestartNodes,
     "DescribeServerlessSpaceUser": doDescribeServerlessSpaceUser,
     "DeleteIndex": doDeleteIndex,

tccli/services/es/v20180416/api.json

@@ -175,6 +175,13 @@
       "output": "DescribeServerlessInstancesResponse",
       "status": "online"
     },
+    "DescribeServerlessMetrics": {
+      "document": "获取serverless实例对应指标，获取space维度时不需要传入indexid，获取index时不需要传入spaceid",
+      "input": "DescribeServerlessMetricsRequest",
+      "name": "获取实例对应的监控指标",
+      "output": "DescribeServerlessMetricsResponse",
+      "status": "online"
+    },
     "DescribeServerlessSpaceUser": {
       "document": "查看Serverless空间子用户",
       "input": "DescribeServerlessSpaceUserRequest",
@@ -1389,6 +1396,15 @@
           "name": "CdcId",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "置放群组亲和度，范围[0,10]，0表示不开启",
+          "example": "无",
+          "member": "uint64",
+          "name": "DisasterRecoverGroupAffinity",
+          "required": false,
+          "type": "int"
         }
       ],
       "type": "object"
@@ -2947,7 +2963,7 @@
           "example": "10",
           "member": "uint64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -2957,7 +2973,7 @@
           "example": "[]",
           "member": "InstanceLog",
           "name": "InstanceLogList",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -3347,6 +3363,61 @@
       ],
       "type": "object"
     },
+    "DescribeServerlessMetricsRequest": {
+      "document": "DescribeServerlessMetrics请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "space空间id",
+          "example": "space-xxxxxx",
+          "member": "string",
+          "name": "SpaceId",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "index索引id",
+          "example": "index-ex2ap8v0",
+          "member": "string",
+          "name": "IndexId",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "指标类型，暂时只支持Storage",
+          "example": "[\"Storage\"]",
+          "member": "string",
+          "name": "MetricType",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeServerlessMetricsResponse": {
+      "document": "DescribeServerlessMetrics返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "storage指标值，单位byte",
+          "example": "2262158.88",
+          "member": "float",
+          "name": "Storage",
+          "output_required": false,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeServerlessSpaceUserRequest": {
       "document": "DescribeServerlessSpaceUser请求参数结构体",
       "members": [
@@ -6006,6 +6077,16 @@
           "output_required": false,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "置放群组相关参数\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "0",
+          "member": "uint64",
+          "name": "DisasterRecoverGroupAffinity",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/es/v20180416/examples.json

@@ -132,7 +132,7 @@
       {
         "document": "查询实例最新的主日志",
         "input": "https://es.tencentcloudapi.com/?Action=DescribeInstanceLogs\r\n&InstanceId=es-f5mwm28u\r\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 71633,\n        \"InstanceLogList\": [\n            {\n                \"Time\": \"2019-01-22T10:45:36.220+08:00\",\n                \"Ip\": \"10.0.128.65\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:cdc62072721547678872c0448c1ecaf9, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.43, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            },\n            {\n                \"Time\": \"2019-01-22T10:45:35.730+08:00\",\n                \"Ip\": \"10.0.128.65\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:1a8a5b7ea41a485ebdd769586c1dcdf6, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.73, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            }\n        ],\n        \"RequestId\": \"783d9290-dc60-4862-9340-10b632605374\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 71633,\n        \"InstanceLogList\": [\n            {\n                \"Time\": \"2019-01-22T10:45:36.220+08:00\",\n                \"Ip\": \"10.0.128.65\",\n                \"NodeID\": \"2131414141414\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:cdc62072721547678872c0448c1ecaf9, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.43, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            },\n            {\n                \"Time\": \"2019-01-22T10:45:35.730+08:00\",\n                \"Ip\": \"10.0.128.65\",\n                \"NodeID\": \"2131414141414\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:1a8a5b7ea41a485ebdd769586c1dcdf6, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.73, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            }\n        ],\n        \"RequestId\": \"783d9290-dc60-4862-9340-10b632605374\"\n    }\n}",
         "title": "查询ES集群日志"
       }
     ],
@@ -156,7 +156,7 @@
       {
         "document": "查询ES集群实例",
         "input": "POST / HTTP/1.1\nHost: es.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstances\n<公共请求参数>\n\n{}",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 1,\n        \"InstanceList\": [\n            {\n                \"InstanceId\": \"es-7sy7efoi\",\n                \"InstanceName\": \"_some_name_\",\n                \"InstanceType\": 2,\n                \"Region\": \"ap-guangzhou\",\n                \"Zone\": \"ap-guangzhou-3\",\n                \"AppId\": 130000000,\n                \"Uin\": \"100000000\",\n                \"VpcUid\": \"vpc-xxxxxx\",\n                \"SubnetUid\": \"subnet-xxxxxx\",\n                \"Status\": 1,\n                \"ChargeType\": \"POSTPAID_BY_HOUR\",\n                \"ChargePeriod\": 0,\n                \"RenewFlag\": \"\",\n                \"NodeInfoList\": [\n                    {\n                        \"Type\": \"hotData\",\n                        \"NodeNum\": 3,\n                        \"NodeType\": \"ES.SA2.MEDIUM4\",\n                        \"DiskType\": \"CLOUD_SSD\",\n                        \"DiskSize\": 20,\n                        \"DiskEncrypt\": 0,\n                        \"DiskCount\": 1,\n                        \"LocalDiskInfo\": null\n                    }\n                ],\n                \"NodeType\": \"ES.SA2.MEDIUM4\",\n                \"NodeNum\": 3,\n                \"CpuNum\": 2,\n                \"MemSize\": 4,\n                \"DiskType\": \"CLOUD_SSD\",\n                \"AutoIndexEnabled\": true,\n                \"DiskSize\": 20,\n                \"EnableHotWarmMode\": false,\n                \"WarmNodeType\": \"\",\n                \"WarmNodeNum\": 0,\n                \"WarmCpuNum\": 0,\n                \"WarmMemSize\": 0,\n                \"WarmDiskType\": \"\",\n                \"WarmDiskSize\": 0,\n                \"ColdNodeType\": \"\",\n                \"ColdNodeNum\": 0,\n                \"ColdCpuNum\": 0,\n                \"ColdMemSize\": 0,\n                \"ColdDiskType\": \"\",\n                \"ColdDiskSize\": 0,\n                \"FrozenNodeType\": \"\",\n                \"FrozenNodeNum\": 0,\n                \"FrozenCpuNum\": 0,\n                \"FrozenMemSize\": 0,\n                \"FrozenDiskType\": \"\",\n                \"FrozenDiskSize\": 0,\n                \"MasterNodeInfo\": {\n                    \"EnableDedicatedMaster\": false,\n                    \"MasterNodeType\": \"\",\n                    \"MasterNodeNum\": 0,\n                    \"MasterNodeCpuNum\": 0,\n                    \"MasterNodeMemSize\": 0,\n                    \"MasterNodeDiskType\": \"\",\n                    \"MasterNodeDiskSize\": 0\n                },\n                \"KibanaNodeInfo\": {\n                    \"KibanaNodeType\": \"ES.SA2.SMALL2\",\n                    \"KibanaNodeNum\": 1,\n                    \"KibanaNodeCpuNum\": 1,\n                    \"KibanaNodeMemSize\": 2,\n                    \"KibanaNodeDiskType\": \"CLOUD_PREMIUM\",\n                    \"KibanaNodeDiskSize\": 50\n                },\n                \"EsDomain\": \"es-7sy7efoi.myelasticsearch.com\",\n                \"EsPrivateDomain\": \"es-7sy7efoi-esinternal.kibana.myelasticsearch.com\",\n                \"EsVip\": \"{vip}\",\n                \"EsPort\": 9200,\n                \"KibanaUrl\": \"https://es-7sy7efoi.kibana.myelasticsearch.com:5601\",\n                \"KibanaPrivateUrl\": \"\",\n                \"PublicAccess\": \"CLOSE\",\n                \"KibanaPublicAccess\": \"OPEN\",\n                \"KibanaPrivateAccess\": \"CLOSE\",\n                \"KibanaAlteringPublicAccess\": \"CLOSE\",\n                \"Protocol\": \"\",\n                \"SecurityGroups\": [],\n                \"EsPublicUrl\": \"\",\n                \"EsPrivateUrl\": \"https://es-7sy7efoi-esinternal.kibana.myelasticsearch.com:9200\",\n                \"EsVersion\": \"7.14.2\",\n                \"EsConfig\": \"{}\",\n                \"EsConfigSets\": [],\n                \"KibanaConfig\": \"\",\n                \"EsAcl\": {\n                    \"WhiteIpList\": [\n                        \"127.0.0.1\"\n                    ],\n                    \"BlackIpList\": []\n                },\n                \"EsPublicAcl\": {\n                    \"WhiteIpList\": [],\n                    \"BlackIpList\": []\n                },\n                \"IkConfig\": {\n                    \"UpdateType\": \"\",\n                    \"MainDict\": [],\n                    \"Stopwords\": [],\n                    \"Synonym\": [],\n                    \"QQDict\": []\n                },\n                \"AllowCosBackup\": true,\n                \"CosBackup\": {\n                    \"IsAutoBackup\": false,\n                    \"BackupTime\": \"\"\n                },\n                \"DeployMode\": 0,\n                \"MultiZoneInfo\": [\n                    {\n                        \"Zone\": \"ap-guangzhou-3\",\n                        \"SubnetId\": \"subnet-q29llw8g\"\n                    }\n                ],\n                \"TagList\": [],\n                \"HealthStatus\": 0,\n                \"SecurityType\": 2,\n                \"LicenseType\": \"platinum\",\n                \"SceneType\": 1,\n                \"Jdk\": \"kona\",\n                \"WebNodeTypeInfo\": {\n                    \"NodeNum\": 1,\n                    \"NodeType\": \"ES.SA2.SMALL2\"\n                },\n                \"CreateTime\": \"2022-07-06 20:52:48\",\n                \"UpdateTime\": \"2022-07-07 17:35:29\",\n                \"Deadline\": \"2017-12-04 00:00:00\",\n                \"OperationDuration\": null,\n                \"OptionalWebServiceInfos\": [\n                    {\n                        \"Status\": 0,\n                        \"PrivateAccess\": \"abc\",\n                        \"PublicAccess\": \"abc\",\n                        \"PrivateUrl\": \"abc\",\n                        \"Version\": \"abc\",\n                        \"Type\": \"abc\",\n                        \"PublicUrl\": \"abc\"\n                    }\n                ],\n                \"ProcessPercent\": 0.5,\n                \"EnableHybridStorage\": true,\n                \"HasKernelUpgrade\": true\n            }\n        ],\n        \"RequestId\": \"xxxx\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 1,\n        \"InstanceList\": [\n            {\n                \"InstanceId\": \"es-7sy7efoi\",\n                \"InstanceName\": \"_some_name_\",\n                \"InstanceType\": 2,\n                \"Region\": \"ap-guangzhou\",\n                \"Zone\": \"ap-guangzhou-3\",\n                \"AppId\": 130000000,\n                \"Uin\": \"100000000\",\n                \"VpcUid\": \"vpc-xxxxxx\",\n                \"SubnetUid\": \"subnet-xxxxxx\",\n                \"CdcId\": \"cluster-xxxxxxxx\",\n                \"Status\": 1,\n                \"ChargeType\": \"POSTPAID_BY_HOUR\",\n                \"ChargePeriod\": 0,\n                \"RenewFlag\": \"\",\n                \"NodeInfoList\": [\n                    {\n                        \"Type\": \"hotData\",\n                        \"NodeNum\": 3,\n                        \"NodeType\": \"ES.SA2.MEDIUM4\",\n                        \"CpuNum\": 0,\n                        \"MemSize\": 0,\n                        \"DiskType\": \"CLOUD_SSD\",\n                        \"DiskSize\": 20,\n                        \"DiskEnhance\": 0,\n                        \"DiskEncrypt\": 0,\n                        \"DiskCount\": 1,\n                        \"LocalDiskInfo\": null\n                    }\n                ],\n                \"NodeType\": \"ES.SA2.MEDIUM4\",\n                \"NodeNum\": 3,\n                \"CpuNum\": 2,\n                \"MemSize\": 4,\n                \"DiskType\": \"CLOUD_SSD\",\n                \"AutoIndexEnabled\": true,\n                \"DiskSize\": 20,\n                \"EnableHotWarmMode\": false,\n                \"WarmNodeType\": \"\",\n                \"WarmNodeNum\": 0,\n                \"WarmCpuNum\": 0,\n                \"WarmMemSize\": 0,\n                \"WarmDiskType\": \"\",\n                \"WarmDiskSize\": 0,\n                \"ColdNodeType\": \"\",\n                \"ColdNodeNum\": 0,\n                \"ColdCpuNum\": 0,\n                \"ColdMemSize\": 0,\n                \"ColdDiskType\": \"\",\n                \"ColdDiskSize\": 0,\n                \"FrozenNodeType\": \"\",\n                \"FrozenNodeNum\": 0,\n                \"FrozenCpuNum\": 0,\n                \"FrozenMemSize\": 0,\n                \"FrozenDiskType\": \"\",\n                \"FrozenDiskSize\": 0,\n                \"MasterNodeInfo\": {\n                    \"EnableDedicatedMaster\": false,\n                    \"MasterNodeType\": \"\",\n                    \"MasterNodeNum\": 0,\n                    \"MasterNodeCpuNum\": 0,\n                    \"MasterNodeMemSize\": 0,\n                    \"MasterNodeDiskType\": \"\",\n                    \"MasterNodeDiskSize\": 0\n                },\n                \"KibanaNodeInfo\": {\n                    \"KibanaNodeType\": \"ES.SA2.SMALL2\",\n                    \"KibanaNodeNum\": 1,\n                    \"KibanaNodeCpuNum\": 1,\n                    \"KibanaNodeMemSize\": 2,\n                    \"KibanaNodeDiskType\": \"CLOUD_PREMIUM\",\n                    \"KibanaNodeDiskSize\": 50\n                },\n                \"EsDomain\": \"es-7sy7efoi.myelasticsearch.com\",\n                \"EsPrivateDomain\": \"es-7sy7efoi-esinternal.kibana.myelasticsearch.com\",\n                \"EsVip\": \"{vip}\",\n                \"EsPort\": 9200,\n                \"KibanaUrl\": \"https://es-7sy7efoi.kibana.myelasticsearch.com:5601\",\n                \"KibanaPrivateUrl\": \"\",\n                \"PublicAccess\": \"CLOSE\",\n                \"KibanaPublicAccess\": \"OPEN\",\n                \"KibanaPrivateAccess\": \"CLOSE\",\n                \"KibanaAlteringPublicAccess\": \"CLOSE\",\n                \"Protocol\": \"\",\n                \"SecurityGroups\": [],\n                \"EsPublicUrl\": \"\",\n                \"EsPrivateUrl\": \"https://es-7sy7efoi-esinternal.kibana.myelasticsearch.com:9200\",\n                \"EsVersion\": \"7.14.2\",\n                \"EsConfig\": \"{}\",\n                \"EsConfigSets\": [],\n                \"KibanaConfig\": \"\",\n                \"EsAcl\": {\n                    \"WhiteIpList\": [\n                        \"127.0.0.1\"\n                    ],\n                    \"BlackIpList\": []\n                },\n                \"EsPublicAcl\": {\n                    \"WhiteIpList\": [],\n                    \"BlackIpList\": []\n                },\n                \"IkConfig\": {\n                    \"UpdateType\": \"\",\n                    \"MainDict\": [],\n                    \"Stopwords\": [],\n                    \"Synonym\": [],\n                    \"QQDict\": []\n                },\n                \"AllowCosBackup\": true,\n                \"CosBackup\": {\n                    \"IsAutoBackup\": false,\n                    \"BackupTime\": \"\"\n                },\n                \"DeployMode\": 0,\n                \"MultiZoneInfo\": [\n                    {\n                        \"Zone\": \"ap-guangzhou-3\",\n                        \"SubnetId\": \"subnet-q29llw8g\"\n                    }\n                ],\n                \"TagList\": [],\n                \"HealthStatus\": 0,\n                \"SecurityType\": 2,\n                \"LicenseType\": \"platinum\",\n                \"SceneType\": 1,\n                \"Jdk\": \"kona\",\n                \"WebNodeTypeInfo\": {\n                    \"NodeNum\": 1,\n                    \"NodeType\": \"ES.SA2.SMALL2\"\n                },\n                \"CreateTime\": \"2022-07-06 20:52:48\",\n                \"UpdateTime\": \"2022-07-07 17:35:29\",\n                \"Deadline\": \"2017-12-04 00:00:00\",\n                \"OperationDuration\": null,\n                \"OptionalWebServiceInfos\": [\n                    {\n                        \"Status\": 0,\n                        \"PrivateAccess\": \"abc\",\n                        \"PublicAccess\": \"abc\",\n                        \"PrivateUrl\": \"abc\",\n                        \"Version\": \"abc\",\n                        \"Type\": \"abc\",\n                        \"PublicUrl\": \"abc\"\n                    }\n                ],\n                \"ProcessPercent\": 0.5,\n                \"EnableHybridStorage\": true,\n                \"HasKernelUpgrade\": true\n            }\n        ],\n        \"RequestId\": \"xxxx\"\n    }\n}",
         "title": "查询ES集群实例"
       }
     ],
@@ -164,7 +164,7 @@
       {
         "document": "",
         "input": "https://es.tencentcloudapi.com/?Action=DescribeLogstashInstanceLogs\n&InstanceId=ls-f5mwm28u\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 71633,\n        \"InstanceLogList\": [\n            {\n                \"Time\": \"2019-01-22T10:45:36.220+08:00\",\n                \"Ip\": \"10.0.128.65\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:cdc62072721547678872c0448c1ecaf9, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.43, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            },\n            {\n                \"Time\": \"2019-01-22T10:45:35.730+08:00\",\n                \"Ip\": \"10.0.128.65\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:1a8a5b7ea41a485ebdd769586c1dcdf6, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.73, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            }\n        ],\n        \"RequestId\": \"783d9290-dc60-4862-9340-10b632605374\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 71633,\n        \"InstanceLogList\": [\n            {\n                \"Time\": \"2019-01-22T10:45:36.220+08:00\",\n                \"Ip\": \"10.0.128.65\",\n                \"NodeID\": \"12123141441\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:cdc62072721547678872c0448c1ecaf9, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.43, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            },\n            {\n                \"Time\": \"2019-01-22T10:45:35.730+08:00\",\n                \"NodeID\": \"12123141442\",\n                \"Ip\": \"10.0.128.65\",\n                \"Level\": \"INFO\",\n                \"Message\": \"[o.e.p.o.OPackActionFilter] [1547723102001286009] forbidden request: { ID:1a8a5b7ea41a485ebdd769586c1dcdf6, TYP:MainRequest, USR:null, BRS:false, ACT:cluster:monitor/main, OA:10.0.128.73, IDX:, MET:GET, PTH:/, CNT:<OMITTED, LENGTH=0>, HDR:content-length, EFF:0 } Reason: null\"\n            }\n        ],\n        \"RequestId\": \"783d9290-dc60-4862-9340-10b632605374\"\n    }\n}",
         "title": "获取Logstash实例日志"
       }
     ],
@@ -200,6 +200,14 @@
         "title": "Serverless获取索引列表"
       }
     ],
+    "DescribeServerlessMetrics": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: es.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeServerlessMetrics\n<公共请求参数>\n\n{\n    \"SpaceId\": \"space-18jf9xxx\",\n    \"IndexId\": \"index-xxxxxx\",\n    \"MetricType\": [\n        \"Storage\"\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"30204658-3518-11ef-979c-52540xxxxx\",\n        \"Storage\": 2262158.88\n    }\n}",
+        "title": "获取serverless space维度过去5min钟新增存储指标值"
+      }
+    ],
     "DescribeServerlessSpaceUser": [
       {
         "document": "",

tccli/services/iotexplorer/v20190423/api.json

@@ -2010,6 +2010,17 @@
           "required": false,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "事件自定义数据\t\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "name",
+          "member": "string",
+          "name": "Data",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"

tccli/services/iotvideo/v20211125/api.json

@@ -1749,6 +1749,17 @@
           "required": false,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "事件自定义数据\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "name",
+          "member": "string",
+          "name": "Data",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "both"