Skip to content
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

Jump to bottom

Update supported ES plans #364

Merged
merged 6 commits into from
Mar 27, 2024
Merged

Update supported ES plans #364

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b7ddff3
update ES plan supported versions & descriptions
markdboyd Mar 27, 2024
1f7a907
remove extraneous plan tags
markdboyd Mar 27, 2024
5b23418
update plan descriptions
markdboyd Mar 27, 2024
ac652f5
make plan descriptions consistent
markdboyd Mar 27, 2024
6618391
change default version back to ES 7.10
markdboyd Mar 27, 2024
ca9d5cd
update plans
markdboyd Mar 27, 2024
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
149 changes: 69 additions & 80 deletions catalog-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,24 +1328,23 @@ elasticsearch:
broker: "AWS broker"
- id: "162ffae8-9cf8-4806-80e5-a7f92d514198"
name: "es-dev"
description: "AWS Elasticsearch 7.4 - Single node non-prod use only"
description: "Single small Elasticsearch/OpenSearch node, non-prod use only"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "single node"
- "non-prod"
- "Small"
- "Single node"
- "Non-prod"
costs:
- amount:
usd: 200.0
unit: "MONTHLY"
displayName: "non-prod single node elasticsearch 7.4"
displayName: "Small, single node, non-prod"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
dataCount: 1
instanceType: t3.small.search
volumeSize: 15
Expand All @@ -1363,23 +1362,22 @@ elasticsearch:
broker: "AWS broker"
- id: "55b529cf-639e-4673-94fd-ad0a5dafe0ad"
name: "es-medium"
description: "AWS Elasticsearch 7.4 - 3 node master with 2 data nodes"
description: "Medium Elasticsearch/OpenSearch - 3 master nodes with 2 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "Medium"
- "2 data nodes"
costs:
- amount:
usd: 1000.0
unit: "MONTHLY"
displayName: "es cluster 3 master 2 data based on elasticsearch 7.4"
displayName: "Medium, 3 master nodes, 2 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 2
instanceType: c5.large.search
Expand All @@ -1401,23 +1399,22 @@ elasticsearch:
broker: "AWS broker"
- id: "95b528cf-743e-2996-32yt-mc0a5vnf87cg"
name: "es-medium-ha"
description: "AWS Elasticsearch 7.4 - 3 node master with 4 data nodes"
description: "Medium Elasticsearch/OpenSearch - 3 master nodes with 4 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "Medium"
- "4 data nodes"
costs:
- amount:
usd: 1400.0
unit: "MONTHLY"
displayName: "es cluster 3 master 4 data based on elasticsearch 7.4"
displayName: "Medium, 3 master nodes, 4 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 4
instanceType: c5.large.search
Expand All @@ -1439,23 +1436,22 @@ elasticsearch:
broker: "AWS broker"
- id: "4c9529cf-93be-4873-94fd-ad0a5daf9ty1"
name: "es-large"
description: "AWS Large Elasticsearch 7.4 - 3 node master with 2 data nodes"
description: "Large Elasticsearch/OpenSearch - 3 master nodes with 2 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "Large"
- "2 data nodes"
costs:
- amount:
usd: 2000.0
unit: "MONTHLY"
displayName: "es large cluster 3 master 2 data based on elasticsearch 7.4"
displayName: "Large, 3 master nodes, 2 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "Opensearch_2.3"
- "Opensearch_1.3"
- "Elasticsearch_7.4"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 2
instanceType: c5.xlarge.search
Expand All @@ -1477,23 +1473,22 @@ elasticsearch:
broker: "AWS broker"
- id: "2dd3528cf-9gc2-2996-32yt-mc0a5vnfee56"
name: "es-large-ha"
description: "AWS Large Elasticsearch 7.4 - 3 node master with 4 data nodes"
description: "Large Elasticsearch/OpenSearch - 3 master nodes with 4 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "Large"
- "4 data nodes"
costs:
- amount:
usd: 2800.0
unit: "MONTHLY"
displayName: "es large cluster 3 master 4 data based on elasticsearch 7.4"
displayName: "Large, 3 master nodes, 4 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 4
instanceType: c5.xlarge.search
Expand All @@ -1515,23 +1510,22 @@ elasticsearch:
broker: "AWS broker"
- id: "31d9abdc-424b-4e75-a43f-a09cd64216e9"
name: "es-xlarge"
description: "AWS X-Large Elasticsearch 7.4 - 3 node master with 2 data nodes"
description: "Large Elasticsearch/OpenSearch - 3 master nodes with 2 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "X-Large"
- "2 data nodes"
costs:
- amount:
usd: 3000.0
unit: "MONTHLY"
displayName: "es xlarge cluster 3 master 2 data based on elasticsearch 7.4"
displayName: "X-Large, 3 master nodes, 2 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 2
instanceType: c5.2xlarge.search
Expand All @@ -1553,23 +1547,22 @@ elasticsearch:
broker: "AWS broker"
- id: "a40344fc-73ec-461d-952e-5601fec173b1"
name: "es-xlarge-ha"
description: "AWS X-Large Elasticsearch 7.4 - 3 node master with 4 data nodes"
description: "X-Large Elasticsearch/OpenSearch - 3 master nodes with 4 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "X-Large"
- "4 data nodes"
costs:
- amount:
usd: 4200.0
unit: "MONTHLY"
displayName: "es xlarge cluster 3 master 4 data based on elasticsearch 7.4"
displayName: "X-Large, 3 master nodes, 4 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 4
instanceType: c5.2xlarge.search
Expand All @@ -1591,23 +1584,22 @@ elasticsearch:
broker: "AWS broker"
- id: "4a286fc7-e6f5-4c73-9d4f-65d899354abd"
name: "es-2xlarge-gp"
description: "AWS 2X-Large General-Purpose Elasticsearch 7.4 - 3 node master with 2 data nodes"
description: "2X-Large General-Purpose Elasticsearch/OpenSearch - 3 master nodes with 2 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "2X-Large"
- "2 data nodes"
costs:
- amount:
usd: 4000.00
unit: "MONTHLY"
displayName: "es 2xlarge general-purpose cluster 3 master 2 data based on elasticsearch 7.4"
displayName: "2X-Large, General-Purpose, 3 master nodes, 2 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 2
instanceType: m5.2xlarge.search
Expand All @@ -1629,23 +1621,22 @@ elasticsearch:
broker: "AWS broker"
- id: "e7d1f1b3-f539-4573-a4f9-ff3db9de1550"
name: "es-2xlarge-gp-ha"
description: "AWS 2X-Large General-Purpose Elasticsearch 7.4 - 3 node master with 4 data nodes"
description: "2X-Large General-Purpose Elasticsearch/OpenSearch - 3 master nodes with 4 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "2X-Large"
- "4 data nodes"
costs:
- amount:
usd: 5600.00
unit: "MONTHLY"
displayName: "es 2xlarge general-purpose cluster 3 master 4 data based on elasticsearch 7.4"
displayName: "2X-Large, General-Purpose, 3 master nodes, 4 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 4
instanceType: m5.2xlarge.search
Expand All @@ -1667,23 +1658,22 @@ elasticsearch:
broker: "AWS broker"
- id: "7e005210-a5f5-41bf-9ada-d0fce8c49f00"
name: "es-4xlarge-gp"
description: "AWS 4X-Large General-Purpose Elasticsearch 7.4 - 3 node master with 2 data nodes"
description: "4X-Large General-Purpose Elasticsearch/OpenSearch - 3 master nodes with 2 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "4X-Large"
- "2 data nodes"
costs:
- amount:
usd: 8000.00
unit: "MONTHLY"
displayName: "es 4xlarge general-purpose cluster 3 master 2 data based on elasticsearch 7.4"
displayName: "4X-Large, General-Purpose, 3 master nodes, 2 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 2
instanceType: m5.4xlarge.search
Expand All @@ -1705,23 +1695,22 @@ elasticsearch:
broker: "AWS broker"
- id: "20209473-6fab-44ed-93f2-46cc29c1ca00"
name: "es-4xlarge-gp-ha"
description: "AWS 4X-Large General-Purpose Elasticsearch 7.4 - 3 node master with 4 data nodes"
description: "4X-Large General-Purpose Elasticsearch/OpenSearch - 3 master nodes with 4 data nodes"
metadata:
bullets:
- "elasticsearch"
- "es 7.4"
- "4X-Large"
- "4 data nodes"
costs:
- amount:
usd: 11200.00
unit: "MONTHLY"
displayName: "es 4xlarge general-purpose cluster 3 master 4 data based on elasticsearch 7.4"
displayName: "4X-Large, General-Purpose, 3 master nodes, 4 data nodes"
free: false
elasticsearchVersion: Elasticsearch_7.4
elasticsearchVersion: Elasticsearch_7.10
approvedMajorVersions:
- "OpenSearch_2.3"
- "OpenSearch_2.11"
- "OpenSearch_1.3"
- "Elasticsearch_7.4"
- "Elasticsearch_7.10"
masterCount: 3
dataCount: 4
instanceType: m5.4xlarge.search
Expand Down
Loading