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.

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: refactor AT and Monitoring config #660

Merged
merged 12 commits into from
Jul 3, 2024
Merged

feat: refactor AT and Monitoring config #660

merged 12 commits into from
Jul 3, 2024

Conversation

ocofaigh
Copy link
Member

@ocofaigh ocofaigh commented Jul 2, 2024

Description

In 1.67.0, you no longer need to pass monitoring or AT CRNs to enable monitoring or activity tracking on a bucket. If values not passed, it will default to the Monitoring or AT instance in the same location as the bucket.

As part of this work sysdig_crn has been renamed to monitoring_crn.

The following new variables have also been added to the root level module: activity_tracker_read_data_events, activity_tracker_write_data_events, activity_tracker_management_events, request_metrics_enabled and usage_metrics_enabled. Previously the logic only set these to true if an instance CRN was passed, but as that is now optional, I have exposed them all as their own variables and defaulted them all to true

See #643 and #648

Release required?

  • No release
  • Patch release (x.x.X)
  • Minor release (x.X.x)
  • Major release (X.x.x)
Release notes content

Run the pipeline

If the CI pipeline doesn't run when you create the PR, the PR requires a user with GitHub collaborators access to run the pipeline.

Run the CI pipeline when the PR is ready for review and you expect tests to pass. Add a comment to the PR with the following text:

/run pipeline

Checklist for reviewers

  • If relevant, a test for the change is included or updated with this PR.
  • If relevant, documentation for the change is included or updated with this PR.

For mergers

  • Use a conventional commit message to set the release level. Follow the guidelines.
  • Include information that users need to know about the PR in the commit message. The commit message becomes part of the GitHub release notes.
  • Use the Squash and merge option.

@ocofaigh ocofaigh marked this pull request as draft July 2, 2024 14:59
@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 2, 2024

/run pipeline

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 2, 2024

/run pipeline

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 2, 2024

/run pipeline

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 2, 2024

/run pipeline

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 2, 2024

/run pipeline

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 2, 2024

/run pipeline

1 similar comment
@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 2, 2024

/run pipeline

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 3, 2024

/run pipeline

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 3, 2024

Upgrade test failing:

        	Messages:   	Resource(s) identified to be updated 
        	            	Name: cloud_monitoring
        	            	Address: module.observability_instances.module.cloud_monitoring.ibm_resource_instance.cloud_monitoring[0]
        	            	Actions: [update]
        	            	DIFF:
        	            	  Before: 
        	            		{"name":"cos-upgrade-lsl6er-sysdig"}
        	            	  After: 
        	            		{"name":"cos-upgrade-lsl6er-monitoring"}

^^ expected due to name update in example - no impact to consumers of the module

        	Messages:   	Resource(s) identified to be updated 
        	            	Name: cos_bucket
        	            	Address: module.cos_bucket1.ibm_cos_bucket.cos_bucket[0]
        	            	Actions: [update]
        	            	DIFF:
        	            	  Before: 
        	            		{"activity_tracking":"SECURE_VALUE_HIDDEN_HASH:-dbe1e6bf792df99e92dc0fd04cab5090f7b2754c78ef4cc0fea9ff45"}
        	            	  After: 
        	            		{"activity_tracking":"SECURE_VALUE_HIDDEN_HASH:-876c24c4716726d21b36bcacaa71287499ca74a4f906e1cc181a6fb4"}

^ expected to the monitoring an activity tracking being enabled by default - update in place - no downtime for users

        	Messages:   	Resource(s) identified to be updated 
        	            	Name: cos_bucket
        	            	Address: module.cos_bucket2.ibm_cos_bucket.cos_bucket[0]
        	            	Actions: [update]
        	            	DIFF:
        	            	  Before: 
        	            		{"activity_tracking":"SECURE_VALUE_HIDDEN_HASH:-42721ab5dab883e9bf917e0cd164cb3df7480d608561d60d382921e2"}
        	            	  After: 
        	            		{"activity_tracking":"SECURE_VALUE_HIDDEN_HASH:-5c7b504eadc75cc9db4ee229aff65ee5eeaeb6ae60e0b4449f2b0969"}

^ expected to the monitoring an activity tracking being enabled by default - update in place - no downtime for users

        	Messages:   	Resource(s) identified to be updated 
        	            	Name: cos_bucket1
        	            	Address: module.cos_bucket3.ibm_cos_bucket.cos_bucket1[0]
        	            	Actions: [update]
        	            	DIFF:
        	            	  Before: 
        	            		{"activity_tracking":"SECURE_VALUE_HIDDEN_HASH:-2e81669d74cc14b778d0cea4d00a56fe8ee265e67b191beb4c37555d"}
        	            	  After: 
        	            		{"activity_tracking":"SECURE_VALUE_HIDDEN_HASH:-70393208568f9dac3435db2c35f24ba8649775e42a4ca8d9e0770772"}

^ expected to the monitoring an activity tracking being enabled by default - update in place - no downtime for users

@ocofaigh ocofaigh changed the title [DO NOT MERGE] feat: refactor AT and Monitoring config feat: refactor AT and Monitoring config Jul 3, 2024
@ocofaigh ocofaigh marked this pull request as ready for review July 3, 2024 09:34
@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 3, 2024

/run pipeline

Copy link
Contributor

@shemau shemau left a comment

Choose a reason for hiding this comment

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

Code all looked good, just a few module based versions need looking at/cleaning up.

@@ -89,7 +89,7 @@ module "cos_fscloud" {
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.4.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.66.0, <2.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.67.0-beta1 |
Copy link
Contributor

Choose a reason for hiding this comment

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

1.67.0 is available

Comment on lines 10 to 11
# version = ">= 1.67.0-beta1, <2.0.0"
version = ">= 1.67.0-beta1"
Copy link
Contributor

Choose a reason for hiding this comment

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

version 1.67.0 is available

Comment on lines 9 to 10
# version = ">= 1.67.0-beta1, < 2.0.0"
version = ">= 1.66.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Validate this version. Remove comment about beta.

@ocofaigh
Copy link
Member Author

ocofaigh commented Jul 3, 2024

/run pipeline

Copy link
Contributor

@shemau shemau left a comment

Choose a reason for hiding this comment

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

LGTM

@ocofaigh ocofaigh merged commit 7d93787 into main Jul 3, 2024
2 checks passed
@ocofaigh ocofaigh deleted the cos-obs branch July 3, 2024 11:19
@terraform-ibm-modules-ops
Copy link
Contributor

🎉 This issue has been resolved in version 8.6.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants