tencentcloud-sdk-monitor 3.0.405 → 3.0.408

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a75829f80b35b25c991bc0c4f6e17f5582968f6
-  data.tar.gz: 2443ccee297be62c735c19e0ce06d62bcea5d03f
+  metadata.gz: aae9d4dd200a8b3426cc82372c47a6236b465e23
+  data.tar.gz: f70f4f63f770c2fd6d7e3d428282650fd2638726
 SHA512:
-  metadata.gz: 7e9dab598faa17a0583672f9dfd9b0a48139f963941a24126fc2c9d3d0f1d9f17a1e06cc449ad30c070389e660793eab3c0d2af21ae56067a7a73581d57ab441
-  data.tar.gz: daf2c5bd219751368e15a6b704a4a2e7618ef992193e9f8ef01576e149007c6fbcd18491377498e278ea7cb72b7be4712930597c772275baa4981a5888d86546
+  metadata.gz: 84fd1f0ef04e8c667cc7a484c773965c57c36f8b755f4e8ba22d6797b328fac244b2ba5640e6e2a17cd9077fbc1baafa14e1c84c5b309eec9ce2cd9859937b49
+  data.tar.gz: 61cc32ebc0de1971d9b8a5831baa8afeadb8392c46ff2e926be39c4ee1789cb3bf7372ca9ada25752913405be8186b1fc6ff45239b6e940a974b1c0913a07321

data/lib/VERSION

@@ -1 +1 @@
-3.0.405
+3.0.408

data/lib/v20180724/client.rb

@@ -1165,6 +1165,30 @@ module TencentCloud
           raise TencentCloud::Common::TencentCloudSDKException.new(nil, e.inspect)
         end
 
+        # 列出 Grafana 所有告警通道
+
+        # @param request: Request instance for DescribeGrafanaChannels.
+        # @type request: :class:`Tencentcloud::monitor::V20180724::DescribeGrafanaChannelsRequest`
+        # @rtype: :class:`Tencentcloud::monitor::V20180724::DescribeGrafanaChannelsResponse`
+        def DescribeGrafanaChannels(request)
+          body = send_request('DescribeGrafanaChannels', request.serialize)
+          response = JSON.parse(body)
+          if response['Response'].key?('Error') == false
+            model = DescribeGrafanaChannelsResponse.new
+            model.deserialize(response['Response'])
+            model
+          else
+            code = response['Response']['Error']['Code']
+            message = response['Response']['Error']['Message']
+            reqid = response['Response']['RequestId']
+            raise TencentCloud::Common::TencentCloudSDKException.new(code, message, reqid)
+          end
+        rescue TencentCloud::Common::TencentCloudSDKException => e
+          raise e
+        rescue StandardError => e
+          raise TencentCloud::Common::TencentCloudSDKException.new(nil, e.inspect)
+        end
+
         # 列出 Grafana 的设置，即 grafana.ini 文件内容
 
         # @param request: Request instance for DescribeGrafanaConfig.
@@ -1776,6 +1800,9 @@ module TencentCloud
         # 接口调用频率限制为：20次/秒，1200次/分钟。单请求最多可支持批量拉取10个实例的监控数据，单请求的数据点数限制为1440个。
         # 若您需要调用的指标、对象较多，可能存在因限频出现拉取失败的情况，建议尽量将请求按时间维度均摊。
 
+        # >?
+        # >- 2022年9月1日起，云监控开始对GetMonitorData接口计费。每个主账号每月可获得100万次免费请求额度，超过免费额度后如需继续调用接口需要开通 [API请求按量付费](https://buy.cloud.tencent.com/APIRequestBuy)。计费规则可查看[API计费文档](https://cloud.tencent.com/document/product/248/77914)。
+
         # @param request: Request instance for GetMonitorData.
         # @type request: :class:`Tencentcloud::monitor::V20180724::GetMonitorDataRequest`
         # @rtype: :class:`Tencentcloud::monitor::V20180724::GetMonitorDataResponse`

data/lib/v20180724/models.rb

@@ -1534,16 +1534,21 @@ module TencentCloud
 
       # CreateGrafanaIntegration返回参数结构体
       class CreateGrafanaIntegrationResponse < TencentCloud::Common::AbstractModel
+        # @param IntegrationId: 集成 ID
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type IntegrationId: String
         # @param RequestId: 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。
         # @type RequestId: String
 
-        attr_accessor :RequestId
+        attr_accessor :IntegrationId, :RequestId
         
-        def initialize(requestid=nil)
+        def initialize(integrationid=nil, requestid=nil)
+          @IntegrationId = integrationid
           @RequestId = requestid
         end
 
         def deserialize(params)
+          @IntegrationId = params['IntegrationId']
           @RequestId = params['RequestId']
         end
       end
@@ -1554,21 +1559,24 @@ module TencentCloud
         # @type InstanceId: String
         # @param ChannelName: 渠道名
         # @type ChannelName: String
-        # @param OrgId: 组织 ID
+        # @param OrgId: 默认为1，已废弃，请使用 OrganizationIds
         # @type OrgId: Integer
         # @param Receivers: 接受告警通道 ID 数组
         # @type Receivers: Array
-        # @param ExtraOrgIds: 额外组织 ID 数组
+        # @param ExtraOrgIds: 额外组织 ID 数组，已废弃，请使用 OrganizationIds
         # @type ExtraOrgIds: Array
+        # @param OrganizationIds: 生效的所有组织 ID 数组，默认为 ["1"]
+        # @type OrganizationIds: Array
 
-        attr_accessor :InstanceId, :ChannelName, :OrgId, :Receivers, :ExtraOrgIds
+        attr_accessor :InstanceId, :ChannelName, :OrgId, :Receivers, :ExtraOrgIds, :OrganizationIds
         
-        def initialize(instanceid=nil, channelname=nil, orgid=nil, receivers=nil, extraorgids=nil)
+        def initialize(instanceid=nil, channelname=nil, orgid=nil, receivers=nil, extraorgids=nil, organizationids=nil)
           @InstanceId = instanceid
           @ChannelName = channelname
           @OrgId = orgid
           @Receivers = receivers
           @ExtraOrgIds = extraorgids
+          @OrganizationIds = organizationids
         end
 
         def deserialize(params)
@@ -1577,6 +1585,7 @@ module TencentCloud
           @OrgId = params['OrgId']
           @Receivers = params['Receivers']
           @ExtraOrgIds = params['ExtraOrgIds']
+          @OrganizationIds = params['OrganizationIds']
         end
       end
 
@@ -4107,6 +4116,69 @@ module TencentCloud
         end
       end
 
+      # DescribeGrafanaChannels请求参数结构体
+      class DescribeGrafanaChannelsRequest < TencentCloud::Common::AbstractModel
+        # @param InstanceId: 实例 ID
+        # @type InstanceId: String
+        # @param Offset: 偏移量
+        # @type Offset: Integer
+        # @param Limit: 查询数量
+        # @type Limit: Integer
+        # @param ChannelName: 渠道名
+        # @type ChannelName: String
+        # @param ChannelIds: 渠道 ID
+        # @type ChannelIds: Array
+        # @param ChannelState: 状态
+        # @type ChannelState: Integer
+
+        attr_accessor :InstanceId, :Offset, :Limit, :ChannelName, :ChannelIds, :ChannelState
+        
+        def initialize(instanceid=nil, offset=nil, limit=nil, channelname=nil, channelids=nil, channelstate=nil)
+          @InstanceId = instanceid
+          @Offset = offset
+          @Limit = limit
+          @ChannelName = channelname
+          @ChannelIds = channelids
+          @ChannelState = channelstate
+        end
+
+        def deserialize(params)
+          @InstanceId = params['InstanceId']
+          @Offset = params['Offset']
+          @Limit = params['Limit']
+          @ChannelName = params['ChannelName']
+          @ChannelIds = params['ChannelIds']
+          @ChannelState = params['ChannelState']
+        end
+      end
+
+      # DescribeGrafanaChannels返回参数结构体
+      class DescribeGrafanaChannelsResponse < TencentCloud::Common::AbstractModel
+        # @param NotificationChannelSet: 告警通道数组
+        # @type NotificationChannelSet: Array
+        # @param RequestId: 唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。
+        # @type RequestId: String
+
+        attr_accessor :NotificationChannelSet, :RequestId
+        
+        def initialize(notificationchannelset=nil, requestid=nil)
+          @NotificationChannelSet = notificationchannelset
+          @RequestId = requestid
+        end
+
+        def deserialize(params)
+          unless params['NotificationChannelSet'].nil?
+            @NotificationChannelSet = []
+            params['NotificationChannelSet'].each do |i|
+              grafanachannel_tmp = GrafanaChannel.new
+              grafanachannel_tmp.deserialize(i)
+              @NotificationChannelSet << grafanachannel_tmp
+            end
+          end
+          @RequestId = params['RequestId']
+        end
+      end
+
       # DescribeGrafanaConfig请求参数结构体
       class DescribeGrafanaConfigRequest < TencentCloud::Common::AbstractModel
         # @param InstanceId: 实例 ID
@@ -6935,14 +7007,21 @@ module TencentCloud
         # @type Notes: String
         # @param CreateAt: 创建时间
         # @type CreateAt: String
+        # @param InstanceId: 实例 ID
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type InstanceId: String
+        # @param Uin: 用户主账号 UIN
+        # @type Uin: String
 
-        attr_accessor :UserId, :Role, :Notes, :CreateAt
+        attr_accessor :UserId, :Role, :Notes, :CreateAt, :InstanceId, :Uin
         
-        def initialize(userid=nil, role=nil, notes=nil, createat=nil)
+        def initialize(userid=nil, role=nil, notes=nil, createat=nil, instanceid=nil, uin=nil)
           @UserId = userid
           @Role = role
           @Notes = notes
           @CreateAt = createat
+          @InstanceId = instanceid
+          @Uin = uin
         end
 
         def deserialize(params)
@@ -6957,6 +7036,8 @@ module TencentCloud
           end
           @Notes = params['Notes']
           @CreateAt = params['CreateAt']
+          @InstanceId = params['InstanceId']
+          @Uin = params['Uin']
         end
       end
 
@@ -6980,6 +7061,43 @@ module TencentCloud
         end
       end
 
+      # Grafana 告警渠道
+      class GrafanaChannel < TencentCloud::Common::AbstractModel
+        # @param ChannelId: 渠道 ID
+        # @type ChannelId: String
+        # @param ChannelName: 渠道名
+        # @type ChannelName: String
+        # @param Receivers: 告警通道模板 ID 数组
+        # @type Receivers: Array
+        # @param CreatedAt: 创建时间
+        # @type CreatedAt: String
+        # @param UpdatedAt: 更新时间
+        # @type UpdatedAt: String
+        # @param OrganizationIds: 告警渠道的所有生效组织
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type OrganizationIds: Array
+
+        attr_accessor :ChannelId, :ChannelName, :Receivers, :CreatedAt, :UpdatedAt, :OrganizationIds
+        
+        def initialize(channelid=nil, channelname=nil, receivers=nil, createdat=nil, updatedat=nil, organizationids=nil)
+          @ChannelId = channelid
+          @ChannelName = channelname
+          @Receivers = receivers
+          @CreatedAt = createdat
+          @UpdatedAt = updatedat
+          @OrganizationIds = organizationids
+        end
+
+        def deserialize(params)
+          @ChannelId = params['ChannelId']
+          @ChannelName = params['ChannelName']
+          @Receivers = params['Receivers']
+          @CreatedAt = params['CreatedAt']
+          @UpdatedAt = params['UpdatedAt']
+          @OrganizationIds = params['OrganizationIds']
+        end
+      end
+
       # 查询 Grafana 实例时的实例类型
       class GrafanaInstanceInfo < TencentCloud::Common::AbstractModel
         # @param InstanceName: 实例名
@@ -7086,14 +7204,18 @@ module TencentCloud
         # @type Content: String
         # @param Description: 集成描述
         # @type Description: String
+        # @param GrafanaURL: Grafana 跳转地址
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type GrafanaURL: String
 
-        attr_accessor :IntegrationId, :Kind, :Content, :Description
+        attr_accessor :IntegrationId, :Kind, :Content, :Description, :GrafanaURL
         
-        def initialize(integrationid=nil, kind=nil, content=nil, description=nil)
+        def initialize(integrationid=nil, kind=nil, content=nil, description=nil, grafanaurl=nil)
           @IntegrationId = integrationid
           @Kind = kind
           @Content = content
           @Description = description
+          @GrafanaURL = grafanaurl
         end
 
         def deserialize(params)
@@ -7101,6 +7223,7 @@ module TencentCloud
           @Kind = params['Kind']
           @Content = params['Content']
           @Description = params['Description']
+          @GrafanaURL = params['GrafanaURL']
         end
       end
 
@@ -7116,18 +7239,21 @@ module TencentCloud
         # @type CreatedAt: String
         # @param UpdatedAt: 更新时间
         # @type UpdatedAt: String
-        # @param OrgId: 默认生效组织
+        # @param OrgId: 默认生效组织，已废弃，请使用 OrganizationIds
         # @type OrgId: String
-        # @param ExtraOrgIds: 额外生效组织
+        # @param ExtraOrgIds: 额外生效组织，已废弃，请使用 OrganizationIds
         # 注意：此字段可能返回 null，表示取不到有效值。
         # @type ExtraOrgIds: Array
-        # @param OrgIds: 生效组织
+        # @param OrgIds: 生效组织，已废弃，请使用 OrganizationIds
         # 注意：此字段可能返回 null，表示取不到有效值。
         # @type OrgIds: String
+        # @param OrganizationIds: 告警渠道的所有生效组织
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type OrganizationIds: String
 
-        attr_accessor :ChannelId, :ChannelName, :Receivers, :CreatedAt, :UpdatedAt, :OrgId, :ExtraOrgIds, :OrgIds
+        attr_accessor :ChannelId, :ChannelName, :Receivers, :CreatedAt, :UpdatedAt, :OrgId, :ExtraOrgIds, :OrgIds, :OrganizationIds
         
-        def initialize(channelid=nil, channelname=nil, receivers=nil, createdat=nil, updatedat=nil, orgid=nil, extraorgids=nil, orgids=nil)
+        def initialize(channelid=nil, channelname=nil, receivers=nil, createdat=nil, updatedat=nil, orgid=nil, extraorgids=nil, orgids=nil, organizationids=nil)
           @ChannelId = channelid
           @ChannelName = channelname
           @Receivers = receivers
@@ -7136,6 +7262,7 @@ module TencentCloud
           @OrgId = orgid
           @ExtraOrgIds = extraorgids
           @OrgIds = orgids
+          @OrganizationIds = organizationids
         end
 
         def deserialize(params)
@@ -7147,6 +7274,7 @@ module TencentCloud
           @OrgId = params['OrgId']
           @ExtraOrgIds = params['ExtraOrgIds']
           @OrgIds = params['OrgIds']
+          @OrganizationIds = params['OrganizationIds']
         end
       end
 
@@ -9112,7 +9240,7 @@ module TencentCloud
         # @type RuleId: String
         # @param RuleState: 规则状态码
         # @type RuleState: Integer
-        # @param Name: 规则名称
+        # @param Name: 分组名称
         # @type Name: String
         # @param Group: 规则内容组
         # @type Group: String
@@ -9122,10 +9250,13 @@ module TencentCloud
         # @type CreatedAt: String
         # @param UpdatedAt: 规则最近更新时间
         # @type UpdatedAt: String
+        # @param RuleName: 规则名称
+        # 注意：此字段可能返回 null，表示取不到有效值。
+        # @type RuleName: String
 
-        attr_accessor :RuleId, :RuleState, :Name, :Group, :Total, :CreatedAt, :UpdatedAt
+        attr_accessor :RuleId, :RuleState, :Name, :Group, :Total, :CreatedAt, :UpdatedAt, :RuleName
         
-        def initialize(ruleid=nil, rulestate=nil, name=nil, group=nil, total=nil, createdat=nil, updatedat=nil)
+        def initialize(ruleid=nil, rulestate=nil, name=nil, group=nil, total=nil, createdat=nil, updatedat=nil, rulename=nil)
           @RuleId = ruleid
           @RuleState = rulestate
           @Name = name
@@ -9133,6 +9264,7 @@ module TencentCloud
           @Total = total
           @CreatedAt = createdat
           @UpdatedAt = updatedat
+          @RuleName = rulename
         end
 
         def deserialize(params)
@@ -9143,6 +9275,7 @@ module TencentCloud
           @Total = params['Total']
           @CreatedAt = params['CreatedAt']
           @UpdatedAt = params['UpdatedAt']
+          @RuleName = params['RuleName']
         end
       end
 
@@ -10059,17 +10192,20 @@ module TencentCloud
         # @type ChannelName: String
         # @param Receivers: 接受告警通道 ID 数组
         # @type Receivers: Array
-        # @param ExtraOrgIds: 额外组织 ID 数组
+        # @param ExtraOrgIds: 已废弃，请使用 OrganizationIds
         # @type ExtraOrgIds: Array
+        # @param OrganizationIds: 生效的组织 ID 数组
+        # @type OrganizationIds: Array
 
-        attr_accessor :ChannelId, :InstanceId, :ChannelName, :Receivers, :ExtraOrgIds
+        attr_accessor :ChannelId, :InstanceId, :ChannelName, :Receivers, :ExtraOrgIds, :OrganizationIds
         
-        def initialize(channelid=nil, instanceid=nil, channelname=nil, receivers=nil, extraorgids=nil)
+        def initialize(channelid=nil, instanceid=nil, channelname=nil, receivers=nil, extraorgids=nil, organizationids=nil)
           @ChannelId = channelid
           @InstanceId = instanceid
           @ChannelName = channelname
           @Receivers = receivers
           @ExtraOrgIds = extraorgids
+          @OrganizationIds = organizationids
         end
 
         def deserialize(params)
@@ -10078,6 +10214,7 @@ module TencentCloud
           @ChannelName = params['ChannelName']
           @Receivers = params['Receivers']
           @ExtraOrgIds = params['ExtraOrgIds']
+          @OrganizationIds = params['OrganizationIds']
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tencentcloud-sdk-monitor
 version: !ruby/object:Gem::Version
-  version: 3.0.405
+  version: 3.0.408
 platform: ruby
 authors:
 - Tencent Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tencentcloud-sdk-common