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

feat: add Elasticsearch DA #21

Open
wants to merge 7 commits into
base: dev-elasticsearch
Choose a base branch
from
+121 −23
Open

feat: add Elasticsearch DA #21

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
485f66c
feat: add Elasticsearch DA
akocbekIBM Jul 10, 2024
3162c5f
feat: add Elasticsearch DA
akocbekIBM Jul 10, 2024
4456870
increase Saas DA version 1.3.6
akocbekIBM Jul 11, 2024
f6edff1
increase Saas DA version 1.3.6
akocbekIBM Jul 11, 2024
a4ab125
remove URL encoding
akocbekIBM Jul 12, 2024
f53e4b2
address PR comments
akocbekIBM Jul 12, 2024
f190a98
add service credential names
akocbekIBM Jul 15, 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
8 changes: 7 additions & 1 deletion ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,13 @@
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Editor"
]
}
},
{
"service_name": "databases-for-elasticsearch",
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Editor"
]
}
],
"architecture": {
"features": [
Expand Down
100 changes: 80 additions & 20 deletions stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1%20-%20Account%20Infrastructure%20Base/outputs/security_resource_group_name"
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/security_resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -165,7 +165,7 @@
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1%20-%20Account%20Infrastructure%20Base/outputs/security_resource_group_name"
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/security_resource_group_name"
},
{
"name": "existing_resource_group",
Expand All @@ -187,7 +187,7 @@
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1%20-%20Account%20Infrastructure%20Base/outputs/observability_resource_group_name"
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/observability_resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -203,15 +203,15 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/2a%20-%20Security%20Service%20-%20Key%20Management/outputs/kms_instance_crn"
"value": "ref:../../members/2a - Security Service - Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/2b%20-%20Security%20Service%20-%20Object%20storage/outputs/cos_instance_id"
"value": "ref:../../members/2b - Security Service - Object storage/outputs/cos_instance_id"
},
{
"name": "enable_platform_logs",
Expand All @@ -229,27 +229,27 @@
"inputs": [
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/2b%20-%20Security%20Service%20-%20Object%20storage/outputs/cos_instance_id"
"value": "ref:../../members/2b - Security Service - Object storage/outputs/cos_instance_id"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
},
{
"name": "kms_endpoint_url",
"value": "ref:../../members/2a%20-%20Security%20Service%20-%20Key%20Management/outputs/kp_private_endpoint"
"value": "ref:../../members/2a - Security Service - Key Management/outputs/kp_private_endpoint"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/2a%20-%20Security%20Service%20-%20Key%20Management/outputs/kms_instance_crn"
"value": "ref:../../members/2a - Security Service - Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "resource_group_name",
"value": "ref:../../members/1%20-%20Account%20Infrastructure%20Base/outputs/audit_resource_group_name"
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/audit_resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -265,7 +265,7 @@
},
{
"name": "existing_monitoring_crn",
"value": "ref:../../members/3%20-%20Security%20Service%20-%20Observability/outputs/cloud_monitoring_crn"
"value": "ref:../../members/3 - Security Service - Observability/outputs/cloud_monitoring_crn"
}
],
"name": "4 - Security Service - Event Notifications",
Expand All @@ -275,7 +275,7 @@
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1%20-%20Account%20Infrastructure%20Base/outputs/security_resource_group_name"
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/security_resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -291,27 +291,27 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/2a%20-%20Security%20Service%20-%20Key%20Management/outputs/kms_instance_crn"
"value": "ref:../../members/2a - Security Service - Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "existing_monitoring_crn",
"value": "ref:../../members/3%20-%20Security%20Service%20-%20Observability/outputs/cloud_monitoring_crn"
"value": "ref:../../members/3 - Security Service - Observability/outputs/cloud_monitoring_crn"
},
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/2b%20-%20Security%20Service%20-%20Object%20storage/outputs/cos_instance_id"
"value": "ref:../../members/2b - Security Service - Object storage/outputs/cos_instance_id"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
},
{
"name": "existing_en_crn",
"value": "ref:../../members/4%20-%20Security%20Service%20-%20Event%20Notifications/outputs/crn"
"value": "ref:../../members/4 - Security Service - Event Notifications/outputs/crn"
},
{
"name": "scc_service_plan",
Expand All @@ -333,7 +333,7 @@
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1%20-%20Account%20Infrastructure%20Base/outputs/security_resource_group_name"
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/security_resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -349,11 +349,11 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/2a%20-%20Security%20Service%20-%20Key%20Management/outputs/kms_instance_crn"
"value": "ref:../../members/2a - Security Service - Key Management/outputs/kms_instance_crn"
},
{
"name": "existing_event_notification_instance_crn",
"value": "ref:../../members/4%20-%20Security%20Service%20-%20Event%20Notifications/outputs/crn"
"value": "ref:../../members/4 - Security Service - Event Notifications/outputs/crn"
},
{
"name": "existing_secrets_manager_crn",
Expand All @@ -375,7 +375,7 @@
},
{
"name": "resource_group_name",
"value": "ref:../../members/1%20-%20Account%20Infrastructure%20Base/outputs/workload_resource_group_name"
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/workload_resource_group_name"
},
{
"name": "location",
Expand Down Expand Up @@ -415,7 +415,67 @@
}
],
"name": "6 - WatsonX SaaS services",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a8504fac-eb37-4aa0-a284-f26e876b5750-global"
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9932d3b1-369e-4b5c-ad39-9e10149b83b0-global"
},
{
"inputs": [
{
"name": "use_existing_resource_group",
"value": true
},
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Account Infrastructure Base/outputs/workload_resource_group_name"
},
{
"name": "region",
"value": "ref:../../inputs/region"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "plan",
"value": "platinum"
},
{
"name": "elasticsearch_version",
"value": "8.12"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/2a - Security Service - Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "member_host_flavor",
"value": "b3c.4x16.encrypted"
}
],
"name": "7 - Databases for Elasticsearch",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be renamed "3b - Databases for Elasticsearch" since it has a dependency on 1 - Account Infrastructure Base and 2a - Security Service - Key Management only (and then rename 3a - Security Service - Observability)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

going with this for now - will revisit later

"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c5ea982b-011a-46c8-a49d-0de273f40b46-global"
}
],
"outputs": [
{
"name": "es_hostname",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

es_hostname -> elasticsearch_hostname

"value": "ref:./members/7 - Databases for Elasticsearch/outputs/hostname"
ocofaigh marked this conversation as resolved.
Show resolved Hide resolved
},
{
"name": "es_port",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

es_port -> elasticsearch_port

"value": "ref:./members/7 - Databases for Elasticsearch/outputs/port"
},
{
"name": "es_certificate_base64",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

es_certificate_base64 -> elasticsearch_certificate_base64

"value": "ref:./members/7 - Databases for Elasticsearch/outputs/certificate_base64"
},
{
"name": "es_service_credentials_json",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

es_service_credentials_json -> elasticsearch_service_credentials_json

"value": "ref:./members/7 - Databases for Elasticsearch/outputs/service_credentials_json"
}
]
}