Skip to content

Commit 3598d0b

Browse files
authored
Documentation: Update information about LavinMQ (#334)
### WHY are these changes introduced? Keep up with newer information regarding LavinMQ subscription and information affecting resources. ### WHAT is this pull request doing? - Updates the list of subscription plans - Updates HCL examples to use LavinMQ subscription plan. - Updates wording in text
1 parent 2348ff0 commit 3598d0b

14 files changed

+224
-128
lines changed

docs/guides/info_managed_vpc.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,18 @@ Create multiple instances and add them to the managed VPC.
2929
```hcl
3030
resource "cloudamqp_instance" "instance_01" {
3131
name = "terraform-cloudamqp-instance-01"
32-
plan = "squirrel-1"
32+
plan = "penguin-1"
3333
region = "amazon-web-services::us-west-1"
3434
tags = ["terraform"]
35-
rmq_version = "3.9.14"
3635
vpc_id = cloudamqp_vpc.vpc.id
3736
keep_associated_vpc = true
3837
}
3938
4039
resource "cloudamqp_instance" "instance_02" {
4140
name = "terraform-cloudamqp-instance-02"
42-
plan = "squirrel-1"
41+
plan = "penguin-1"
4342
region = "amazon-web-services::us-west-1"
4443
tags = ["terraform"]
45-
rmq_version = "3.9.14"
4644
vpc_id = cloudamqp_vpc.vpc.id
4745
keep_associated_vpc = true
4846
}
@@ -61,10 +59,9 @@ standalone VPC.
6159
# Dedicated instance with vpc_subnet also creates VPC
6260
resource "cloudamqp_instance" "instance_01" {
6361
name = "terraform-cloudamqp-instance-01"
64-
plan = "squirrel-1"
62+
plan = "penguin-1"
6563
region = "amazon-web-services::us-west-1"
6664
tags = ["terraform"]
67-
rmq_version = "3.9.14"
6865
vpc_subnet = "10.56.72.0/24"
6966
}
7067
```
@@ -89,7 +86,7 @@ Or with Terraform CLI:
8986

9087
`terraform import cloudamqp_vpc.vpc <vpc_id>`
9188

92-
Add then correct info for the imported standalone VPC.
89+
Add the correct information for the imported standalone VPC.
9390

9491
```hcl
9592
# Imported standalone VPC as a managed VPC
@@ -107,10 +104,9 @@ resource "cloudamqp_vpc" "vpc" {
107104
# Add vpc_id attribute
108105
resource "cloudamqp_instance" "instance_01" {
109106
name = "terraform-cloudamqp-instance-01"
110-
plan = "squirrel-1"
107+
plan = "penguin-1"
111108
region = "amazon-web-services::us-west-1"
112109
tags = ["terraform"]
113-
rmq_version = "3.9.14"
114110
vpc_subnet = "10.56.72.0/24"
115111
vpc_id = cloudamqp_vpc.vpc.id
116112
}
@@ -126,10 +122,9 @@ are added).
126122
```hcl
127123
resource "cloudamqp_instance" "instance_01" {
128124
name = "terraform-cloudamqp-instance-01"
129-
plan = "squirrel-1"
125+
plan = "penguin-1"
130126
region = "amazon-web-services::us-west-1"
131127
tags = ["terraform"]
132-
rmq_version = "3.9.14"
133128
vpc_subnet = "10.56.72.0/24"
134129
vpc_id = cloudamqp_vpc.vpc.id
135130
keep_associated_vpc = true

docs/guides/info_plan.md

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,67 +8,76 @@ description: |-
88

99
# Subscription plans
1010

11-
Tables below shows general subscription plans for CloudAMQP for either [**RabbitMQ**] or
12-
[**LavinMQ**]. For full price list see [CloudAMQP plans].
11+
Tables below shows general subscription plans for CloudAMQP for either [**LavinMQ**] or
12+
[**RabbitMQ**]. For full price list see [CloudAMQP plans].
1313

1414
-> Information can differ from your actually valid plans, e.g. your team have been given preview
1515
access to unreleased plans. To retrieve an up to date list check out [CloudAMQP API plans].
1616

17-
## Plans using RabbitMQ
17+
## Plans using LavinMQ
1818

19-
`Lemur` and `Tiger` are shared instances and share underlying hardware with other instances. They
19+
All plans running LavinMQ backend.
20+
21+
`Lemming`and `Ermine` are shared instances and share underlying hardware with other instances. They
2022
are also limited to which CloudAMQP provider resources that can be used. Further information on
2123
availability on each resource page.
2224

23-
Name | Plan | Backend | Type | Nodes
24-
---- | ---- | ---- | ---- | ----
25-
Little lemur | lemur | rabbitmq | shared | -
26-
Tough Tiger | tiger | rabbitmq | shared | -
27-
Sassy Squirrel | squirrel-1 | rabbitmq | dedicated | 1
28-
Big Bunny | bunny-1,3 | rabbitmq | dedicated | 1,3
29-
Happy Hare | hare-1,3 | rabbitmq | dedicated | 1,3
30-
Roaring Rabbit | rabbit-1,3,5 | rabbitmq | dedicated | 1,3,5
31-
Power Panda | panda-1,3,5 | rabbitmq | dedicated | 1,3,5
32-
Awesome Ape | ape-1,3,5 | rabbitmq | dedicated | 1,3,5
33-
Heavy Hippo | hippo-1,3,5 | rabbitmq | dedicated | 1,3,5
34-
Loud Lion | lion-1,3,5 | rabbitmq | dedicated | 1,3,5
35-
Raging Rhino | rhino-1 | rabbitmq | dedicated | 1
25+
-> With LavinMQ 2.0 version, [clustering] is supported to ensure high availability.
3626

37-
## Plans using LavinMQ
27+
Name | Plan | Type | Nodes
28+
--------------------|----------------|-----------|------
29+
Loyal Lemming | lemming | shared | -
30+
Elegant Ermine | ermine | shared | -
31+
Passionate Puffin | puffin-1,3,5 | dedicated | 1,3,5
32+
Playful Penguin | penguin-1,3,5 | dedicated | 1,3,5
33+
Lively Lynx | lynx-1,3,5 | dedicated | 1,3,5
34+
Wild Wolverin | wolverin-1,3,5 | dedicated | 1,3,5
35+
Remarkable Reindeer | reindeer-1,3,5 | dedicated | 1,3,5
36+
Brave Bear | bear-1,3,5 | dedicated | 1,3,5
37+
Outstanding Orca | orca-1,3,5 | dedicated | 1,3,5
3838

39-
`Lemming`and `Ermine` are shared instances and share underlying hardware with other instances.
40-
They are also limited to which CloudAMQP provider resources that can be used. Further information on
39+
## Plans using RabbitMQ
40+
41+
All plans running RabbitMQ backend.
42+
43+
`Lemur` and `Tiger` are shared instances and share underlying hardware with other instances. They
44+
are also limited to which CloudAMQP provider resources that can be used. Further information on
4145
availability on each resource page.
4246

43-
Name | Plan | Backend | Type | Nodes
44-
---- | ---- | ---- | ---- | ----
45-
Loyal Lemming | lemming | lavinmq | shared | -
46-
Elegant Ermine | ermine | lavinmq | shared | -
47-
Passionate Puffin | puffin-1 | lavinmq | dedicated | 1
48-
Playful Penguin | penguin-1 | lavinmq | dedicated | 1
49-
Lively Lynx | lynx-1 | lavinmq | dedicated | 1
50-
Wild Wolverine | wolverine-1 | lavinmq | dedicated | 1
51-
Remarkable Reindeer | reindeer-1 | lavinmq | dedicated | 1
52-
Brave Bear | bear-1 | lavinmq | dedicated | 1
53-
Outstanding Orca | orca-1 | lavinmq | dedicated | 1
47+
Name | Plan | Type | Nodes
48+
----------------|---------------|-----------|------
49+
Little lemur | lemur | shared | -
50+
Tough Tiger | tiger | shared | -
51+
Sassy Squirrel | squirrel-1 | dedicated | 1
52+
Big Bunny | bunny-1,3 | dedicated | 1,3
53+
Happy Hare | hare-1,3 | dedicated | 1,3
54+
Roaring Rabbit | rabbit-1,3,5 | dedicated | 1,3,5
55+
Power Panda | panda-1,3,5 | dedicated | 1,3,5
56+
Awesome Ape | ape-1,3,5 | dedicated | 1,3,5
57+
Heavy Hippo | hippo-1,3,5 | dedicated | 1,3,5
58+
Loud Lion | lion-1,3,5 | dedicated | 1,3,5
59+
Raging Rhino | rhino-1 | dedicated | 1
5460

5561
## Legacy subscription plans
5662

63+
All plans running RabbitMQ backend.
64+
5765
Table below shows deprecated subscription plans for CloudAMQP. Existing plans will still work, but
5866
there will not be possible to create new ones.
5967

60-
Name | Plan | Backend | Type
61-
---- | ---- | ---- | ----
62-
Little lemur | lemur | rabbitmq | shared
63-
Tough Tiger | tiger | rabbitmq | shared
64-
Big Bunny | bunny | rabbitmq | dedicated
65-
Roaring Rabbit | rabbit | rabbitmq | dedicated
66-
Power Panda | panda | rabbitmq | dedicated
67-
Awesome Ape | ape | rabbitmq | dedicated
68-
Heavy Hippo | hippo | rabbitmq | dedicated
69-
Loud Lion | lion | rabbitmq | dedicated
68+
Name | Plan | Type
69+
----------------|---------| ----
70+
Little lemur | lemur | shared
71+
Tough Tiger | tiger | shared
72+
Big Bunny | bunny | dedicated
73+
Roaring Rabbit | rabbit | dedicated
74+
Power Panda | panda | dedicated
75+
Awesome Ape | ape | dedicated
76+
Heavy Hippo | hippo | dedicated
77+
Loud Lion | lion | dedicated
7078

7179
[CloudAMQP API plans]: https://docs.cloudamqp.com/#plans
7280
[CloudAMQP plans]: https://www.cloudamqp.com/plans.html
81+
[clustering]: https://lavinmq.com/documentation/clustering
7382
[**LavinMQ**]: https://lavinmq.com/
7483
[**RabbitMQ**]: https://www.rabbitmq.com/

docs/index.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ description: |-
1010
The CloudAMQP provider is used to interact with CloudAMQP organization resources.
1111

1212
The provider allows you to manage your CloudAMQP instances and features. Create, configure and
13-
deploy [**RabbitMQ**](https://www.rabbitmq.com/) or [**LavinMQ**](https://lavinmq.com/) to different
14-
cloud platforms. The provider needs to be configured with the proper API key before it can be used.
13+
deploy [**LavinMQ**] or [**RabbitMQ**] to different cloud platforms. The provider needs to be
14+
configured with the proper API key before it can be used.
1515

1616
Use the navigation to the left to read about the available resources.
1717

@@ -29,7 +29,7 @@ provider "cloudamqp" {
2929
# Create a new cloudamqp instance
3030
resource "cloudamqp_instance" "instance" {
3131
name = "terraform-cloudamqp-instance"
32-
plan = "bunny-1"
32+
plan = "penguin-1"
3333
region = "amazon-web-services::us-west-1"
3434
tags = ["terraform"]
3535
}
@@ -62,15 +62,6 @@ resource "cloudamqp_security_firewall" "firewall" {
6262
}
6363
}
6464
65-
# Cloudwatch logs integration
66-
resource "cloudamqp_integration_log" "cloudwatchlog" {
67-
instance_id = cloudamqp_instance.instance.id
68-
name = "cloudwatchlog"
69-
access_key_id = var.aws_access_key
70-
secret_access_key = var.aws_secret_key
71-
region = var.aws_region
72-
}
73-
7465
# Cloudwatch metrics integration
7566
resource "cloudamqp_integration_metric" "cloudwatch" {
7667
instance_id = cloudamqp_instance.instance.id
@@ -111,4 +102,6 @@ ___
111102
More information can be found under `Enable faster instance destroy` section on respective resource.
112103

113104
[API Keys]: https://customer.cloudamqp.com/apikeys
105+
[**LavinMQ**]: https://lavinmq.com/
106+
[**RabbitMQ**]: https://www.rabbitmq.com/
114107
[v1.27.0]: https://github.com/cloudamqp/terraform-provider-cloudamqp/releases/tag/v1.27.0

docs/resources/custom_domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ current connections.
2020
Your custom domain name needs to point to your CloudAMQP hostname, preferably using a CNAME DNS
2121
record.
2222

23-
Only available for dedicated subscription plans.
23+
Only available for dedicated subscription plans running ***RabbitMQ***.
2424

2525
## Example Usage
2626

docs/resources/extra_disk_size.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ provider "cloudamqp" {
5252
# Instance
5353
resource "cloudamqp_instance" "instance" {
5454
name = "Instance"
55-
plan = "bunny-1"
55+
plan = "penguin-1"
5656
region = "amazon-web-services::us-west-2"
5757
}
5858
@@ -91,7 +91,7 @@ provider "cloudamqp" {
9191
# Instance
9292
resource "cloudamqp_instance" "instance" {
9393
name = "Instance"
94-
plan = "bunny-1"
94+
plan = "penguin-1"
9595
region = "amazon-web-services::us-west-2"
9696
}
9797
@@ -130,7 +130,7 @@ provider "cloudamqp" {
130130
# Instance
131131
resource "cloudamqp_instance" "instance" {
132132
name = "Instance"
133-
plan = "bunny-1"
133+
plan = "penguin-1"
134134
region = "google-compute-engine::us-central1"
135135
}
136136
@@ -169,7 +169,7 @@ provider "cloudamqp" {
169169
# Instance
170170
resource "cloudamqp_instance" "instance" {
171171
name = "Instance"
172-
plan = "bunny-1"
172+
plan = "penguin-1"
173173
region = "azure-arm::centralus"
174174
}
175175

0 commit comments

Comments
 (0)