Skip to content

Commit 5a2fb16

Browse files
rajatagarwal-ibmrajatagarwal-ibm
committed
split observability DA consumption
1 parent 805a290 commit 5a2fb16

File tree

5 files changed

+138
-149
lines changed

5 files changed

+138
-149
lines changed

‎common-dev-assets‎

‎ibm_catalog.json‎

Lines changed: 2 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
{
150150
"key": "enable_platform_metrics",
151151
"type": "boolean",
152-
"default_value": true,
152+
"default_value": false,
153153
"description": "When set to `true`, the IBM Cloud Monitoring instance will be configured to collect platform metrics from the provided region. You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location. Check with the account or service administrator if another monitoring instance has already been configured. You may not have permissions to see all monitoring instances in the region. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-platform_metrics_enabling).",
154154
"required": true,
155155
"virtual": true
@@ -448,40 +448,6 @@
448448
"on_by_default": true,
449449
"version": "v5.1.4"
450450
},
451-
{
452-
"name": "deploy-arch-ibm-cloud-logs",
453-
"description": "Enable to provision and configure IBM Cloud Logs for analysing logs and metrics generated by the Event Notifications instance.",
454-
"flavors": [
455-
"fully-configurable"
456-
],
457-
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
458-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
459-
"input_mapping": [
460-
{
461-
"dependency_input": "prefix",
462-
"version_input": "prefix",
463-
"reference_version": true
464-
},
465-
{
466-
"dependency_input": "existing_kms_instance_crn",
467-
"version_input": "existing_kms_instance_crn",
468-
"reference_version": true
469-
},
470-
{
471-
"dependency_input": "region",
472-
"version_input": "region",
473-
"reference_version": true
474-
},
475-
{
476-
"dependency_input": "logs_routing_tenant_regions",
477-
"version_input": "logs_routing_tenant_regions",
478-
"reference_version": true
479-
}
480-
],
481-
"optional": true,
482-
"on_by_default": true,
483-
"version": "v1.5.6"
484-
},
485451
{
486452
"name": "deploy-arch-ibm-cloud-monitoring",
487453
"description": "Enable to provision and configure IBM Cloud Activity Tracker for routing events generated by the Event Notifications instance to a Cloud logs instance.",
@@ -515,35 +481,6 @@
515481
"on_by_default": true,
516482
"version": "v1.3.0"
517483
},
518-
{
519-
"name": "deploy-arch-ibm-activity-tracker",
520-
"description": "Enable to provision and configure IBM Cloud Activity Tracker event routing to configure how to route auditing events, both global and location-based event data, in your IBM Cloud.",
521-
"flavors": [
522-
"fully-configurable"
523-
],
524-
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
525-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
526-
"input_mapping": [
527-
{
528-
"dependency_input": "prefix",
529-
"version_input": "prefix",
530-
"reference_version": true
531-
},
532-
{
533-
"dependency_input": "existing_kms_instance_crn",
534-
"version_input": "existing_kms_instance_crn",
535-
"reference_version": true
536-
},
537-
{
538-
"dependency_input": "region",
539-
"version_input": "region",
540-
"reference_version": true
541-
}
542-
],
543-
"optional": true,
544-
"on_by_default": true,
545-
"version": "v1.1.3"
546-
},
547484
{
548485
"name": "deploy-arch-ibm-event-notifications",
549486
"description": "Configures lifecycle notifications for your Secrets Manager instance. Also, supports creating a topic and configuring email subscriptions.",
@@ -570,7 +507,7 @@
570507
],
571508
"optional": true,
572509
"on_by_default": true,
573-
"version": "v2.3.7"
510+
"version": "v2.5.0"
574511
}
575512
],
576513
"dependency_version_2": true,

‎tests/go.mod‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ go 1.24.2
55
toolchain go1.24.3
66

77
require (
8-
github.com/gruntwork-io/terratest v0.49.0
8+
github.com/gruntwork-io/terratest v0.50.0
99
github.com/stretchr/testify v1.10.0
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.51.1
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.58.5
1111
)
1212

1313
require (
1414
dario.cat/mergo v1.0.0 // indirect
1515
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
16-
github.com/IBM-Cloud/power-go-client v1.11.0 // indirect
17-
github.com/IBM/cloud-databases-go-sdk v0.7.1 // indirect
18-
github.com/IBM/go-sdk-core/v5 v5.19.1 // indirect
19-
github.com/IBM/platform-services-go-sdk v0.82.0 // indirect
16+
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
17+
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
18+
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
19+
github.com/IBM/platform-services-go-sdk v0.85.1 // indirect
2020
github.com/IBM/project-go-sdk v0.3.6 // indirect
2121
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
2222
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
@@ -31,23 +31,23 @@ require (
3131
github.com/davecgh/go-spew v1.1.1 // indirect
3232
github.com/emirpasic/gods v1.18.1 // indirect
3333
github.com/fsnotify/fsnotify v1.8.0 // indirect
34-
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
34+
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
3535
github.com/ghodss/yaml v1.0.0 // indirect
3636
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
3737
github.com/go-git/go-billy/v5 v5.6.2 // indirect
38-
github.com/go-git/go-git/v5 v5.16.0 // indirect
38+
github.com/go-git/go-git/v5 v5.16.2 // indirect
3939
github.com/go-logr/logr v1.4.2 // indirect
4040
github.com/go-logr/stdr v1.2.2 // indirect
41-
github.com/go-openapi/analysis v0.21.5 // indirect
41+
github.com/go-openapi/analysis v0.23.0 // indirect
4242
github.com/go-openapi/errors v0.22.1 // indirect
43-
github.com/go-openapi/jsonpointer v0.20.1 // indirect
44-
github.com/go-openapi/jsonreference v0.20.3 // indirect
45-
github.com/go-openapi/loads v0.21.3 // indirect
46-
github.com/go-openapi/runtime v0.26.0 // indirect
47-
github.com/go-openapi/spec v0.20.12 // indirect
43+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
44+
github.com/go-openapi/jsonreference v0.21.0 // indirect
45+
github.com/go-openapi/loads v0.22.0 // indirect
46+
github.com/go-openapi/runtime v0.28.0 // indirect
47+
github.com/go-openapi/spec v0.21.0 // indirect
4848
github.com/go-openapi/strfmt v0.23.0 // indirect
49-
github.com/go-openapi/swag v0.22.5 // indirect
50-
github.com/go-openapi/validate v0.22.4 // indirect
49+
github.com/go-openapi/swag v0.23.1 // indirect
50+
github.com/go-openapi/validate v0.24.0 // indirect
5151
github.com/go-playground/locales v0.14.1 // indirect
5252
github.com/go-playground/universal-translator v0.18.1 // indirect
5353
github.com/go-playground/validator/v10 v10.26.0 // indirect
@@ -69,7 +69,7 @@ require (
6969
github.com/kevinburke/ssh_config v1.2.0 // indirect
7070
github.com/klauspost/compress v1.16.7 // indirect
7171
github.com/leodido/go-urn v1.4.0 // indirect
72-
github.com/mailru/easyjson v0.7.7 // indirect
72+
github.com/mailru/easyjson v0.9.0 // indirect
7373
github.com/mattn/go-zglob v0.0.4 // indirect
7474
github.com/mitchellh/go-homedir v1.1.0 // indirect
7575
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -82,21 +82,23 @@ require (
8282
github.com/pmezard/go-difflib v1.0.0 // indirect
8383
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
8484
github.com/skeema/knownhosts v1.3.1 // indirect
85+
github.com/stretchr/objx v0.5.2 // indirect
8586
github.com/tmccombs/hcl2json v0.6.4 // indirect
8687
github.com/ulikunitz/xz v0.5.11 // indirect
8788
github.com/xanzy/ssh-agent v0.3.3 // indirect
8889
github.com/zclconf/go-cty v1.16.2 // indirect
8990
go.mongodb.org/mongo-driver v1.17.3 // indirect
90-
go.opentelemetry.io/otel v1.29.0 // indirect
91-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
92-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
93-
golang.org/x/crypto v0.38.0 // indirect
94-
golang.org/x/mod v0.18.0 // indirect
95-
golang.org/x/net v0.39.0 // indirect
96-
golang.org/x/sync v0.14.0 // indirect
97-
golang.org/x/sys v0.33.0 // indirect
98-
golang.org/x/text v0.25.0 // indirect
99-
golang.org/x/tools v0.22.0 // indirect
91+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
92+
go.opentelemetry.io/otel v1.35.0 // indirect
93+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
94+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
95+
golang.org/x/crypto v0.40.0 // indirect
96+
golang.org/x/mod v0.25.0 // indirect
97+
golang.org/x/net v0.41.0 // indirect
98+
golang.org/x/sync v0.16.0 // indirect
99+
golang.org/x/sys v0.34.0 // indirect
100+
golang.org/x/text v0.27.0 // indirect
101+
golang.org/x/tools v0.34.0 // indirect
100102
gopkg.in/warnings.v0 v0.1.2 // indirect
101103
gopkg.in/yaml.v2 v2.4.0 // indirect
102104
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)