Skip to content

Commit 81c6fb0

Browse files
susu9527xiaozhu36
susu9527
authored and
xiaozhu36
committed
Improves the module example
1 parent bed395a commit 81c6fb0

File tree

4 files changed

+85
-79
lines changed

4 files changed

+85
-79
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
## 1.4.0 (Unreleased)
1+
## 1.5.0 (Unreleased)
2+
3+
## 1.4.0 (July 26, 2023)
4+
5+
IMPROVEMENTS:
6+
7+
- Improves the module example [GH-18](https://github.com/terraform-alicloud-modules/terraform-alicloud-redis/pull/18)
8+
29
## 1.3.0 (November 15, 2021)
310

411
IMPROVEMENTS:

‎examples/using-submodule-complete-redis-4.0/main.tf

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,29 @@ variable "region" {
44
provider "alicloud" {
55
region = var.region
66
}
7-
data "alicloud_vpcs" "default" {
8-
is_default = true
7+
8+
resource "random_uuid" "default" {
9+
}
10+
locals {
11+
name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
912
}
13+
1014
data "alicloud_zones" "default" {
1115
available_resource_creation = "KVStore"
12-
multi = true
13-
enable_details = true
1416
}
15-
resource "alicloud_vswitch" "this" {
16-
name = "redis_vpc"
17-
availability_zone = data.alicloud_zones.default.zones.0.multi_zone_ids.0
18-
vpc_id = data.alicloud_vpcs.default.vpcs.0.id
19-
cidr_block = cidrsubnet(data.alicloud_vpcs.default.vpcs.0.cidr_block, 4, 10)
17+
18+
resource "alicloud_vpc" "default" {
19+
vpc_name = local.name
20+
cidr_block = "10.4.0.0/16"
2021
}
22+
23+
resource "alicloud_vswitch" "default" {
24+
vswitch_name = local.name
25+
cidr_block = "10.4.0.0/24"
26+
vpc_id = alicloud_vpc.default.id
27+
zone_id = data.alicloud_zones.default.zones.0.id
28+
}
29+
2130
module "redis_example" {
2231
source = "../../modules/redis-4.0-enterprise-cluster-hybrid-storage"
2332
region = var.region
@@ -26,11 +35,11 @@ module "redis_example" {
2635
# Redis Instance
2736
#################
2837

29-
instance_name = "myInstance"
38+
instance_name = local.name
3039
instance_class = "redis.logic.sharding.2g.8db.0rodb.8proxy.default"
3140
period = 1
32-
availability_zone = data.alicloud_zones.default.zones.0.multi_zone_ids.0
33-
vswitch_id = alicloud_vswitch.this.id
41+
availability_zone = data.alicloud_zones.default.zones.0.id
42+
vswitch_id = alicloud_vswitch.default.id
3443
security_ips = ["1.1.1.1", "2.2.2.2", "3.3.3.3"]
3544
tags = {
3645
Env = "Private"

‎examples/using-submodule-complete-redis-5.0/main.tf

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,28 @@ variable "region" {
44
provider "alicloud" {
55
region = var.region
66
}
7-
data "alicloud_vpcs" "default" {
8-
is_default = true
7+
resource "random_uuid" "default" {
98
}
9+
locals {
10+
name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
11+
}
12+
1013
data "alicloud_zones" "default" {
1114
available_resource_creation = "KVStore"
12-
multi = true
13-
enable_details = true
1415
}
15-
resource "alicloud_vswitch" "this" {
16-
name = "redis_vpc"
17-
availability_zone = data.alicloud_zones.default.zones.0.multi_zone_ids.0
18-
vpc_id = data.alicloud_vpcs.default.vpcs.0.id
19-
cidr_block = cidrsubnet(data.alicloud_vpcs.default.vpcs.0.cidr_block, 4, 2)
16+
17+
resource "alicloud_vpc" "default" {
18+
vpc_name = local.name
19+
cidr_block = "10.4.0.0/16"
20+
}
21+
22+
resource "alicloud_vswitch" "default" {
23+
vswitch_name = local.name
24+
cidr_block = "10.4.0.0/24"
25+
vpc_id = alicloud_vpc.default.id
26+
zone_id = data.alicloud_zones.default.zones.0.id
2027
}
28+
2129
module "redis_example" {
2230
source = "../../modules/redis-5.0-communtity-cluster"
2331
region = var.region
@@ -26,11 +34,11 @@ module "redis_example" {
2634
# Redis Instance
2735
#################
2836

29-
instance_name = "myInstance"
37+
instance_name = local.name
3038
instance_class = "redis.master.mid.default"
3139
period = 1
32-
availability_zone = data.alicloud_zones.default.zones.0.multi_zone_ids.0
33-
vswitch_id = alicloud_vswitch.this.id
40+
availability_zone = data.alicloud_zones.default.zones.0.id
41+
vswitch_id = alicloud_vswitch.default.id
3442
security_ips = ["1.1.1.1", "2.2.2.2", "3.3.3.3"]
3543
tags = {
3644
Env = "Private"

‎main.tf

Lines changed: 36 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,12 @@ module "accounts" {
4444
}
4545

4646
resource "alicloud_cms_alarm" "sharding_cpu_usage" {
47-
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
48-
enabled = var.enable_alarm_rule
49-
name = var.alarm_rule_name
50-
project = local.project
51-
metric = "ShardingCpuUsage"
52-
dimensions = {
53-
instanceId = local.this_instance_id
54-
device = "/dev/vda1,/dev/vdb1"
55-
}
47+
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
48+
enabled = var.enable_alarm_rule
49+
name = var.alarm_rule_name
50+
project = local.project
51+
metric = "ShardingCpuUsage"
52+
metric_dimensions = "[{\"instanceId\":\"${local.this_instance_id}\",\"device\":\"/dev/vda1\"}]"
5653
escalations_critical {
5754
statistics = var.alarm_rule_statistics
5855
comparison_operator = var.alarm_rule_operator
@@ -66,15 +63,12 @@ resource "alicloud_cms_alarm" "sharding_cpu_usage" {
6663
}
6764

6865
resource "alicloud_cms_alarm" "sharding_connection_usage" {
69-
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
70-
enabled = var.enable_alarm_rule
71-
name = var.alarm_rule_name
72-
project = local.project
73-
metric = "ShardingConnectionUsage"
74-
dimensions = {
75-
instanceId = local.this_instance_id
76-
device = "/dev/vda1,/dev/vdb1"
77-
}
66+
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
67+
enabled = var.enable_alarm_rule
68+
name = var.alarm_rule_name
69+
project = local.project
70+
metric = "ShardingConnectionUsage"
71+
metric_dimensions = "[{\"instanceId\":\"${local.this_instance_id}\",\"device\":\"/dev/vda1\"}]"
7872
escalations_critical {
7973
statistics = var.alarm_rule_statistics
8074
comparison_operator = var.alarm_rule_operator
@@ -88,15 +82,12 @@ resource "alicloud_cms_alarm" "sharding_connection_usage" {
8882
}
8983

9084
resource "alicloud_cms_alarm" "sharding_max_rt" {
91-
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
92-
enabled = var.enable_alarm_rule
93-
name = var.alarm_rule_name
94-
project = local.project
95-
metric = "ShardingMaxRt"
96-
dimensions = {
97-
instanceId = local.this_instance_id
98-
device = "/dev/vda1,/dev/vdb1"
99-
}
85+
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
86+
enabled = var.enable_alarm_rule
87+
name = var.alarm_rule_name
88+
project = local.project
89+
metric = "ShardingMaxRt"
90+
metric_dimensions = "[{\"instanceId\":\"${local.this_instance_id}\",\"device\":\"/dev/vda1\"}]"
10091
escalations_critical {
10192
statistics = var.alarm_rule_statistics
10293
comparison_operator = var.alarm_rule_operator
@@ -110,15 +101,12 @@ resource "alicloud_cms_alarm" "sharding_max_rt" {
110101
}
111102

112103
resource "alicloud_cms_alarm" "sharding_memory_usage" {
113-
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
114-
enabled = var.enable_alarm_rule
115-
name = var.alarm_rule_name
116-
project = local.project
117-
metric = "ShardingMemoryUsage"
118-
dimensions = {
119-
instanceId = local.this_instance_id
120-
device = "/dev/vda1,/dev/vdb1"
121-
}
104+
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
105+
enabled = var.enable_alarm_rule
106+
name = var.alarm_rule_name
107+
project = local.project
108+
metric = "ShardingMemoryUsage"
109+
metric_dimensions = "[{\"instanceId\":\"${local.this_instance_id}\",\"device\":\"/dev/vda1\"}]"
122110
escalations_critical {
123111
statistics = var.alarm_rule_statistics
124112
comparison_operator = var.alarm_rule_operator
@@ -132,15 +120,12 @@ resource "alicloud_cms_alarm" "sharding_memory_usage" {
132120
}
133121

134122
resource "alicloud_cms_alarm" "sharding_used_connection" {
135-
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
136-
enabled = var.enable_alarm_rule
137-
name = var.alarm_rule_name
138-
project = local.project
139-
metric = "ShardingUsedConnection"
140-
dimensions = {
141-
instanceId = local.this_instance_id
142-
device = "/dev/vda1,/dev/vdb1"
143-
}
123+
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
124+
enabled = var.enable_alarm_rule
125+
name = var.alarm_rule_name
126+
project = local.project
127+
metric = "ShardingUsedConnection"
128+
metric_dimensions = "[{\"instanceId\":\"${local.this_instance_id}\",\"device\":\"/dev/vda1\"}]"
144129
escalations_critical {
145130
statistics = var.alarm_rule_statistics
146131
comparison_operator = var.alarm_rule_operator
@@ -154,15 +139,12 @@ resource "alicloud_cms_alarm" "sharding_used_connection" {
154139
}
155140

156141
resource "alicloud_cms_alarm" "sharding_used_memory" {
157-
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
158-
enabled = var.enable_alarm_rule
159-
name = var.alarm_rule_name
160-
project = local.project
161-
metric = "ShardingUsedMemory"
162-
dimensions = {
163-
instanceId = local.this_instance_id
164-
device = "/dev/vda1,/dev/vdb1"
165-
}
142+
count = local.create_more_resources && var.enable_alarm_rule ? 1 : 0
143+
enabled = var.enable_alarm_rule
144+
name = var.alarm_rule_name
145+
project = local.project
146+
metric = "ShardingUsedMemory"
147+
metric_dimensions = "[{\"instanceId\":\"${local.this_instance_id}\",\"device\":\"/dev/vda1\"}]"
166148
escalations_critical {
167149
statistics = var.alarm_rule_statistics
168150
comparison_operator = var.alarm_rule_operator

0 commit comments

Comments
 (0)