tencentcloud-sdk-monitor 3.0.723 → 3.0.725

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171bd32834dbe834575bc2e62c65c133fb44af31
-  data.tar.gz: c64dd6b73c00f0761d169f3b7ef5ed502f2893bf
+  metadata.gz: 6de3124310823c279e854d71b94c217873ea30d6
+  data.tar.gz: 55cae46497868aa0b7e20d5a877198b575968f80
 SHA512:
-  metadata.gz: 836891b350b82d2418c0ba4c933e2a1f143150ed23cc0113601c8d477d6ac0fcc0206f8e870e9225590a0c8a76d43e5cf40b1066359663219808ad44b35dd9a2
-  data.tar.gz: 432e54131dd452e96ee019a3b631b6071fa6c18dd7373fa84928de0003668b8f2a8f831b55dbee086cf2a5d436eb4bfb660787118071ef8663ec9f8624a1aa1b
+  metadata.gz: 063fe55f8c39d5819d35a0346110852a1edd5196fff8ba8d3e444fef63493814a539d981137d47f2b9f84969cdee54e3431d5117633f304f1ffbe1480b68a6dd
+  data.tar.gz: f7e84911d7458b1627791a9e0e1e7bfdf24430e599baadbc93af51bb765019bb776736ebe9cb3bb3a47164f70e3feebc96e7d3266f93ae4d7a008488ed7f6cbe

data/lib/VERSION

@@ -1 +1 @@
-3.0.723
+3.0.725

data/lib/v20180724/client.rb

@@ -223,7 +223,7 @@ module TencentCloud
           raise TencentCloud::Common::TencentCloudSDKException.new(nil, e.inspect)
         end
 
-        # 创建 exporter 集成
+        # 创建集成中心 exporter 集成，因集成较多，建议控制台创建集成。(前提：已授权创建托管 EKS 集群，验证方式：1. 控制台界面确认，未提示授权则表示已授权创建；2. 通过 DescribePrometheusInstanceInitStatus 接口查询集群状态，如果托管集群不存在，可通过 RunPrometheusInstance 接口创建)
 
         # @param request: Request instance for CreateExporterIntegration.
         # @type request: :class:`Tencentcloud::monitor::V20180724::CreateExporterIntegrationRequest`
@@ -511,7 +511,7 @@ module TencentCloud
           raise TencentCloud::Common::TencentCloudSDKException.new(nil, e.inspect)
         end
 
-        # 创建 Prometheus 抓取任务
+        # 创建 Prometheus Agent 抓取任务
 
         # @param request: Request instance for CreatePrometheusScrapeJob.
         # @type request: :class:`Tencentcloud::monitor::V20180724::CreatePrometheusScrapeJobRequest`
@@ -705,7 +705,7 @@ module TencentCloud
           raise TencentCloud::Common::TencentCloudSDKException.new(nil, e.inspect)
         end
 
-        # 删除 exporter 集成
+        # 删除集成中心 exporter 集成
 
         # @param request: Request instance for DeleteExporterIntegration.
         # @type request: :class:`Tencentcloud::monitor::V20180724::DeleteExporterIntegrationRequest`
@@ -921,7 +921,7 @@ module TencentCloud
           raise TencentCloud::Common::TencentCloudSDKException.new(nil, e.inspect)
         end
 
-        # 删除 Prometheus 抓取任务
+        # 删除 Prometheus Agent 抓取任务
 
         # @param request: Request instance for DeletePrometheusScrapeJobs.
         # @type request: :class:`Tencentcloud::monitor::V20180724::DeletePrometheusScrapeJobsRequest`
@@ -2443,7 +2443,7 @@ module TencentCloud
           raise TencentCloud::Common::TencentCloudSDKException.new(nil, e.inspect)
         end
 
-        # 彻底删除 Prometheus 实例相关数据，给定的实例必须先被 Terminate
+        # 彻底删除 Prometheus 实例相关数据，给定的实例必须先被 Terminate(该接口是异步接口，实例是否释放需要通过 DescribePrometheusInstances 接口返回的状态来判断)。
 
         # @param request: Request instance for DestroyPrometheusInstance.
         # @type request: :class:`Tencentcloud::monitor::V20180724::DestroyPrometheusInstanceRequest`

data/lib/v20180724/models.rb

@@ -17,6 +17,33 @@
 module TencentCloud
   module Monitor
     module V20180724
+      # 策略过滤条件
+      class AlarmConditionFilter < TencentCloud::Common::AbstractModel
+        # @param Type: 类型
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type Type: String
+        # @param Expression: 表达式
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type Expression: String
+        # @param Dimensions: 过滤条件
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type Dimensions: String
+
+        attr_accessor :Type, :Expression, :Dimensions
+
+        def initialize(type=nil, expression=nil, dimensions=nil)
+          @Type = type
+          @Expression = expression
+          @Dimensions = dimensions
+        end
+
+        def deserialize(params)
+          @Type = params['Type']
+          @Expression = params['Expression']
+          @Dimensions = params['Dimensions']
+        end
+      end
+
       # 告警事件
       class AlarmEvent < TencentCloud::Common::AbstractModel
         # @param EventName: 事件名
@@ -41,6 +68,28 @@ module TencentCloud
         end
       end
 
+      # 聚合条件
+      class AlarmGroupByItem < TencentCloud::Common::AbstractModel
+        # @param Id: Item Id
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type Id: String
+        # @param Name: 名称
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type Name: String
+
+        attr_accessor :Id, :Name
+
+        def initialize(id=nil, name=nil)
+          @Id = id
+          @Name = name
+        end
+
+        def deserialize(params)
+          @Id = params['Id']
+          @Name = params['Name']
+        end
+      end
+
       # 通知模板ID及通知等级列表，["Remind","Serious"]表示该通知模板仅接收提醒和严重类别的告警
       class AlarmHierarchicalNotice < TencentCloud::Common::AbstractModel
         # @param NoticeId: 通知模板ID
@@ -488,6 +537,12 @@ module TencentCloud
         # @param TagInstances: 标签
         # 注意：此字段可能返回 null，表示取不到有效值。
         # @type TagInstances: Array
+        # @param Filter: 过滤条件
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type Filter: :class:`Tencentcloud::Monitor.v20180724.models.AlarmConditionFilter`
+        # @param GroupBy: 聚合条件
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type GroupBy: Array
         # @param FilterDimensionsParam: 策略关联的过滤维度信息
         # 注意：此字段可能返回 null，表示取不到有效值。
         # @type FilterDimensionsParam: String
@@ -510,9 +565,9 @@ module TencentCloud
         # 注意：此字段可能返回 null，表示取不到有效值。
         # @type IsSupportAlarmTag: Integer
 
-        attr_accessor :PolicyId, :PolicyName, :Remark, :MonitorType, :Enable, :UseSum, :ProjectId, :ProjectName, :Namespace, :ConditionTemplateId, :Condition, :EventCondition, :NoticeIds, :Notices, :TriggerTasks, :ConditionsTemp, :LastEditUin, :UpdateTime, :InsertTime, :Region, :NamespaceShowName, :IsDefault, :CanSetDefault, :InstanceGroupId, :InstanceSum, :InstanceGroupName, :RuleType, :OriginId, :TagInstances, :FilterDimensionsParam, :IsOneClick, :OneClickStatus, :AdvancedMetricNumber, :IsBindAll, :Tags, :IsSupportAlarmTag
+        attr_accessor :PolicyId, :PolicyName, :Remark, :MonitorType, :Enable, :UseSum, :ProjectId, :ProjectName, :Namespace, :ConditionTemplateId, :Condition, :EventCondition, :NoticeIds, :Notices, :TriggerTasks, :ConditionsTemp, :LastEditUin, :UpdateTime, :InsertTime, :Region, :NamespaceShowName, :IsDefault, :CanSetDefault, :InstanceGroupId, :InstanceSum, :InstanceGroupName, :RuleType, :OriginId, :TagInstances, :Filter, :GroupBy, :FilterDimensionsParam, :IsOneClick, :OneClickStatus, :AdvancedMetricNumber, :IsBindAll, :Tags, :IsSupportAlarmTag
 
-        def initialize(policyid=nil, policyname=nil, remark=nil, monitortype=nil, enable=nil, usesum=nil, projectid=nil, projectname=nil, namespace=nil, conditiontemplateid=nil, condition=nil, eventcondition=nil, noticeids=nil, notices=nil, triggertasks=nil, conditionstemp=nil, lastedituin=nil, updatetime=nil, inserttime=nil, region=nil, namespaceshowname=nil, isdefault=nil, cansetdefault=nil, instancegroupid=nil, instancesum=nil, instancegroupname=nil, ruletype=nil, originid=nil, taginstances=nil, filterdimensionsparam=nil, isoneclick=nil, oneclickstatus=nil, advancedmetricnumber=nil, isbindall=nil, tags=nil, issupportalarmtag=nil)
+        def initialize(policyid=nil, policyname=nil, remark=nil, monitortype=nil, enable=nil, usesum=nil, projectid=nil, projectname=nil, namespace=nil, conditiontemplateid=nil, condition=nil, eventcondition=nil, noticeids=nil, notices=nil, triggertasks=nil, conditionstemp=nil, lastedituin=nil, updatetime=nil, inserttime=nil, region=nil, namespaceshowname=nil, isdefault=nil, cansetdefault=nil, instancegroupid=nil, instancesum=nil, instancegroupname=nil, ruletype=nil, originid=nil, taginstances=nil, filter=nil, groupby=nil, filterdimensionsparam=nil, isoneclick=nil, oneclickstatus=nil, advancedmetricnumber=nil, isbindall=nil, tags=nil, issupportalarmtag=nil)
           @PolicyId = policyid
           @PolicyName = policyname
           @Remark = remark
@@ -542,6 +597,8 @@ module TencentCloud
           @RuleType = ruletype
           @OriginId = originid
           @TagInstances = taginstances
+          @Filter = filter
+          @GroupBy = groupby
           @FilterDimensionsParam = filterdimensionsparam
           @IsOneClick = isoneclick
           @OneClickStatus = oneclickstatus
@@ -611,6 +668,18 @@ module TencentCloud
               @TagInstances << taginstance_tmp
             end
           end
+          unless params['Filter'].nil?
+            @Filter = AlarmConditionFilter.new
+            @Filter.deserialize(params['Filter'])
+          end
+          unless params['GroupBy'].nil?
+            @GroupBy = []
+            params['GroupBy'].each do |i|
+              alarmgroupbyitem_tmp = AlarmGroupByItem.new
+              alarmgroupbyitem_tmp.deserialize(i)
+              @GroupBy << alarmgroupbyitem_tmp
+            end
+          end
           @FilterDimensionsParam = params['FilterDimensionsParam']
           @IsOneClick = params['IsOneClick']
           @OneClickStatus = params['OneClickStatus']
@@ -1649,16 +1718,16 @@ module TencentCloud
       class CreateExporterIntegrationRequest < TencentCloud::Common::AbstractModel
         # @param InstanceId: 实例 ID
         # @type InstanceId: String
-        # @param Kind: 类型
+        # @param Kind: 类型(可通过 DescribePrometheusIntegrations 接口获取，取每一项中的 ExporterType 字段)
         # @type Kind: String
         # @param Content: 集成配置
         # @type Content: String
-        # @param KubeType: Kubernetes 集群类型，取值如下：
+        # @param KubeType: Kubernetes 集群类型，可不填，取值如下：
         # <li> 1= 容器集群(TKE) </li>
-        # <li> 2=弹性集群<EKS> </li>
-        # <li> 3= Prometheus管理的弹性集群<MEKS> </li>
+        # <li> 2=弹性集群(EKS) </li>
+        # <li> 3= Prometheus管理的弹性集群(MEKS) </li>
         # @type KubeType: Integer
-        # @param ClusterId: 集群 ID
+        # @param ClusterId: 集群 ID，可不填
         # @type ClusterId: String
 
         attr_accessor :InstanceId, :Kind, :Content, :KubeType, :ClusterId
@@ -2278,13 +2347,13 @@ module TencentCloud
       class CreatePrometheusMultiTenantInstancePostPayModeRequest < TencentCloud::Common::AbstractModel
         # @param InstanceName: 实例名
         # @type InstanceName: String
-        # @param VpcId: VPC ID
+        # @param VpcId: VPC ID(可通过 vpc:DescribeVpcs 接口获取，与实例同地域)
         # @type VpcId: String
-        # @param SubnetId: 子网 ID
+        # @param SubnetId: 子网 ID(可通过 vpc:DescribeSubnets 接口获取)
         # @type SubnetId: String
         # @param DataRetentionTime: 数据存储时间（单位天），限制值为15，30，45之一
         # @type DataRetentionTime: Integer
-        # @param Zone: 可用区
+        # @param Zone: 可用区(与子网同可用区)
         # @type Zone: String
         # @param TagSpecification: 实例的标签
         # @type TagSpecification: Array
@@ -2383,11 +2452,11 @@ module TencentCloud
 
       # CreatePrometheusScrapeJob请求参数结构体
       class CreatePrometheusScrapeJobRequest < TencentCloud::Common::AbstractModel
-        # @param InstanceId: Prometheus 实例 ID，例如：prom-abcd1234
+        # @param InstanceId: Prometheus 实例 ID
         # @type InstanceId: String
-        # @param AgentId: Agent ID，例如：agent-abcd1234，可在控制台 Agent 管理中获取
+        # @param AgentId: Agent ID(可通过DescribePrometheusAgents 接口获取)
         # @type AgentId: String
-        # @param Config: 抓取任务配置，格式：job_name:xx
+        # @param Config: 抓取任务配置
         # @type Config: String
 
         attr_accessor :InstanceId, :AgentId, :Config
@@ -2468,7 +2537,7 @@ module TencentCloud
       class CreateRecordingRuleRequest < TencentCloud::Common::AbstractModel
         # @param Name: 聚合规则名称
         # @type Name: String
-        # @param Group: 聚合规则组内容，格式为 yaml
+        # @param Group: 聚合规则组内容，格式为 yaml，通过 base64 进行编码。
         # @type Group: String
         # @param InstanceId: Prometheus 实例 ID
         # @type InstanceId: String
@@ -2785,16 +2854,16 @@ module TencentCloud
       class DeleteExporterIntegrationRequest < TencentCloud::Common::AbstractModel
         # @param InstanceId: 实例 ID
         # @type InstanceId: String
-        # @param Kind: 类型
+        # @param Kind: 类型(可通过 DescribeExporterIntegrations获取)
         # @type Kind: String
         # @param Name: 名字
         # @type Name: String
         # @param KubeType: Kubernetes 集群类型，取值如下：
         # <li> 1= 容器集群(TKE) </li>
-        # <li> 2=弹性集群<EKS> </li>
-        # <li> 3= Prometheus管理的弹性集群<MEKS> </li>
+        # <li> 2=弹性集群(EKS) </li>
+        # <li> 3= Prometheus管理的弹性集群(MEKS) </li>
         # @type KubeType: Integer
-        # @param ClusterId: 集群 ID
+        # @param ClusterId: 集群 ID，可不填
         # @type ClusterId: String
 
         attr_accessor :InstanceId, :Kind, :Name, :KubeType, :ClusterId
@@ -3147,9 +3216,9 @@ module TencentCloud
       class DeletePrometheusScrapeJobsRequest < TencentCloud::Common::AbstractModel
         # @param InstanceId: 实例 ID
         # @type InstanceId: String
-        # @param AgentId: Agent ID
+        # @param AgentId: Agent ID(可通过 DescribePrometheusAgents 接口获取)
         # @type AgentId: String
-        # @param JobIds: 任务 ID 列表
+        # @param JobIds: 任务 ID 列表(可通过 DescribePrometheusScrapeJobs 接口获取)
         # @type JobIds: Array
 
         attr_accessor :InstanceId, :AgentId, :JobIds
@@ -14063,6 +14132,13 @@ module TencentCloud
         # @param InstanceId: 实例 ID
         # @type InstanceId: String
         # @param IntegrationCodes: Prometheus 集成项 Code，升级对应的 Dashboard，取值如下：
+        # <li>qcloud</li>
+        # <li>cvm_process_exporter</li>
+        # <li>cvm_node_exporter</li>
+        # <li>cvm</li>
+        # <li>kubernetes</li>
+        # <li>cdwch</li>
+        # <li>rocketmq</li>
         # <li>spring_mvc</li>
         # <li>mysql</li>
         # <li>go</li>
@@ -14080,6 +14156,8 @@ module TencentCloud
         # <li>tps</li>
         # <li>istio</li>
         # <li>etcd</li>
+        # <li>pts</li>
+        # <li>kong</li>
         # @type IntegrationCodes: Array
 
         attr_accessor :InstanceId, :IntegrationCodes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tencentcloud-sdk-monitor
 version: !ruby/object:Gem::Version
-  version: 3.0.723
+  version: 3.0.725
 platform: ruby
 authors:
 - Tencent Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tencentcloud-sdk-common