tccli 3.0.1325.1__py2.py3-none-any.whl → 3.0.1327.1__py2.py3-none-any.whl

tccli/services/monitor/monitor_client.py

@@ -1683,6 +1683,58 @@ def doDeleteAlertRules(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribePolicyGroupList(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.MonitorClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribePolicyGroupListRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribePolicyGroupList(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 doDescribeBaseMetrics(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2671,7 +2723,7 @@ def doCreateConditionsTemplate(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doGetPrometheusAgentManagementCommand(args, parsed_globals):
+def doDescribeExternalClusterUninstallCommand(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2700,11 +2752,11 @@ def doGetPrometheusAgentManagementCommand(args, parsed_globals):
     client = mod.MonitorClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.GetPrometheusAgentManagementCommandRequest()
+    model = models.DescribeExternalClusterUninstallCommandRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.GetPrometheusAgentManagementCommand(model)
+        rsp = client.DescribeExternalClusterUninstallCommand(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2723,7 +2775,7 @@ def doGetPrometheusAgentManagementCommand(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribePrometheusAgents(args, parsed_globals):
+def doGetPrometheusAgentManagementCommand(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2752,11 +2804,11 @@ def doDescribePrometheusAgents(args, parsed_globals):
     client = mod.MonitorClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribePrometheusAgentsRequest()
+    model = models.GetPrometheusAgentManagementCommandRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribePrometheusAgents(model)
+        rsp = client.GetPrometheusAgentManagementCommand(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -6363,7 +6415,7 @@ def doUpdateGrafanaWhiteList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribePolicyGroupList(args, parsed_globals):
+def doDescribePrometheusAgents(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -6392,11 +6444,11 @@ def doDescribePolicyGroupList(args, parsed_globals):
     client = mod.MonitorClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribePolicyGroupListRequest()
+    model = models.DescribePrometheusAgentsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribePolicyGroupList(model)
+        rsp = client.DescribePrometheusAgents(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -7143,6 +7195,58 @@ def doGetMonitorData(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateExternalCluster(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.MonitorClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateExternalClusterRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateExternalCluster(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 doUpdateDNSConfig(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8443,6 +8547,58 @@ def doModifyPrometheusConfig(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeExternalClusterRegisterCommand(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.MonitorClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeExternalClusterRegisterCommandRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeExternalClusterRegisterCommand(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 doDescribeAlarmPolicy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8540,6 +8696,7 @@ ACTION_MAP = {
     "DeletePrometheusScrapeJobs": doDeletePrometheusScrapeJobs,
     "EnableGrafanaSSO": doEnableGrafanaSSO,
     "DeleteAlertRules": doDeleteAlertRules,
+    "DescribePolicyGroupList": doDescribePolicyGroupList,
     "DescribeBaseMetrics": doDescribeBaseMetrics,
     "DescribeAlarmEvents": doDescribeAlarmEvents,
     "DescribePhoneAlarmFlowTotalCount": doDescribePhoneAlarmFlowTotalCount,
@@ -8559,8 +8716,8 @@ ACTION_MAP = {
     "UpdateGrafanaEnvironments": doUpdateGrafanaEnvironments,
     "DescribePolicyConditionList": doDescribePolicyConditionList,
     "CreateConditionsTemplate": doCreateConditionsTemplate,
+    "DescribeExternalClusterUninstallCommand": doDescribeExternalClusterUninstallCommand,
     "GetPrometheusAgentManagementCommand": doGetPrometheusAgentManagementCommand,
-    "DescribePrometheusAgents": doDescribePrometheusAgents,
     "UpdatePrometheusScrapeJob": doUpdatePrometheusScrapeJob,
     "DescribePrometheusInstanceInitStatus": doDescribePrometheusInstanceInitStatus,
     "UpgradeGrafanaInstance": doUpgradeGrafanaInstance,
@@ -8630,7 +8787,7 @@ ACTION_MAP = {
     "CreateRecordingRule": doCreateRecordingRule,
     "DescribeAlertRules": doDescribeAlertRules,
     "UpdateGrafanaWhiteList": doUpdateGrafanaWhiteList,
-    "DescribePolicyGroupList": doDescribePolicyGroupList,
+    "DescribePrometheusAgents": doDescribePrometheusAgents,
     "DescribeAlarmPolicies": doDescribeAlarmPolicies,
     "DescribePrometheusTargetsTMP": doDescribePrometheusTargetsTMP,
     "DescribeRecordingRules": doDescribeRecordingRules,
@@ -8645,6 +8802,7 @@ ACTION_MAP = {
     "ModifyPrometheusInstanceAttributes": doModifyPrometheusInstanceAttributes,
     "ModifyAlarmPolicyTasks": doModifyAlarmPolicyTasks,
     "GetMonitorData": doGetMonitorData,
+    "CreateExternalCluster": doCreateExternalCluster,
     "UpdateDNSConfig": doUpdateDNSConfig,
     "DescribeServiceDiscovery": doDescribeServiceDiscovery,
     "RunPrometheusInstance": doRunPrometheusInstance,
@@ -8670,6 +8828,7 @@ ACTION_MAP = {
     "DescribeClusterAgentCreatingProgress": doDescribeClusterAgentCreatingProgress,
     "DescribeGrafanaIntegrations": doDescribeGrafanaIntegrations,
     "ModifyPrometheusConfig": doModifyPrometheusConfig,
+    "DescribeExternalClusterRegisterCommand": doDescribeExternalClusterRegisterCommand,
     "DescribeAlarmPolicy": doDescribeAlarmPolicy,
 
 }

tccli/services/monitor/v20180724/api.json

@@ -70,6 +70,13 @@
       "output": "CreateExporterIntegrationResponse",
       "status": "online"
     },
+    "CreateExternalCluster": {
+      "document": "注册外部集群到云上 TMP 实例",
+      "input": "CreateExternalClusterRequest",
+      "name": "注册外部 k8s 集群",
+      "output": "CreateExternalClusterResponse",
+      "status": "online"
+    },
     "CreateGrafanaInstance": {
       "document": "本接口（CreateGrafanaInstance）用于创建 Grafana 包年包月实例，默认基础版、到期自动续费、不可使用代金券。",
       "input": "CreateGrafanaInstanceRequest",
@@ -455,6 +462,20 @@
       "output": "DescribeExporterIntegrationsResponse",
       "status": "online"
     },
+    "DescribeExternalClusterRegisterCommand": {
+      "document": "查看外部集群注册命令",
+      "input": "DescribeExternalClusterRegisterCommandRequest",
+      "name": "查看外部集群注册命令",
+      "output": "DescribeExternalClusterRegisterCommandResponse",
+      "status": "online"
+    },
+    "DescribeExternalClusterUninstallCommand": {
+      "document": "查看外部集群 Agent 卸载命令",
+      "input": "DescribeExternalClusterUninstallCommandRequest",
+      "name": "查看外部集群 Agent 卸载命令",
+      "output": "DescribeExternalClusterUninstallCommandResponse",
+      "status": "online"
+    },
     "DescribeGrafanaChannels": {
       "document": "列出 Grafana 所有告警通道",
       "input": "DescribeGrafanaChannelsRequest",
@@ -4138,6 +4159,97 @@
       ],
       "type": "object"
     },
+    "CreateExternalClusterRequest": {
+      "document": "CreateExternalCluster请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例 ID",
+          "example": "prom-abcd",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "集群所在地域",
+          "example": "ap-shanghai",
+          "member": "string",
+          "name": "ClusterRegion",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "集群名称",
+          "example": "cluster name",
+          "member": "string",
+          "name": "ClusterName",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "集群 ID",
+          "example": "ecls-abcd",
+          "member": "string",
+          "name": "ClusterId",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "外部标签",
+          "example": "[{\"Name\": \"cluster_name\", \"Value\": \"ai\"}]",
+          "member": "Label",
+          "name": "ExternalLabels",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "是否打开预聚合规则",
+          "example": "bool",
+          "member": "bool",
+          "name": "OpenDefaultRecord",
+          "required": false,
+          "type": "bool"
+        },
+        {
+          "disabled": false,
+          "document": "是否开启公网",
+          "example": "bool",
+          "member": "bool",
+          "name": "EnableExternal",
+          "required": false,
+          "type": "bool"
+        }
+      ],
+      "type": "object"
+    },
+    "CreateExternalClusterResponse": {
+      "document": "CreateExternalCluster返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集群 ID",
+          "example": "ecls-abcd",
+          "member": "string",
+          "name": "ClusterId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CreateGrafanaInstanceRequest": {
       "document": "CreateGrafanaInstance请求参数结构体",
       "members": [
@@ -8666,6 +8778,98 @@
       ],
       "type": "object"
     },
+    "DescribeExternalClusterRegisterCommandRequest": {
+      "document": "DescribeExternalClusterRegisterCommand请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例 ID",
+          "example": "prom-abcd",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "集群 ID",
+          "example": "ecls-abcd",
+          "member": "string",
+          "name": "ClusterId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeExternalClusterRegisterCommandResponse": {
+      "document": "DescribeExternalClusterRegisterCommand返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "注册命令",
+          "example": "--- apiVersion: v1 kind: Namespace metadata:   name: prom-abcd --- apiVersion: v1 kind: ServiceAccount metadata:   name: proxy-agent-installer   namespace:  prom-abcd --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata:   name: install-proxy-agent roleRef:   apiGroup: rbac.authorization.k8s.io   kind: ClusterRole   name: cluster-admin subjects: - kind: ServiceAccount   name: proxy-agent-installer   namespace:  prom-abcd --- apiVersion: batch/v1 kind: Job metadata:   name: proxy-agent-installer   namespace: prom-abcd spec:   backoffLimit: 5   ttlSecondsAfterFinished: 60   template:     spec:       tolerations:       - operator: Exists       serviceAccountName: proxy-agent-installer       containers:       - name: installer         image: ccr.ccs.tencentyun.com/cloudmonitor/agent-installer:v0.0.3         args:         - upgrade          - tmp         - ./         - --install         - -n         - prom-abcd         - --set         - proxyAgent.enabled=true         - --set          - proxyAgent.instanceId=prom-abcd         - --set         - proxyAgent.instanceToken=token         - --set         - proxyAgent.clusterId=ecls-abcd         - --set         - proxyAgent.clusterType=external         - --set         - proxyAgent.serverAddress=1.1.1.1:8008         - --set         - proxyAgent.image=ccr.ccs.tencentyun.com/cloudmonitor/multi-proxy:v1.0.12       restartPolicy: Never",
+          "member": "string",
+          "name": "Command",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeExternalClusterUninstallCommandRequest": {
+      "document": "DescribeExternalClusterUninstallCommand请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例 ID",
+          "example": "prom-abcd",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "集群 ID",
+          "example": "ecls-abcd",
+          "member": "string",
+          "name": "ClusterId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeExternalClusterUninstallCommandResponse": {
+      "document": "DescribeExternalClusterUninstallCommand返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "卸载命令",
+          "example": "apiVersion: batch/v1 kind: Job metadata:   name: uninstaller spec:   template:     spec:       containers:       - name: uninstaller         image: ccr.ccs.tencentyun.com/cloudmonitor/agent-installer:v0.0.8",
+          "member": "string",
+          "name": "Command",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeGrafanaChannelsRequest": {
       "document": "DescribeGrafanaChannels请求参数结构体",
       "members": [
@@ -18263,7 +18467,7 @@
         },
         {
           "disabled": false,
-          "document": "集群类型。可填入tke、eks、tkeedge、tdcc，分别代表标准集群、弹性集群、边缘集群、注册集群",
+          "document": "集群类型。可填入tke、eks、tkeedge、tdcc、external，分别代表标准集群、弹性集群、边缘集群、注册集群 和外部集群",
           "example": "tke",
           "member": "string",
           "name": "ClusterType",

tccli/services/monitor/v20180724/examples.json

@@ -194,6 +194,14 @@
         "title": "e. 创建 Ingress NGINX Controller 集成"
       }
     ],
+    "CreateExternalCluster": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateExternalCluster\n<公共请求参数>\n\n{\n    \"ClusterName\": \"test-cluster\",\n    \"InstanceId\": \"prom-abcd\",\n    \"ClusterRegion\": \"ap-shanghai\"\n}",
+        "output": "{\n    \"Response\": {\n        \"ClusterId\": \"ecls-abc\",\n        \"RequestId\": \"abcd-abcd\"\n    }\n}",
+        "title": "组测集群到云上"
+      }
+    ],
     "CreateGrafanaInstance": [
       {
         "document": "创建Grafana实例",
@@ -676,6 +684,22 @@
         "title": "查询 exporter 集成列表"
       }
     ],
+    "DescribeExternalClusterRegisterCommand": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeExternalClusterRegisterCommand\n<公共请求参数>\n\n{\n    \"InstanceId\": \"prom-abcd\",\n    \"ClusterId\": \"ecls-abcd\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Command\": \"\\n---\\napiVersion: v1\\nkind: Namespace\\nmetadata:\\n  name: prom-abcd\\n---\\napiVersion: v1\\nkind: ServiceAccount\\nmetadata:\\n  name: proxy-agent-installer\\n  namespace:  prom-abcd\\n---\\napiVersion: rbac.authorization.k8s.io/v1\\nkind: ClusterRoleBinding\\nmetadata:\\n  name: install-proxy-agent\\nroleRef:\\n  apiGroup: rbac.authorization.k8s.io\\n  kind: ClusterRole\\n  name: cluster-admin\\nsubjects:\\n- kind: ServiceAccount\\n  name: proxy-agent-installer\\n  namespace:  prom-abcd\\n---\\napiVersion: batch/v1\\nkind: Job\\nmetadata:\\n  name: proxy-agent-installer\\n  namespace: prom-abcd\\nspec:\\n  backoffLimit: 5\\n  ttlSecondsAfterFinished: 60\\n  template:\\n    spec:\\n      tolerations:\\n      - operator: Exists\\n      serviceAccountName: proxy-agent-installer\\n      containers:\\n      - name: installer\\n        image: ccr.ccs.tencentyun.com/cloudmonitor/agent-installer:v0.0.3\\n        args:\\n        - upgrade \\n        - tmp\\n        - ./\\n        - --install\\n        - -n\\n        - prom-abcd\\n        - --set\\n        - proxyAgent.enabled=true\\n        - --set \\n        - proxyAgent.instanceId=prom-abcd\\n        - --set\\n        - proxyAgent.instanceToken=token\\n        - --set\\n        - proxyAgent.clusterId=ecls-abcd\\n        - --set\\n        - proxyAgent.clusterType=external\\n        - --set\\n        - proxyAgent.serverAddress=1.1.1.1:8008\\n        - --set\\n        - proxyAgent.image=ccr.ccs.tencentyun.com/cloudmonitor/multi-proxy:v1.0.12\\n        - --set\\n        - kubeStateMetrics.enabled=true\\n        - --set\\n        - kubeStateMetrics.image=ccr.ccs.tencentyun.com/cloudmonitor/tmp-kube-state-metrics:v2.6.0-shard\\n        - --set\\n        - nodeExporter.enabled=true\\n        - --set\\n        - nodeExporter.image=ccr.ccs.tencentyun.com/tkeimages/node-exporter:v1.3.1\\n      restartPolicy: Never\\n\",\n        \"RequestId\": \"r3mh2ud5r9568u-e4n3tdamu8uqkwvfu\"\n    }\n}",
+        "title": "查看外部集群注册命令"
+      }
+    ],
+    "DescribeExternalClusterUninstallCommand": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeExternalClusterUninstallCommand\n<公共请求参数>\n\n{\n    \"InstanceId\": \"prom-abcd\",\n    \"ClusterId\": \"ecls-abcd\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Command\": \"\\n---\\napiVersion: v1\\nkind: ServiceAccount\\nmetadata:\\n  name: tmp-uninstaller\\n  namespace: default\\n---\\napiVersion: rbac.authorization.k8s.io/v1\\nkind: ClusterRoleBinding\\nmetadata:\\n  name: tmp-uninstaller\\nroleRef:\\n  apiGroup: rbac.authorization.k8s.io\\n  kind: ClusterRole\\n  name: cluster-admin\\nsubjects:\\n- kind: ServiceAccount\\n  name: tmp-uninstaller\\n  namespace: default\\n---\\napiVersion: batch/v1\\nkind: Job\\nmetadata:\\n  name: tmp-uninstaller\\n  namespace: default\\nspec:\\n  backoffLimit: 2\\n  ttlSecondsAfterFinished: 10\\n  template:\\n    spec:\\n      tolerations:\\n      - operator: Exists\\n      serviceAccountName: tmp-uninstaller\\n      containers:\\n      - name: uninstaller\\n        image: ccr.ccs.tencentyun.com/cloudmonitor/agent-installer:v0.0.9\\n        command:\\n        - uninstall\\n        args:\\n        - all \\n        - prom-abcd\\n      restartPolicy: Never\\n\",\n        \"RequestId\": \"bfa18d10-fe18-4f0e-b7e8-18857f951655\"\n    }\n}",
+        "title": "查看外部集群 Agent 卸载命令"
+      }
+    ],
     "DescribeGrafanaChannels": [
       {
         "document": "",

tccli/services/mrs/v20200910/api.json

@@ -15,14 +15,14 @@
       "status": "online"
     },
     "ImageMaskAsync": {
-      "document": "图片脱敏-异步接口",
+      "document": "图片脱敏-异步接口\n短时间大批量调用（例如>100上传/10分钟），如果遇到错误码“FalledOperation.AsyncQueueFullError”，请于数分钟后再次尝试提交。",
       "input": "ImageMaskAsyncRequest",
       "name": "图片脱敏-异步接口",
       "output": "ImageMaskAsyncResponse",
       "status": "online"
     },
     "ImageMaskAsyncGetResult": {
-      "document": "图片脱敏-异步获取结果接口",
+      "document": "图片脱敏-异步获取结果接口\n请于上传请求后24小时内获取结果。",
       "input": "ImageMaskAsyncGetResultRequest",
       "name": "图片脱敏-异步获取结果接口",
       "output": "ImageMaskAsyncGetResultResponse",
@@ -6272,7 +6272,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "异步任务ID",
+          "document": "异步任务ID\n1.因上传图片TaskID 仅 24 小时内有效，请于提交任务获取TaskID后24小时内调用ImageMaskAsyncGetResult接口获取结果.\n2.建议在获取到TaskID 后，5-10分钟后再调用 ImageMaskAsyncGetResult 接口获取脱敏结果。",
           "example": "1cf14582-bd61-4ea2-93ca-c63eaa8d427a",
           "member": "string",
           "name": "TaskID",
@@ -6342,7 +6342,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "加密任务ID",
+          "document": "加密任务ID\n1.因此TaskID 仅 24 小时内有效，请于提交任务获取TaskID后24小时内调用ImageMaskAsyncGetResult接口获取结果.\n2.建议在获取到TaskID 后，5-10分钟后再调用 ImageMaskAsyncGetResult 接口获取脱敏结果。",
           "example": "1cf14582-bd61-4ea2-93ca-c63eaa8d427a",
           "member": "string",
           "name": "TaskID",

tccli/services/oceanus/v20190422/api.json

@@ -127,7 +127,7 @@
       "status": "online"
     },
     "DescribeJobEvents": {
-      "document": "获取指定作业的事件，包括作业启动停止、运行失败、快照失败、作业异常等各种事件类型",
+      "document": "请求参数不包含 \"RunningOrderIds\"时，接口获取指定作业的事件，包括作业启动停止、运行失败、快照失败、作业异常等各种事件类型;请求参数不包含 \"RunningOrderIds\"时，接口为查询作业实例ID接口,获取作业实例",
       "input": "DescribeJobEventsRequest",
       "name": "获取指定作业的事件",
       "output": "DescribeJobEventsResponse",
@@ -3113,10 +3113,10 @@
         {
           "disabled": false,
           "document": "该作业指定范围内的事件列表\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "[]",
+          "example": "[ ]",
           "member": "JobEvent",
           "name": "Events",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -3126,7 +3126,7 @@
           "example": "[3,2,1]",
           "member": "uint64",
           "name": "RunningOrderIds",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -3136,10 +3136,20 @@
           "example": "10",
           "member": "uint64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
+        {
+          "disabled": false,
+          "document": "实例对应的版本\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "[1,2,3]",
+          "member": "uint64",
+          "name": "Versions",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
           "member": "string",