Skip to content

Commit 60622cf

Browse files
hellertanghellertang
authored
Feature/support monitor tmp (#1146)
* add tmp instance * add tmp cvm agent * support alert rules * add tmp recording rule * add tmp tke template
1 parent d15e2d2 commit 60622cf

25 files changed

+15310
-5526
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
36-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.430
36+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.438
3737
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385
3838
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359
3939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.413
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.430
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.438
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis v1.0.199
@@ -59,7 +59,7 @@ require (
5959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268
62-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.401
62+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.438
6363
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
6464
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.398
6565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199

‎go.sum‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.425 h1:xcAM
494494
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.425/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
495495
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.430 h1:mGlGWepu+R50WZX9YwNs0VaoSLOTEr323rjiRfiD1fE=
496496
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.430/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
497+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.438 h1:tz7YTepMgtehsPI7nTXEZ6W9eOaXR0rvLMtqwHDzhZ8=
498+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.438/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
497499
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385 h1:8bwloRxRwSADSK48KxaUeO9JHmmgniNGJbA7Or/HUEk=
498500
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.385/go.mod h1:PMxA0L4o8Fbx/6+ju1cAMAU7x2bV4C6e/LTqVe745yM=
499501
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359 h1:cNKqelPgUxrJkLY0Azd2QHr/UMYOPPnmqs88clt2akk=
@@ -523,6 +525,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.329 h1:T4k
523525
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.329/go.mod h1:aMwrB/fRSIS8IFabcF0hfRC89y76DptUknUjAf1jlHE=
524526
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.430 h1:cnBlRttt3A68RPKt8aKf8B3i7KoBnDrfGfUK05xIcnY=
525527
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.430/go.mod h1:Iw2Q3oExnpSR7pGnC/2nKfUaUS2GAniG1HKSfWU5Pgg=
528+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.438 h1:zf+NkKb0fgurjgCdpApnLjip7bxU7fxejI8HW5pTHl8=
529+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.438/go.mod h1:VgHc7QaLfYqdurDBb+HwXaDRuFbpsnZIKkjSPl748JA=
526530
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391 h1:1yZh5MrlFqawVGhLdd38hi5HoaKc4LgB+8cEgLT2Qo4=
527531
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.391/go.mod h1:BZSQiBjNQ+6/gL1fFXBr/0BOuPTdHmSYoIg4/AkmZB4=
528532
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.290 h1:osYZxh9ApEc8UpvIMwjAUfdl7ytRcWUpcnnqLIpiJ/U=
@@ -549,6 +553,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268 h1:ez5lvK
549553
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268/go.mod h1:fchXZhmqaYaG2c4wTCBTdnW6TFAtxl3D/P/yuuuLMfA=
550554
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.401 h1:L54Iof1fzxnuWyfvqA6BzUS4se7dO2Brv7uVSOQw/uw=
551555
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.401/go.mod h1:VferweibNGBu3H6R7v2V3+6L0rZTTi/Xwjhn/nMMylw=
556+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.438 h1:pVN2u4lXOaz+A79IeBPnyDYwW3Z2unCi6rxCW2O7LPo=
557+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.438/go.mod h1:D2NpA7a0j4WZ8T2L6BxbN7LFyLHkz6FlhQG8s5AQ2ts=
552558
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4pA5QtzhwMNIEUt0spXdSBKH744DDqTHJOCP0=
553559
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199/go.mod h1:Yw6OQ33z3s4k0HVYTNSffB12qOzEJ2Zf1Vj4+5S3sRs=
554560
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.398 h1:1JVKMl+yjZbntwAW0A6esjQI1/dXXqjQ9+OLai7ZS2w=

‎tencentcloud/provider.go‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,10 @@ Monitor
424424
tencentcloud_monitor_policy_binding_object
425425
tencentcloud_monitor_binding_receiver
426426
tencentcloud_monitor_alarm_policy
427+
tencentcloud_monitor_tmp_instance
428+
tencentcloud_monitor_tmp_cvm_agent
429+
tencentcloud_monitor_tmp_recording_rule
430+
tencentcloud_monitor_tmp_tke_template
427431
428432
PostgreSQL
429433
Data Source
@@ -1061,11 +1065,16 @@ func Provider() terraform.ResourceProvider {
10611065
"tencentcloud_cdn_domain": resourceTencentCloudCdnDomain(),
10621066
"tencentcloud_cdn_url_push": resourceTencentCloudUrlPush(),
10631067
"tencentcloud_cdn_url_purge": resourceTencentCloudUrlPurge(),
1064-
"tencentcloud_monitor_policy_group": resourceTencentMonitorPolicyGroup(),
1065-
"tencentcloud_monitor_binding_object": resourceTencentMonitorBindingObject(),
1066-
"tencentcloud_monitor_policy_binding_object": resourceTencentMonitorPolicyBindingObject(),
1067-
"tencentcloud_monitor_binding_receiver": resourceTencentMonitorBindingAlarmReceiver(),
1068-
"tencentcloud_monitor_alarm_policy": resourceTencentMonitorAlarmPolicy(),
1068+
"tencentcloud_monitor_policy_group": resourceTencentCloudMonitorPolicyGroup(),
1069+
"tencentcloud_monitor_binding_object": resourceTencentCloudMonitorBindingObject(),
1070+
"tencentcloud_monitor_policy_binding_object": resourceTencentCloudMonitorPolicyBindingObject(),
1071+
"tencentcloud_monitor_binding_receiver": resourceTencentCloudMonitorBindingAlarmReceiver(),
1072+
"tencentcloud_monitor_alarm_policy": resourceTencentCloudMonitorAlarmPolicy(),
1073+
"tencentcloud_monitor_tmp_instance": resourceTencentCloudMonitorTmpInstance(),
1074+
"tencentcloud_monitor_tmp_cvm_agent": resourceTencentCloudMonitorTmpCvmAgent(),
1075+
"tencentcloud_monitor_tmp_alert_rule": resourceTencentCloudMonitorTmpAlertRule(),
1076+
"tencentcloud_monitor_tmp_recording_rule": resourceTencentCloudMonitorTmpRecordingRule(),
1077+
"tencentcloud_monitor_tmp_tke_template": resourceTencentCloudMonitorTmpTkeTemplate(),
10691078
"tencentcloud_mongodb_standby_instance": resourceTencentCloudMongodbStandbyInstance(),
10701079
"tencentcloud_elasticsearch_instance": resourceTencentCloudElasticsearchInstance(),
10711080
"tencentcloud_postgresql_instance": resourceTencentCloudPostgresqlInstance(),

‎tencentcloud/resource_tc_monitor_alarm_policy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ func AlarmPolicyRule() map[string]*schema.Schema {
319319
}
320320
}
321321

322-
func resourceTencentMonitorAlarmPolicy() *schema.Resource {
322+
func resourceTencentCloudMonitorAlarmPolicy() *schema.Resource {
323323
return &schema.Resource{
324324
Create: resourceTencentMonitorAlarmPolicyCreate,
325325
Read: resourceTencentMonitorAlarmPolicyRead,

‎tencentcloud/resource_tc_monitor_binding_object.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import (
5050
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
5151
)
5252

53-
func resourceTencentMonitorBindingObject() *schema.Resource {
53+
func resourceTencentCloudMonitorBindingObject() *schema.Resource {
5454
return &schema.Resource{
5555
DeprecationMessage: "This resource has been deprecated in Terraform TencentCloud provider version 1.60.5. Please use 'tencentcloud_monitor_policy_binding_object' instead.",
5656
Create: resourceTencentMonitorBindingObjectCreate,

‎tencentcloud/resource_tc_monitor_binding_receiver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import (
5050
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
5151
)
5252

53-
func resourceTencentMonitorBindingAlarmReceiver() *schema.Resource {
53+
func resourceTencentCloudMonitorBindingAlarmReceiver() *schema.Resource {
5454
return &schema.Resource{
5555
Create: resourceTencentMonitorBindingAlarmReceiverCreate,
5656
Read: resourceTencentMonitorBindingAlarmReceiverRead,

‎tencentcloud/resource_tc_monitor_policy_binding_object.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import (
7878
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
7979
)
8080

81-
func resourceTencentMonitorPolicyBindingObject() *schema.Resource {
81+
func resourceTencentCloudMonitorPolicyBindingObject() *schema.Resource {
8282
return &schema.Resource{
8383
Create: resourceTencentMonitorPolicyBindingObjectCreate,
8484
Read: resourceTencentMonitorPolicyBindingObjectRead,

‎tencentcloud/resource_tc_monitor_policy_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import (
6464
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
6565
)
6666

67-
func resourceTencentMonitorPolicyGroup() *schema.Resource {
67+
func resourceTencentCloudMonitorPolicyGroup() *schema.Resource {
6868
return &schema.Resource{
6969
DeprecationMessage: "This resource has been deprecated in Terraform TencentCloud provider version 1.59.18. Please use 'tencentcloud_monitor_alarm_policy' instead.",
7070
Create: resourceTencentMonitorPolicyGroupCreate,

0 commit comments

Comments
 (0)