Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
563c48a
SKIP UPGRADE TEST
Apr 28, 2025
04c3b7f
fixed pre commit
Apr 28, 2025
0aaf205
modified diagram
Apr 28, 2025
6bdbad6
modified diagram
Apr 28, 2025
2248bbc
added cloud logs dependency
Apr 29, 2025
542957c
updated dependency
Apr 29, 2025
6a588b4
change
Apr 29, 2025
f4b2c26
added kms references
Apr 29, 2025
8bfb35f
updated diagram
Apr 29, 2025
a157fe9
updated diagram
Apr 29, 2025
09255b6
addressed review comments
May 7, 2025
b0d0779
addressed review comments
May 7, 2025
87de979
fixed precommit
May 7, 2025
850f10e
fixed variable description
May 7, 2025
1990f84
fixed var description
May 7, 2025
8b6b932
modified tc
May 7, 2025
0184480
logic for cross account auth policy for cos kms
May 7, 2025
9572a85
unskip the policy in cos bucket module
May 7, 2025
f9a99fb
best practices
Jun 20, 2025
1839935
Merge branch 'main' into at-da
vkuma17 Jun 20, 2025
9323760
input version modified
Jun 20, 2025
67019f3
Merge branch 'at-da' of github.com:terraform-ibm-modules/terraform-ib…
Jun 20, 2025
c9348f3
updated provider version
Jun 20, 2025
e48dd8a
Merge branch 'main' into at-da
vkuma17 Jun 22, 2025
dc3d4a5
modified catalog json
Jun 22, 2025
a55b874
Merge branch 'at-da' of github.com:terraform-ibm-modules/terraform-ib…
Jun 22, 2025
18a1ae7
modified catalog
Jun 22, 2025
3ca2f51
Merge branch 'main' into at-da
vkuma17 Jun 23, 2025
d0ccd3f
added complex inputs file
Jun 24, 2025
c93076f
Merge branch 'at-da' of github.com:terraform-ibm-modules/terraform-ib…
Jun 24, 2025
d3b6f74
addressed review comments
Jun 24, 2025
abe2dcc
modified diagram
Jun 24, 2025
4d0f44b
Update ibm_catalog.json
vkuma17 Jun 24, 2025
c6a9f50
addressed review comments
Jun 25, 2025
31b1ded
addressed review comments
Jun 25, 2025
d85461e
addressed review comments
Jun 25, 2025
0753141
Update ibm_catalog.json
vkuma17 Jun 25, 2025
7ce4533
Update ibm_catalog.json
vkuma17 Jun 25, 2025
96afe95
addressed review comments
Jun 26, 2025
4fcd801
addressed review comments
Jun 26, 2025
fd3379b
addressed review comments
Jun 26, 2025
c46b067
addressed review comments
Jun 26, 2025
504a237
addressed review comments
Jun 26, 2025
a85db30
added existing resource for cloud logs creation
Jun 26, 2025
914de74
pre commit error fixed
Jun 26, 2025
290d7f6
fix in existing resources
Jun 26, 2025
ec153fc
fixed precommit
Jun 26, 2025
5a70647
creating metrics bucket for cloud logs
Jun 26, 2025
c3f283c
addressed review comments
Jun 26, 2025
7878864
change
Jun 27, 2025
0c7f139
add cloud monitoring dependency
iamar7 Jun 27, 2025
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
14 changes: 14 additions & 0 deletions .catalog-onboard-pipeline.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
apiVersion: v1
offerings:
- name: deploy-arch-ibm-activity-tracker
kind: solution
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
offering_id:
variations:
- name: fully-configurable
mark_ready: true
install_type: fullstack
scc:
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
region: us-south
264 changes: 264 additions & 0 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
{
"products": [
{
"name": "deploy-arch-ibm-activity-tracker",
"label": "Cloud automation for Activity tracker",
"product_kind": "solution",
"tags": [
"ibm_created",
"target_terraform",
"terraform",
"solution"
],
"keywords": [
"IaC",
"infrastructure as code",
"terraform",
"solution",
"observability",
"ATracker"
],
"short_description": "Configures IBM Cloud Activity tracker resources",
"long_description": "Solution that support configuring IBM Cloud Observability resources for activity tracking.",
"offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/blob/main/README.md",
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be pointing to DS readme, not module

"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-observability-da/main/images/observability-icon.svg",
"provider_name": "IBM",
"features": [
{
"title": "Configures IBM Cloud Activity Tracker Event Routing",
"description": "Configures an IBM Cloud Activity Tracker route with a Cloud Object Storage and Cloud Logs target."
}
],
"support_details": "This product is in the community registry and support is handled in the source repo. You can open an issue at [https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/issues](https://github.com/terraform-ibm-modules/terraform-ibm-activity-tracker/issues). Support is not offered through IBM Cloud Support.",
"flavors": [
{
"label": "Fully configurable",
"name": "fully-configurable",
"install_type": "fullstack",
"working_directory": "solutions/fully-configurable",
"iam_permissions": [
{
"service_name": "atracker",
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Writer",
"crn:v1:bluemix:public:iam::::role:Editor"
]
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "hs-crypto"
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "kms"
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "cloud-object-storage"
}
],
"compliance": {
"authority": "scc-v3",
"profiles": [
{
"profile_name": "IBM Cloud Framework for Financial Services",
"profile_version": "1.7.0"
}
]
},
"configuration": [
{
"key": "ibmcloud_api_key"
},
{
"key": "provider_visibility",
"options": [
{
"displayname": "private",
"value": "private"
},
{
"displayname": "public",
"value": "public"
},
{
"displayname": "public-and-private",
"value": "public-and-private"
}
]
},
{
"key": "prefix",
"required": true
},
{
"key": "existing_resource_group_name"
},
{
"custom_config": {
"type": "region",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"showKinds": [
"region"
]
}
},
"key": "region",
"required": true
},
{
"key": "enable_at_event_routing_to_cos_bucket"
},
{
"key": "enable_at_event_routing_to_cloud_logs"
},
{
"key": "existing_cloud_logs_instance_crn"
},
{
"key": "cos_region"
},
{
"key": "at_cos_bucket_retention_policy"
},
{
"key": "add_bucket_name_suffix"
},
{
"key": "at_cos_target_bucket_name"
},
{
"key": "at_cos_bucket_access_tags"
},
{
"key": "at_cos_target_bucket_class",
"options": [
{
"displayname": "standard",
"value": "standard"
},
{
"displayname": "vault",
"value": "vault"
},
{
"displayname": "cold",
"value": "cold"
},
{
"displayname": "smart",
"value": "smart"
},
{
"displayname": "onerate_active",
"value": "onerate_active"
}
]
},
{
"key": "management_endpoint_type_for_bucket",
"options": [
{
"displayname": "public",
"value": "public"
},
{
"displayname": "private",
"value": "private"
},
{
"displayname": "direct",
"value": "direct"
}
]
},
{
"key": "existing_cos_instance_crn"
},
{
"key": "existing_at_cos_target_bucket_name"
},
{
"key": "existing_at_cos_target_bucket_endpoint"
},
{
"key": "skip_cos_kms_auth_policy"
},
{
"key": "skip_at_cos_auth_policy"
},
{
"key": "kms_encryption_enabled_buckets"
},
{
"key": "existing_cos_kms_key_crn"
},
{
"key": "existing_kms_instance_crn",
"required": true
},
{
"key": "cos_key_name"
},
{
"key": "cos_key_ring_name"
},
{
"key": "ibmcloud_cos_api_key"
},
{
"key": "ibmcloud_kms_api_key"
},
{
"key": "kms_endpoint_type",
"options": [
{
"displayname": "public",
"value": "public"
},
{
"displayname": "private",
"value": "private"
}
]
}
],
"architecture": {
"descriptions": "This architecture supports the deployment of IBM Cloud Activity Tracker Event Routing to an Object Storage bucket and Cloud Logs target.",
"features": [
{
"title": "Creates KMS-encrypted Object Storage buckets for log files and Activity Tracker events",
"description": "Creates and configures the IBM Cloud Object Storage buckets with archiving and expiration enabled."
},
{
"title": "Creates an IBM Cloud Activity Tracker event route to an Object Storage bucket and Cloud Logs target",
"description": "Creates and configures the IBM Cloud Activity Tracker Event Routing to an IBM Cloud Object Storage bucket and IBM Cloud Logs target."
}
],
"diagrams": [
{
"diagram": {
"caption": "Activity tracker deployment on IBM Cloud",
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-observability-da/main/reference-architecture/deployable-architecture-observability-instances.svg",
"type": "image/svg+xml"
},
"description": "This architecture supports creating IBM Cloud Activity Tracker Event Routing to an Object Storage bucket and Cloud Logs instance."
}
]
}
}
]
}
]
}
Copy link
Member

Choose a reason for hiding this comment

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

Please adjust the alignment of the line from Activity Tracker Event Routing to cloud logs. Do we want to show the cloud logs metrics bucket & data bucket since we are not creating them in this DA?

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"existing_cos_instance_crn": $COS_INSTANCE_CRN
}
Loading