Skip to content

fix tencentcloud_monitor_alarm_policy bug and modify docs #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2021
Merged

fix tencentcloud_monitor_alarm_policy bug and modify docs #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tencentcloud/resource_tc_ckafka_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
Use this resource to create ckafka instance.

~> **NOTE:** It only support create profession ckafka instance.

Example Usage

```hcl
Expand All @@ -10,7 +12,12 @@ resource "tencentcloud_ckafka_instance" "foo" {
period = 1
vpc_id = "vpc-boi1ah65"
subnet_id = "subnet-7ros461e"
msg_retention_time = 1440
msg_retention_time = 1300
renew_flag = 0
kafka_version = "1.1.1"
disk_size = 500
disk_type = "CLOUD_BASIC"


config {
auto_create_topic_enable = true
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_clb_customized_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Example Usage

```hcl
resource "tencentcloud_clb_customized_config" "foo" {
config_content = "client_max_body_size 224M;"
config_content = "client_max_body_size 224M;\r\nclient_body_timeout 60s;"
config_name = "helloWorld"
load_balancer_ids = [
"${tencentcloud_clb_instance.internal_clb.id}",
Expand Down
40 changes: 24 additions & 16 deletions tencentcloud/resource_tc_monitor_alarm_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,14 +433,16 @@ func resourceTencentMonitorAlarmPolicyCreate(d *schema.ResourceData, meta interf
if m["is_power_notice"] != nil {
alarmPolicyRule.IsPowerNotice = helper.IntInt64(m["is_power_notice"].(int))
}
if m["filter"] != nil {
filters := m["filter"].([]interface{})
filter := filters[0].(map[string]interface{})
alarmPolicyFilter := monitor.AlarmPolicyFilter{
Type: helper.String(filter["type"].(string)),
Dimensions: helper.String(filter["dimensions"].(string)),
if v, ok := m["filter"]; ok {
filters := v.([]interface{})
if len(filters) > 0 {
filter := filters[0].(map[string]interface{})
alarmPolicyFilter := monitor.AlarmPolicyFilter{
Type: helper.String(filter["type"].(string)),
Dimensions: helper.String(filter["dimensions"].(string)),
}
alarmPolicyRule.Filter = &alarmPolicyFilter
}
alarmPolicyRule.Filter = &alarmPolicyFilter
}

if m["description"] != nil {
Expand Down Expand Up @@ -486,12 +488,14 @@ func resourceTencentMonitorAlarmPolicyCreate(d *schema.ResourceData, meta interf
}
if m["filter"] != nil {
filters := m["filter"].([]interface{})
filter := filters[0].(map[string]interface{})
alarmPolicyFilter := monitor.AlarmPolicyFilter{
Type: helper.String(filter["type"].(string)),
Dimensions: helper.String(filter["dimensions"].(string)),
if len(filters) > 0 {
filter := filters[0].(map[string]interface{})
alarmPolicyFilter := monitor.AlarmPolicyFilter{
Type: helper.String(filter["type"].(string)),
Dimensions: helper.String(filter["dimensions"].(string)),
}
alarmPolicyRule.Filter = &alarmPolicyFilter
}
alarmPolicyRule.Filter = &alarmPolicyFilter
}
if m["description"] != nil {
alarmPolicyRule.Description = helper.String(m["description"].(string))
Expand Down Expand Up @@ -610,14 +614,16 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
"unit": rule.Unit,
"rule_type": rule.RuleType,
}
if rule.Filter != nil {
if *rule.Filter.Type != "" || *rule.Filter.Dimensions != "" {
var filter = make([]interface{}, 0, 10)
alarmPolicyFilter := map[string]interface{}{
"type": rule.Filter.Type,
"dimensions": rule.Filter.Dimensions,
}
filter = append(filter, alarmPolicyFilter)
m["filter"] = filter
if len(filter) > 0 {
m["filter"] = filter
}
}

rules = append(rules, m)
Expand Down Expand Up @@ -651,14 +657,16 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
m["unit"] = eventRule.Unit
m["rule_type"] = eventRule.RuleType

if eventRule.Filter != nil {
if *eventRule.Filter.Type != "" || *eventRule.Filter.Dimensions != "" {
var filter = make([]interface{}, 0, 10)
alarmPolicyFilter := map[string]interface{}{
"type": eventRule.Filter.Type,
"dimensions": eventRule.Filter.Dimensions,
}
filter = append(filter, alarmPolicyFilter)
m["filter"] = filter
if len(filter) > 0 {
m["filter"] = filter
}
}
eventConditions = append(eventConditions, m)
}
Expand Down
8 changes: 7 additions & 1 deletion website/docs/r/ckafka_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ description: |-

Use this resource to create ckafka instance.

~> **NOTE:** It only support create profession ckafka instance.

## Example Usage

```hcl
Expand All @@ -20,7 +22,11 @@ resource "tencentcloud_ckafka_instance" "foo" {
period = 1
vpc_id = "vpc-boi1ah65"
subnet_id = "subnet-7ros461e"
msg_retention_time = 1440
msg_retention_time = 1300
renew_flag = 0
kafka_version = "1.1.1"
disk_size = 500
disk_type = "CLOUD_BASIC"

config {
auto_create_topic_enable = true
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/clb_customized_config.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Provides a resource to create a CLB customized config.

```hcl
resource "tencentcloud_clb_customized_config" "foo" {
config_content = "client_max_body_size 224M;"
config_content = "client_max_body_size 224M;\r\nclient_body_timeout 60s;"
config_name = "helloWorld"
load_balancer_ids = [
"${tencentcloud_clb_instance.internal_clb.id}",
Expand Down