Skip to content

Commit 39ebdf8

Browse files
SevenEarthSevenEarth
authored
fix(monitor): [121590130] tencentcloud_monitor_tmp_exporter_integration update SDK information (#3100)
* add * add
1 parent c23c04a commit 39ebdf8

File tree

4 files changed

+80
-79
lines changed

4 files changed

+80
-79
lines changed

‎.changelog/3100.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_monitor_tmp_exporter_integration: update SDK information
3+
```

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import (
1010
"strconv"
1111
"strings"
1212

13-
tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
14-
1513
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1614
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1715
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
@@ -101,10 +99,10 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD
10199
request.ClusterId = helper.String(clusterId)
102100
}
103101

104-
initStatus := tke.NewDescribePrometheusInstanceInitStatusRequest()
102+
initStatus := monitor.NewDescribePrometheusInstanceInitStatusRequest()
105103
initStatus.InstanceId = request.InstanceId
106104
err := resource.Retry(8*tccommon.ReadRetryTimeout, func() *resource.RetryError {
107-
results, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DescribePrometheusInstanceInitStatus(initStatus)
105+
results, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMonitorClient().DescribePrometheusInstanceInitStatus(initStatus)
108106
if errRet != nil {
109107
return tccommon.RetryError(errRet, tccommon.InternalError)
110108
}
@@ -116,10 +114,10 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD
116114
return nil
117115
}
118116
if *status == "uninitialized" {
119-
iniRequest := tke.NewRunPrometheusInstanceRequest()
117+
iniRequest := monitor.NewRunPrometheusInstanceRequest()
120118
iniRequest.InstanceId = request.InstanceId
121119
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
122-
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().RunPrometheusInstance(iniRequest)
120+
result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMonitorClient().RunPrometheusInstance(iniRequest)
123121
if e != nil {
124122
return tccommon.RetryError(e)
125123
} else {

‎tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.md‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,43 @@ Provides a resource to create a monitor tmpExporterIntegration
44

55
Example Usage
66

7-
Use blackbox-exporter
7+
Use qcloud-exporter
88

99
```hcl
10-
resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" {
11-
instance_id = "prom-dko9d0nu"
12-
kind = "blackbox-exporter"
13-
content = "{\"name\":\"test\",\"kind\":\"blackbox-exporter\",\"spec\":{\"instanceSpec\":{\"module\":\"http_get\",\"urls\":[\"xx\"]}}}"
14-
kube_type = 1
15-
cluster_id = "cls-bmuaukfu"
10+
resource "tencentcloud_monitor_tmp_exporter_integration" "example" {
11+
instance_id = "prom-gzg3f1em"
12+
kind = "qcloud-exporter"
13+
content = "{\"name\":\"test\",\"kind\":\"qcloud-exporter\",\"spec\":{\"scrapeSpec\":{\"interval\":\"1m\",\"timeout\":\"1m\",\"relabelConfigs\":\"#metricRelabelings:\\n#- action: labeldrop\\n# regex: tmp_test_label\\n\"},\"instanceSpec\":{\"region\":\"Guangzhou\",\"role\":\"CM_QCSLinkedRoleInTMP\",\"useRole\":true,\"authProvider\":{\"method\":1,\"presetRole\":\"CM_QCSLinkedRoleInTMP\"},\"rateLimit\":1000,\"delaySeconds\":0,\"rangeSeconds\":0,\"reload_interval_minutes\":10,\"uin\":\"100023201586\",\"tag_key_operation\":\"ToUnderLineAndLower\"},\"exporterSpec\":{\"cvm\":false,\"cbs\":true,\"imageRegistry\":\"ccr.ccs.tencentyun.com\",\"cpu\":\"0.25\",\"memory\":\"0.5Gi\"}},\"status\":{}}"
14+
cluster_id = "cls-csxm4phu"
15+
kube_type = 3
1616
}
1717
```
1818

1919
Use es-exporter
2020

2121
```
22-
resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegrationEs" {
23-
instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id
22+
resource "tencentcloud_monitor_tmp_exporter_integration" "example" {
23+
instance_id = "prom-gzg3f1em"
2424
kind = "es-exporter"
2525
content = jsonencode({
26-
"name": "ex-exporter-example",
27-
"kind": "es-exporter",
28-
"spec": {
29-
"instanceSpec": {
30-
"url": "http://127.0.0.1:9123",
31-
"labels": {
32-
"instance": "es-abcd"
33-
},
34-
"version": "1.70.1",
35-
"user": "fugiat Duis minim",
36-
"password": "exercitation cillum velit"
26+
"name" : "ex-exporter-example",
27+
"kind" : "es-exporter",
28+
"spec" : {
29+
"instanceSpec" : {
30+
"user" : "root",
31+
"password" : "Password@123"
32+
"url" : "http://127.0.0.1:8080",
33+
"labels" : {
34+
"labelKey" : "labelValue"
35+
}
3736
},
38-
"exporterSpec": {
39-
"all": true,
40-
"indicesSettings": false,
41-
"snapshots": false,
42-
"indices": true,
43-
"shards": false
37+
"exporterSpec" : {
38+
"all" : true,
39+
"indices" : true,
40+
"indicesSettings" : true,
41+
"shards" : true,
42+
"snapshots" : true,
43+
"clusterSettings" : true
4444
}
4545
}
4646
})
@@ -53,36 +53,36 @@ Integration Center: CVM Scrape Job
5353

5454
```
5555
resource "tencentcloud_vpc" "vpc" {
56-
name = "tf-eks-vpc"
56+
name = "vpc"
5757
cidr_block = "10.2.0.0/16"
5858
}
5959
60-
resource "tencentcloud_subnet" "sub" {
60+
resource "tencentcloud_subnet" "subnet" {
6161
vpc_id = tencentcloud_vpc.vpc.id
62-
name = "tf-as-subnet"
62+
name = "subnet"
6363
cidr_block = "10.2.11.0/24"
64-
availability_zone = "ap-guangzhou-3"
64+
availability_zone = "ap-guangzhou-6"
6565
}
6666
67-
resource "tencentcloud_monitor_tmp_instance" "tmpInstance" {
68-
instance_name = "tf-test-tmp"
67+
resource "tencentcloud_monitor_tmp_instance" "example" {
68+
instance_name = "tf-example"
6969
vpc_id = tencentcloud_vpc.vpc.id
70-
subnet_id = tencentcloud_subnet.sub.id
70+
subnet_id = tencentcloud_subnet.subnet.id
7171
data_retention_time = 15
72-
zone = "ap-guangzhou-3"
72+
zone = "ap-guangzhou-6"
7373
tags = {
74-
"createdBy" = "terraform"
74+
createdBy = "Terraform"
7575
}
7676
}
7777
7878
# Integration Center: CVM Scrape Job
79-
resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" {
80-
instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id
79+
resource "tencentcloud_monitor_tmp_exporter_integration" "example" {
80+
instance_id = tencentcloud_monitor_tmp_instance.example.id
8181
kind = "cvm-http-sd-exporter"
82-
content = jsonencode({
83-
"kind": "cvm-http-sd-exporter",
84-
"spec": {
85-
"job": <<-EOT
82+
content = jsonencode({
83+
"kind" : "cvm-http-sd-exporter",
84+
"spec" : {
85+
"job" : <<-EOT
8686
job_name: example-cvm-job-name
8787
metrics_path: /metrics
8888
cvm_sd_configs:
@@ -106,7 +106,7 @@ resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration
106106
EOT
107107
}
108108
})
109-
kube_type = 3
110-
cluster_id = ""
109+
cluster_id = ""
110+
kube_type = 3
111111
}
112112
```

‎website/docs/r/monitor_tmp_exporter_integration.html.markdown‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,43 @@ Provides a resource to create a monitor tmpExporterIntegration
1515

1616
## Example Usage
1717

18-
### Use blackbox-exporter
18+
### Use qcloud-exporter
1919

2020
```hcl
21-
resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" {
22-
instance_id = "prom-dko9d0nu"
23-
kind = "blackbox-exporter"
24-
content = "{\"name\":\"test\",\"kind\":\"blackbox-exporter\",\"spec\":{\"instanceSpec\":{\"module\":\"http_get\",\"urls\":[\"xx\"]}}}"
25-
kube_type = 1
26-
cluster_id = "cls-bmuaukfu"
21+
resource "tencentcloud_monitor_tmp_exporter_integration" "example" {
22+
instance_id = "prom-gzg3f1em"
23+
kind = "qcloud-exporter"
24+
content = "{\"name\":\"test\",\"kind\":\"qcloud-exporter\",\"spec\":{\"scrapeSpec\":{\"interval\":\"1m\",\"timeout\":\"1m\",\"relabelConfigs\":\"#metricRelabelings:\\n#- action: labeldrop\\n# regex: tmp_test_label\\n\"},\"instanceSpec\":{\"region\":\"Guangzhou\",\"role\":\"CM_QCSLinkedRoleInTMP\",\"useRole\":true,\"authProvider\":{\"method\":1,\"presetRole\":\"CM_QCSLinkedRoleInTMP\"},\"rateLimit\":1000,\"delaySeconds\":0,\"rangeSeconds\":0,\"reload_interval_minutes\":10,\"uin\":\"100023201586\",\"tag_key_operation\":\"ToUnderLineAndLower\"},\"exporterSpec\":{\"cvm\":false,\"cbs\":true,\"imageRegistry\":\"ccr.ccs.tencentyun.com\",\"cpu\":\"0.25\",\"memory\":\"0.5Gi\"}},\"status\":{}}"
25+
cluster_id = "cls-csxm4phu"
26+
kube_type = 3
2727
}
2828
```
2929

3030
### Use es-exporter
3131

3232
```hcl
33-
resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegrationEs" {
34-
instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id
33+
resource "tencentcloud_monitor_tmp_exporter_integration" "example" {
34+
instance_id = "prom-gzg3f1em"
3535
kind = "es-exporter"
3636
content = jsonencode({
3737
"name" : "ex-exporter-example",
3838
"kind" : "es-exporter",
3939
"spec" : {
4040
"instanceSpec" : {
41-
"url" : "http://127.0.0.1:9123",
41+
"user" : "root",
42+
"password" : "Password@123"
43+
"url" : "http://127.0.0.1:8080",
4244
"labels" : {
43-
"instance" : "es-abcd"
44-
},
45-
"version" : "1.70.1",
46-
"user" : "fugiat Duis minim",
47-
"password" : "exercitation cillum velit"
45+
"labelKey" : "labelValue"
46+
}
4847
},
4948
"exporterSpec" : {
5049
"all" : true,
51-
"indicesSettings" : false,
52-
"snapshots" : false,
5350
"indices" : true,
54-
"shards" : false
51+
"indicesSettings" : true,
52+
"shards" : true,
53+
"snapshots" : true,
54+
"clusterSettings" : true
5555
}
5656
}
5757
})
@@ -64,31 +64,31 @@ resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration
6464

6565
```hcl
6666
resource "tencentcloud_vpc" "vpc" {
67-
name = "tf-eks-vpc"
67+
name = "vpc"
6868
cidr_block = "10.2.0.0/16"
6969
}
7070
71-
resource "tencentcloud_subnet" "sub" {
71+
resource "tencentcloud_subnet" "subnet" {
7272
vpc_id = tencentcloud_vpc.vpc.id
73-
name = "tf-as-subnet"
73+
name = "subnet"
7474
cidr_block = "10.2.11.0/24"
75-
availability_zone = "ap-guangzhou-3"
75+
availability_zone = "ap-guangzhou-6"
7676
}
7777
78-
resource "tencentcloud_monitor_tmp_instance" "tmpInstance" {
79-
instance_name = "tf-test-tmp"
78+
resource "tencentcloud_monitor_tmp_instance" "example" {
79+
instance_name = "tf-example"
8080
vpc_id = tencentcloud_vpc.vpc.id
81-
subnet_id = tencentcloud_subnet.sub.id
81+
subnet_id = tencentcloud_subnet.subnet.id
8282
data_retention_time = 15
83-
zone = "ap-guangzhou-3"
83+
zone = "ap-guangzhou-6"
8484
tags = {
85-
"createdBy" = "terraform"
85+
createdBy = "Terraform"
8686
}
8787
}
8888
8989
# Integration Center: CVM Scrape Job
90-
resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" {
91-
instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id
90+
resource "tencentcloud_monitor_tmp_exporter_integration" "example" {
91+
instance_id = tencentcloud_monitor_tmp_instance.example.id
9292
kind = "cvm-http-sd-exporter"
9393
content = jsonencode({
9494
"kind" : "cvm-http-sd-exporter",
@@ -117,8 +117,8 @@ resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration
117117
EOT
118118
}
119119
})
120-
kube_type = 3
121120
cluster_id = ""
121+
kube_type = 3
122122
}
123123
```
124124

0 commit comments

Comments
 (0)