From 12749c49df3fddd5db96f15b17d62e02d8a133fc Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Wed, 22 Jan 2025 16:59:10 +0800 Subject: [PATCH 1/2] add --- ...rce_tc_monitor_tmp_exporter_integration.go | 10 +-- ...rce_tc_monitor_tmp_exporter_integration.md | 86 +++++++++---------- ...tor_tmp_exporter_integration.html.markdown | 60 ++++++------- 3 files changed, 77 insertions(+), 79 deletions(-) diff --git a/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go b/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go index 80aa60c780..51501e9916 100644 --- a/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go +++ b/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.go @@ -10,8 +10,6 @@ import ( "strconv" "strings" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724" @@ -101,10 +99,10 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD request.ClusterId = helper.String(clusterId) } - initStatus := tke.NewDescribePrometheusInstanceInitStatusRequest() + initStatus := monitor.NewDescribePrometheusInstanceInitStatusRequest() initStatus.InstanceId = request.InstanceId err := resource.Retry(8*tccommon.ReadRetryTimeout, func() *resource.RetryError { - results, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DescribePrometheusInstanceInitStatus(initStatus) + results, errRet := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMonitorClient().DescribePrometheusInstanceInitStatus(initStatus) if errRet != nil { return tccommon.RetryError(errRet, tccommon.InternalError) } @@ -116,10 +114,10 @@ func resourceTencentCloudMonitorTmpExporterIntegrationCreate(d *schema.ResourceD return nil } if *status == "uninitialized" { - iniRequest := tke.NewRunPrometheusInstanceRequest() + iniRequest := monitor.NewRunPrometheusInstanceRequest() iniRequest.InstanceId = request.InstanceId err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().RunPrometheusInstance(iniRequest) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseMonitorClient().RunPrometheusInstance(iniRequest) if e != nil { return tccommon.RetryError(e) } else { diff --git a/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.md b/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.md index f21c73fe05..086bb73490 100644 --- a/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.md +++ b/tencentcloud/services/tmp/resource_tc_monitor_tmp_exporter_integration.md @@ -4,43 +4,43 @@ Provides a resource to create a monitor tmpExporterIntegration Example Usage -Use blackbox-exporter +Use qcloud-exporter ```hcl -resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" { - instance_id = "prom-dko9d0nu" - kind = "blackbox-exporter" - content = "{\"name\":\"test\",\"kind\":\"blackbox-exporter\",\"spec\":{\"instanceSpec\":{\"module\":\"http_get\",\"urls\":[\"xx\"]}}}" - kube_type = 1 - cluster_id = "cls-bmuaukfu" +resource "tencentcloud_monitor_tmp_exporter_integration" "example" { + instance_id = "prom-gzg3f1em" + kind = "qcloud-exporter" + 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\":{}}" + cluster_id = "cls-csxm4phu" + kube_type = 3 } ``` Use es-exporter ``` -resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegrationEs" { - instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id +resource "tencentcloud_monitor_tmp_exporter_integration" "example" { + instance_id = "prom-gzg3f1em" kind = "es-exporter" content = jsonencode({ - "name": "ex-exporter-example", - "kind": "es-exporter", - "spec": { - "instanceSpec": { - "url": "http://127.0.0.1:9123", - "labels": { - "instance": "es-abcd" - }, - "version": "1.70.1", - "user": "fugiat Duis minim", - "password": "exercitation cillum velit" + "name" : "ex-exporter-example", + "kind" : "es-exporter", + "spec" : { + "instanceSpec" : { + "user" : "root", + "password" : "Password@123" + "url" : "http://127.0.0.1:8080", + "labels" : { + "labelKey" : "labelValue" + } }, - "exporterSpec": { - "all": true, - "indicesSettings": false, - "snapshots": false, - "indices": true, - "shards": false + "exporterSpec" : { + "all" : true, + "indices" : true, + "indicesSettings" : true, + "shards" : true, + "snapshots" : true, + "clusterSettings" : true } } }) @@ -53,36 +53,36 @@ Integration Center: CVM Scrape Job ``` resource "tencentcloud_vpc" "vpc" { - name = "tf-eks-vpc" + name = "vpc" cidr_block = "10.2.0.0/16" } -resource "tencentcloud_subnet" "sub" { +resource "tencentcloud_subnet" "subnet" { vpc_id = tencentcloud_vpc.vpc.id - name = "tf-as-subnet" + name = "subnet" cidr_block = "10.2.11.0/24" - availability_zone = "ap-guangzhou-3" + availability_zone = "ap-guangzhou-6" } -resource "tencentcloud_monitor_tmp_instance" "tmpInstance" { - instance_name = "tf-test-tmp" +resource "tencentcloud_monitor_tmp_instance" "example" { + instance_name = "tf-example" vpc_id = tencentcloud_vpc.vpc.id - subnet_id = tencentcloud_subnet.sub.id + subnet_id = tencentcloud_subnet.subnet.id data_retention_time = 15 - zone = "ap-guangzhou-3" + zone = "ap-guangzhou-6" tags = { - "createdBy" = "terraform" + createdBy = "Terraform" } } # Integration Center: CVM Scrape Job -resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" { - instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id +resource "tencentcloud_monitor_tmp_exporter_integration" "example" { + instance_id = tencentcloud_monitor_tmp_instance.example.id kind = "cvm-http-sd-exporter" - content = jsonencode({ - "kind": "cvm-http-sd-exporter", - "spec": { - "job": <<-EOT + content = jsonencode({ + "kind" : "cvm-http-sd-exporter", + "spec" : { + "job" : <<-EOT job_name: example-cvm-job-name metrics_path: /metrics cvm_sd_configs: @@ -106,7 +106,7 @@ resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration EOT } }) - kube_type = 3 - cluster_id = "" + cluster_id = "" + kube_type = 3 } ``` \ No newline at end of file diff --git a/website/docs/r/monitor_tmp_exporter_integration.html.markdown b/website/docs/r/monitor_tmp_exporter_integration.html.markdown index 9ac11263dd..2c5bd57a4a 100644 --- a/website/docs/r/monitor_tmp_exporter_integration.html.markdown +++ b/website/docs/r/monitor_tmp_exporter_integration.html.markdown @@ -15,43 +15,43 @@ Provides a resource to create a monitor tmpExporterIntegration ## Example Usage -### Use blackbox-exporter +### Use qcloud-exporter ```hcl -resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" { - instance_id = "prom-dko9d0nu" - kind = "blackbox-exporter" - content = "{\"name\":\"test\",\"kind\":\"blackbox-exporter\",\"spec\":{\"instanceSpec\":{\"module\":\"http_get\",\"urls\":[\"xx\"]}}}" - kube_type = 1 - cluster_id = "cls-bmuaukfu" +resource "tencentcloud_monitor_tmp_exporter_integration" "example" { + instance_id = "prom-gzg3f1em" + kind = "qcloud-exporter" + 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\":{}}" + cluster_id = "cls-csxm4phu" + kube_type = 3 } ``` ### Use es-exporter ```hcl -resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegrationEs" { - instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id +resource "tencentcloud_monitor_tmp_exporter_integration" "example" { + instance_id = "prom-gzg3f1em" kind = "es-exporter" content = jsonencode({ "name" : "ex-exporter-example", "kind" : "es-exporter", "spec" : { "instanceSpec" : { - "url" : "http://127.0.0.1:9123", + "user" : "root", + "password" : "Password@123" + "url" : "http://127.0.0.1:8080", "labels" : { - "instance" : "es-abcd" - }, - "version" : "1.70.1", - "user" : "fugiat Duis minim", - "password" : "exercitation cillum velit" + "labelKey" : "labelValue" + } }, "exporterSpec" : { "all" : true, - "indicesSettings" : false, - "snapshots" : false, "indices" : true, - "shards" : false + "indicesSettings" : true, + "shards" : true, + "snapshots" : true, + "clusterSettings" : true } } }) @@ -64,31 +64,31 @@ resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration ```hcl resource "tencentcloud_vpc" "vpc" { - name = "tf-eks-vpc" + name = "vpc" cidr_block = "10.2.0.0/16" } -resource "tencentcloud_subnet" "sub" { +resource "tencentcloud_subnet" "subnet" { vpc_id = tencentcloud_vpc.vpc.id - name = "tf-as-subnet" + name = "subnet" cidr_block = "10.2.11.0/24" - availability_zone = "ap-guangzhou-3" + availability_zone = "ap-guangzhou-6" } -resource "tencentcloud_monitor_tmp_instance" "tmpInstance" { - instance_name = "tf-test-tmp" +resource "tencentcloud_monitor_tmp_instance" "example" { + instance_name = "tf-example" vpc_id = tencentcloud_vpc.vpc.id - subnet_id = tencentcloud_subnet.sub.id + subnet_id = tencentcloud_subnet.subnet.id data_retention_time = 15 - zone = "ap-guangzhou-3" + zone = "ap-guangzhou-6" tags = { - "createdBy" = "terraform" + createdBy = "Terraform" } } # Integration Center: CVM Scrape Job -resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration" { - instance_id = tencentcloud_monitor_tmp_instance.tmpInstance.id +resource "tencentcloud_monitor_tmp_exporter_integration" "example" { + instance_id = tencentcloud_monitor_tmp_instance.example.id kind = "cvm-http-sd-exporter" content = jsonencode({ "kind" : "cvm-http-sd-exporter", @@ -117,8 +117,8 @@ resource "tencentcloud_monitor_tmp_exporter_integration" "tmpExporterIntegration EOT } }) - kube_type = 3 cluster_id = "" + kube_type = 3 } ``` From ccca076aa934d4a44f92dcae95287c9e17e378af Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Wed, 22 Jan 2025 17:01:01 +0800 Subject: [PATCH 2/2] add --- .changelog/3100.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3100.txt diff --git a/.changelog/3100.txt b/.changelog/3100.txt new file mode 100644 index 0000000000..61ff88df3a --- /dev/null +++ b/.changelog/3100.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_monitor_tmp_exporter_integration: update SDK information +```