tccli 3.0.1324.1__py2.py3-none-any.whl → 3.0.1326.1__py2.py3-none-any.whl

tccli/services/monitor/v20180724/api.json

@@ -455,6 +455,13 @@
       "output": "DescribeExporterIntegrationsResponse",
       "status": "online"
     },
+    "DescribeExternalClusterRegisterCommand": {
+      "document": "查看外部集群注册命令",
+      "input": "DescribeExternalClusterRegisterCommandRequest",
+      "name": "查看外部集群注册命令",
+      "output": "DescribeExternalClusterRegisterCommandResponse",
+      "status": "online"
+    },
     "DescribeGrafanaChannels": {
       "document": "列出 Grafana 所有告警通道",
       "input": "DescribeGrafanaChannelsRequest",
@@ -8666,6 +8673,52 @@
       ],
       "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"
+    },
     "DescribeGrafanaChannelsRequest": {
       "document": "DescribeGrafanaChannels请求参数结构体",
       "members": [
@@ -18263,7 +18316,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

@@ -676,6 +676,14 @@
         "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": "查看外部集群注册命令"
+      }
+    ],
     "DescribeGrafanaChannels": [
       {
         "document": "",

tccli/services/mqtt/mqtt_client.py

@@ -1161,7 +1161,7 @@ def doActivateCaCertificate(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateTopic(args, parsed_globals):
+def doDescribeMessageByTopic(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1190,11 +1190,11 @@ def doCreateTopic(args, parsed_globals):
     client = mod.MqttClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateTopicRequest()
+    model = models.DescribeMessageByTopicRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateTopic(model)
+        rsp = client.DescribeMessageByTopic(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1993,6 +1993,58 @@ def doDescribeInstanceList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateTopic(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.MqttClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateTopicRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateTopic(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 doModifyAuthorizationPolicy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2754,7 +2806,7 @@ ACTION_MAP = {
     "DescribeProductSKUList": doDescribeProductSKUList,
     "DescribeCaCertificates": doDescribeCaCertificates,
     "ActivateCaCertificate": doActivateCaCertificate,
-    "CreateTopic": doCreateTopic,
+    "DescribeMessageByTopic": doDescribeMessageByTopic,
     "DeleteDeviceCertificate": doDeleteDeviceCertificate,
     "ApplyRegistrationCode": doApplyRegistrationCode,
     "ModifyJWKSAuthenticator": doModifyJWKSAuthenticator,
@@ -2770,6 +2822,7 @@ ACTION_MAP = {
     "CreateJWKSAuthenticator": doCreateJWKSAuthenticator,
     "ModifyUser": doModifyUser,
     "DescribeInstanceList": doDescribeInstanceList,
+    "CreateTopic": doCreateTopic,
     "ModifyAuthorizationPolicy": doModifyAuthorizationPolicy,
     "DeleteAuthorizationPolicy": doDeleteAuthorizationPolicy,
     "ModifyHttpAuthenticator": doModifyHttpAuthenticator,