tccli 3.0.1288.1__py2.py3-none-any.whl → 3.0.1290.1__py2.py3-none-any.whl

tccli/services/monitor/monitor_client.py

@@ -7351,6 +7351,58 @@ def doUpdateExporterIntegration(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribePrometheusIntegrationMetrics(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.DescribePrometheusIntegrationMetricsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribePrometheusIntegrationMetrics(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 doDescribeAllNamespaces(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8441,6 +8493,7 @@ ACTION_MAP = {
     "DescribePrometheusConfig": doDescribePrometheusConfig,
     "ModifyPrometheusGlobalNotification": doModifyPrometheusGlobalNotification,
     "UpdateExporterIntegration": doUpdateExporterIntegration,
+    "DescribePrometheusIntegrationMetrics": doDescribePrometheusIntegrationMetrics,
     "DescribeAllNamespaces": doDescribeAllNamespaces,
     "CreateServiceDiscovery": doCreateServiceDiscovery,
     "DescribeStatisticData": doDescribeStatisticData,

tccli/services/monitor/v20180724/api.json

@@ -658,6 +658,13 @@
       "output": "DescribePrometheusInstancesOverviewResponse",
       "status": "online"
     },
+    "DescribePrometheusIntegrationMetrics": {
+      "document": "获取prometheus集成指标",
+      "input": "DescribePrometheusIntegrationMetricsRequest",
+      "name": "获取prometheus集成指标",
+      "output": "DescribePrometheusIntegrationMetricsResponse",
+      "status": "online"
+    },
     "DescribePrometheusRecordRules": {
       "document": "获取聚合规则列表，包含关联集群内crd资源创建的record rule",
       "input": "DescribePrometheusRecordRulesRequest",
@@ -12527,6 +12534,43 @@
       ],
       "type": "object"
     },
+    "DescribePrometheusIntegrationMetricsRequest": {
+      "document": "DescribePrometheusIntegrationMetrics请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集成类型标识。取值参考DescribePrometheusIntegrations接口返回中IntegrationSet[i].Code参数",
+          "example": "qcloud",
+          "member": "string",
+          "name": "IntegrationCode",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribePrometheusIntegrationMetricsResponse": {
+      "document": "DescribePrometheusIntegrationMetrics返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集成指标详情分组",
+          "example": "[{\"Group\":\"cdb\",\"Metrics\":[{\"MetricName\":\"qce_cdb_abortedclients_sum\",\"Name\":\"异常关闭的客户端连接数\",\"MetricType\":\"\",\"Unit\":\"Count\",\"Description\":\"由于客户端在没有正确关闭连接的情况下死亡而中止的连接数\"}]}]",
+          "member": "IntegrationMetricGroup",
+          "name": "IntegrationMetricSet",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribePrometheusRecordRulesRequest": {
       "document": "DescribePrometheusRecordRules请求参数结构体",
       "members": [
@@ -14793,6 +14837,106 @@
       ],
       "usage": "out"
     },
+    "IntegrationMetric": {
+      "document": "prometheus集成指标详情",
+      "members": [
+        {
+          "disabled": false,
+          "document": "指标名",
+          "example": "qce_cvm_tcpcurrestab_max",
+          "member": "string",
+          "name": "MetricName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "指标名称",
+          "example": "TCP 连接数",
+          "member": "string",
+          "name": "Name",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "统计类型",
+          "example": "GAUGE",
+          "member": "string",
+          "name": "MetricType",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "单位",
+          "example": "%",
+          "member": "string",
+          "name": "Unit",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "指标详细描述",
+          "example": " TCP 连接数量",
+          "member": "string",
+          "name": "Description",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
+    "IntegrationMetricGroup": {
+      "document": "prometheus集成分组指标",
+      "members": [
+        {
+          "disabled": false,
+          "document": "分组标识",
+          "example": "qcloud",
+          "member": "string",
+          "name": "Group",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "指标详情",
+          "example": "[{\"Group\":\"cdb\",\"MetricName\":\"qce_cdb_abortedclients_sum\",\"Name\":\"异常关闭的客户端连接数\",\"MetricType\":\"\",\"Unit\":\"Count\",\"Description\":\"由于客户端在没有正确关闭连接的情况下死亡而中止的连接数\"}]",
+          "member": "IntegrationMetric",
+          "name": "Metrics",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "分组名称",
+          "example": "云服务器",
+          "member": "string",
+          "name": "GroupName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "Label": {
       "document": "k8s中标签，一般以数组的方式存在",
       "members": [

tccli/services/monitor/v20180724/examples.json

@@ -920,6 +920,14 @@
         "title": "获取实例列表"
       }
     ],
+    "DescribePrometheusIntegrationMetrics": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribePrometheusIntegrationMetrics\n<公共请求参数>\n\n{\n    \"IntegrationCode\": \"qcloud\"\n}",
+        "output": "{\n    \"Response\": {\n        \"IntegrationMetricSet\": [\n            {\n                \"Group\": \"cdb\",\n                \"Metrics\": [\n                    {\n                        \"MetricName\": \"qce_cdb_abortedclients_sum\",\n                        \"Name\": \"异常关闭的客户端连接数\",\n                        \"MetricType\": \"\",\n                        \"Unit\": \"Count\",\n                        \"Description\": \"由于客户端在没有正确关闭连接的情况下死亡而中止的连接数\"\n                    }\n                ]\n            }\n        ],\n        \"RequestId\": \"sjwbr-sjhrbgfrb\"\n    }\n}",
+        "title": "获取prometheus集成指标"
+      }
+    ],
     "DescribePrometheusRecordRules": [
       {
         "document": "拉取聚合规则",