Skip to content

Commit 48a7caf

Browse files
gitmkngitmkn
authored
feat(tmp): [121198931] support tmp multiple writes (#3036)
* feat: support tmp multiple writes * feat: add changelog * fix: modify read
1 parent fb9a8b3 commit 48a7caf

File tree

18 files changed

+4526
-3213
lines changed

18 files changed

+4526
-3213
lines changed

‎.changelog/3036.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
tencentcloud_monitor_tmp_multiple_writes
3+
```

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1034
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1046
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1060
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1066
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1053
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1058
@@ -67,7 +67,7 @@ require (
6767
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.777
6868
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.672
6969
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.949
70-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.844
70+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.1066
7171
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.853
7272
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization v1.0.1038
7373
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres v1.0.1010

‎go.sum‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -928,14 +928,19 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1045/go.mod
928928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1046/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1051/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1052/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1053 h1:Qrwvu384xBXaAl8Vv5qvOKwBNOL73x0iyjQ0MocSidI=
932+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1053/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
933+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1055/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1056 h1:bOSZ7cOXvBe8MCBqDBTtpyKIqx9q6woxqIPK5M9FhNY=
932935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1056/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
933-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1060 h1:0FEYKm73CROpZGfRWqyyhNkk5ndBUDqNNb5SP0BL5jg=
934-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1060/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
935936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1058 h1:VVv5rEFtGbxEB23V3gJO5pFHEXGlOh9duEWEtNm+w6c=
936937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1058/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1053 h1:Qrwvu384xBXaAl8Vv5qvOKwBNOL73x0iyjQ0MocSidI=
938-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1053/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
938+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1060 h1:0FEYKm73CROpZGfRWqyyhNkk5ndBUDqNNb5SP0BL5jg=
939+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1060/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
940+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1065 h1:krcqtAmexnHHBm/4ge4tr2b1cn/a7JGBESVGoZYXQAE=
941+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1065/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
942+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1066 h1:D55KWjZcHJrrZC92ObBJBeo+ZGwzdVWTduIqiD2RACo=
943+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1066/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
939944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
940945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
941946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -990,6 +995,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.949 h1:GZG
990995
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.949/go.mod h1:75i/x1XqkqqqOgEBj31PdpnSeehsscgI5aj6aNgcsXE=
991996
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.844 h1:ZR7FSnv4k1j0BpJHg6JDbJ6YJ2YfLhX2xVIUcuweKm4=
992997
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.844/go.mod h1:a7PfDWl0B3QV+g99asQHumDNScEEMl+7lkXP0KXt8Xg=
998+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.1065 h1:z+KJVs+KXOyQZDxYvOr3dggimaXDtjXVkNidyk5KVfA=
999+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.1065/go.mod h1:pvoEhkoTXN1y6MTKr8/YaEWyh1jT+9qy4QRfjXkr5mQ=
1000+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.1066 h1:NBQgNznZRuNQ7AEHPtjFRq588IFEIvClBVtHdR/Q7Wo=
1001+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.1066/go.mod h1:kgZ+YsYoqSplH7rlz1PwheZPZVU67tLpLXJDKLkM950=
9931002
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.853 h1:abGpWsAtEuF2QIYKm2m9/hv9OqyHwWNLsd5+67z86BE=
9941003
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.853/go.mod h1:xIprIT+IW+3Fj05GCWmgvxJOhICqFGoW4Ef77cDD2JQ=
9951004
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus v1.0.831 h1:oyazF5wgAgoinGo/SDGfUReE3JFxqcpI6/pstWhK7yE=

‎tencentcloud/connectivity/client.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ type TencentCloudClient struct {
225225
wafv20180125Conn *waf.Client
226226
camv20190116Conn *cam.Client
227227
clsv20201016Conn *cls.Client
228+
monitor20180724Conn *monitor.Client
228229
}
229230

230231
// NewClientProfile returns a new ClientProfile
@@ -2002,3 +2003,17 @@ func (me *TencentCloudClient) UseClsV20201016Client() *cls.Client {
20022003

20032004
return me.clsv20201016Conn
20042005
}
2006+
2007+
// UseMonitorV20180724Client returns MONITOR client for service
2008+
func (me *TencentCloudClient) UseMonitorV20180724Client() *monitor.Client {
2009+
if me.monitor20180724Conn != nil {
2010+
return me.monitor20180724Conn
2011+
}
2012+
2013+
cpf := me.NewClientProfile(300)
2014+
cpf.Language = "zh-CN"
2015+
me.monitor20180724Conn, _ = monitor.NewClient(me.Credential, me.Region, cpf)
2016+
me.monitor20180724Conn.WithHttpTransport(&LogRoundTripper{})
2017+
2018+
return me.monitor20180724Conn
2019+
}

‎tencentcloud/provider.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,6 +1487,7 @@ func Provider() *schema.Provider {
14871487
"tencentcloud_monitor_tmp_exporter_integration": tmp.ResourceTencentCloudMonitorTmpExporterIntegration(),
14881488
"tencentcloud_monitor_tmp_alert_rule": tmp.ResourceTencentCloudMonitorTmpAlertRule(),
14891489
"tencentcloud_monitor_tmp_recording_rule": tmp.ResourceTencentCloudMonitorTmpRecordingRule(),
1490+
"tencentcloud_monitor_tmp_multiple_writes": tmp.ResourceTencentCloudMonitorTmpMultipleWrites(),
14901491
"tencentcloud_monitor_tmp_alert_group": tmp.ResourceTencentCloudMonitorTmpAlertGroup(),
14911492
"tencentcloud_monitor_tmp_tke_template": tmp.ResourceTencentCloudMonitorTmpTkeTemplate(),
14921493
"tencentcloud_monitor_tmp_tke_template_attachment": tmp.ResourceTencentCloudMonitorTmpTkeTemplateAttachment(),

‎tencentcloud/provider.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,7 @@ Managed Service for Prometheus(TMP)
848848
tencentcloud_monitor_tmp_tke_cluster_agent
849849
tencentcloud_monitor_tmp_tke_basic_config
850850
tencentcloud_monitor_tmp_alert_group
851+
tencentcloud_monitor_tmp_multiple_writes
851852

852853
TencentCloud Managed Service for Grafana(TCMG)
853854
Data Source

‎tencentcloud/services/monitor/service_tencentcloud_monitor.go‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1515
cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
1616
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
17+
monitorv20180724 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
1718
"gopkg.in/yaml.v2"
1819

1920
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
@@ -2607,3 +2608,42 @@ func (me *MonitorService) DescribeMonitorTmpInstancesByFilter(ctx context.Contex
26072608

26082609
return
26092610
}
2611+
2612+
func (me *MonitorService) DescribeMonitorTmpMultipleWritesById(ctx context.Context, instanceId string, url string) (ret *monitorv20180724.DescribeRemoteURLsResponseParams, errRet error) {
2613+
logId := tccommon.GetLogId(ctx)
2614+
2615+
request := monitorv20180724.NewDescribeRemoteURLsRequest()
2616+
response := monitorv20180724.NewDescribeRemoteURLsResponse()
2617+
request.InstanceId = helper.String(instanceId)
2618+
request.RemoteURLs = []*string{helper.String(url)}
2619+
2620+
defer func() {
2621+
if errRet != nil {
2622+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
2623+
}
2624+
}()
2625+
2626+
ratelimit.Check(request.GetAction())
2627+
2628+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
2629+
result, e := me.client.UseMonitorV20180724Client().DescribeRemoteURLs(request)
2630+
if e != nil {
2631+
return tccommon.RetryError(e)
2632+
}
2633+
if result == nil {
2634+
e = fmt.Errorf("tmp `DescribeRemoteURLs` response not exists")
2635+
return resource.NonRetryableError(e)
2636+
}
2637+
2638+
response = result
2639+
return nil
2640+
})
2641+
if err != nil {
2642+
errRet = err
2643+
return
2644+
}
2645+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
2646+
2647+
ret = response.Response
2648+
return
2649+
}

0 commit comments

Comments
 (0)