Skip to content

Commit 79d8e7e

Browse files
iamar7iamar7
authored
feat: add support for IBM Cloud Logs + update to latest member DAs (#141)
1 parent 1c96221 commit 79d8e7e

File tree

6 files changed

+76
-47
lines changed

6 files changed

+76
-47
lines changed

‎common-dev-assets‎

‎ibm_catalog.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
"key": "enable_platform_logs_metrics",
206206
"type": "boolean",
207207
"default_value": true,
208-
"description": "Whether to provision logging and monitoring instances are configured to receive all platform logs and metrics in the target region. There can only be one instance per region provisioned for platform logs/metrics.",
208+
"description": "Setting this to true will create a tenant in the same region where the Cloud Logs instance is provisioned, enabling platform logs for that region. Note: You can have only one tenant per region in an account. This variable will also enable platform logs for the Log Analysis instance and platform metrics for Cloud Monitoring instance.",
209209
"required": false
210210
},
211211
{
@@ -293,19 +293,23 @@
293293
},
294294
{
295295
"key": "monitoring_crn",
296-
"description": "The crn of the IBM Cloud Monitoring instance."
296+
"description": "The CRN of the IBM Cloud Monitoring instance."
297297
},
298298
{
299299
"key": "cos_instance_crn",
300-
"description": "The crn of the Cloud Object Storage instance."
300+
"description": "The CRN of the Cloud Object Storage instance."
301301
},
302302
{
303303
"key": "en_crn",
304-
"description": "The crn of the Event Notifications instance."
304+
"description": "The CRN of the Event Notifications instance."
305305
},
306306
{
307307
"key": "log_analysis_crn",
308-
"description": "The id of the provisioned Log Analysis instance."
308+
"description": "The CRN of the provisioned Log Analysis instance."
309+
},
310+
{
311+
"key": "cloud_logs_crn",
312+
"description": "The CRN of the provisioned Cloud Logs instance."
309313
},
310314
{
311315
"key": "scc_workload_protection_crn",

‎reference-architectures/core-security-services-architecture.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎stack_definition.json‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
}
113113
],
114114
"name": "1a - Key management",
115-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.206bfa3d-3bbe-435e-adb9-dd244fdaad86-global"
115+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7f57ef48-2bb2-4641-8f6e-db27a7eacc38-global"
116116
},
117117
{
118118
"inputs": [
@@ -134,7 +134,7 @@
134134
}
135135
],
136136
"name": "1b - Object storage",
137-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1db2434c-c55f-4a5e-9814-1b39f9580b86-global"
137+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.54ae4d96-9c0d-430c-a5d1-51785ffe4cd0-global"
138138
},
139139
{
140140
"inputs": [
@@ -176,7 +176,7 @@
176176
}
177177
],
178178
"name": "2 - Observability",
179-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9a4b4855-07a5-43a0-af1d-ef44e091821c-global"
179+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2515f999-c6c3-4fa3-81eb-03b26d019bb2-global"
180180
},
181181
{
182182
"inputs": [
@@ -223,10 +223,18 @@
223223
{
224224
"name": "existing_monitoring_crn",
225225
"value": "ref:../../members/2 - Observability/outputs/cloud_monitoring_crn"
226+
},
227+
{
228+
"name": "log_analysis_enable_archive",
229+
"value": false
230+
},
231+
{
232+
"name": "log_analysis_provision",
233+
"value": true
226234
}
227235
],
228236
"name": "3 - Event Notifications",
229-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ee7b0d6c-3603-40fb-953b-4bdbd43c3cbe-global"
237+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b5b38d6e-441e-4915-ac00-9a75b442a9f0-global"
230238
},
231239
{
232240
"inputs": [
@@ -286,7 +294,7 @@
286294
}
287295
],
288296
"name": "4a - Security and Compliance Center",
289-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c689955e-d4ad-4f9e-8bdc-c8929dd5991a-global"
297+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b27fc8c7-f6ec-4f98-890d-4f7ccfd37aaf-global"
290298
},
291299
{
292300
"inputs": [
@@ -314,10 +322,6 @@
314322
"name": "existing_event_notification_instance_crn",
315323
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
316324
},
317-
{
318-
"name": "existing_event_notification_instance_crn",
319-
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
320-
},
321325
{
322326
"name": "existing_secrets_manager_crn",
323327
"value": "ref:../../inputs/existing_secrets_manager_crn"
@@ -336,7 +340,7 @@
336340
}
337341
],
338342
"name": "4b - Secrets Manager",
339-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f98df044-b1c7-4f38-86db-6438e76a35bf-global"
343+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global"
340344
}
341345
],
342346
"outputs": [

‎tests/go.mod‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/terraform-ibm-modules/stack-ibm-core-security-services
22

3-
go 1.22
3+
go 1.22.0
44

55
toolchain go1.23.1
66

77
require (
8-
github.com/gruntwork-io/terratest v0.47.1
8+
github.com/gruntwork-io/terratest v0.47.2
99
github.com/stretchr/testify v1.9.0
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.2
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.40.2
1111
)
1212

1313
require (
@@ -17,12 +17,13 @@ require (
1717
cloud.google.com/go/iam v1.1.1 // indirect
1818
cloud.google.com/go/storage v1.30.1 // indirect
1919
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
20-
github.com/IBM-Cloud/power-go-client v1.7.1 // indirect
20+
github.com/IBM-Cloud/power-go-client v1.8.1 // indirect
2121
github.com/IBM/cloud-databases-go-sdk v0.7.0 // indirect
2222
github.com/IBM/go-sdk-core/v5 v5.17.5 // indirect
23-
github.com/IBM/platform-services-go-sdk v0.69.0 // indirect
24-
github.com/IBM/project-go-sdk v0.3.0 // indirect
25-
github.com/IBM/vpc-go-sdk v0.57.0 // indirect
23+
github.com/IBM/platform-services-go-sdk v0.69.1 // indirect
24+
github.com/IBM/project-go-sdk v0.3.6 // indirect
25+
github.com/IBM/schematics-go-sdk v0.3.0 // indirect
26+
github.com/IBM/vpc-go-sdk v0.59.0 // indirect
2627
github.com/Microsoft/go-winio v0.6.1 // indirect
2728
github.com/agext/levenshtein v1.2.3 // indirect
2829
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
@@ -95,13 +96,13 @@ require (
9596
go.opentelemetry.io/otel v1.16.0 // indirect
9697
go.opentelemetry.io/otel/metric v1.16.0 // indirect
9798
go.opentelemetry.io/otel/trace v1.16.0 // indirect
98-
golang.org/x/crypto v0.27.0 // indirect
99+
golang.org/x/crypto v0.28.0 // indirect
99100
golang.org/x/mod v0.17.0 // indirect
100101
golang.org/x/net v0.25.0 // indirect
101102
golang.org/x/oauth2 v0.10.0 // indirect
102103
golang.org/x/sync v0.8.0 // indirect
103-
golang.org/x/sys v0.25.0 // indirect
104-
golang.org/x/text v0.18.0 // indirect
104+
golang.org/x/sys v0.26.0 // indirect
105+
golang.org/x/text v0.19.0 // indirect
105106
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
106107
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
107108
google.golang.org/api v0.127.0 // indirect

0 commit comments

Comments
 (0)