feat: move agents to new tiles #460

jor2 · 2025-02-18T17:12:52Z

Description

https://github.ibm.com/GoldenEye/issues/issues/11710

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

@jor2 See comments. Ill create the new offering once they are addressed, as need the update in the catalog json first

ibm_catalog.json

solutions/standard/variables.tf

solutions/standard/version.tf

.catalog-onboard-pipeline.yaml

Co-authored-by: Conall Ó Cofaigh <[email protected]>

ocofaigh

See latest comments

ibm_catalog.json

.catalog-onboard-pipeline.yaml

ocofaigh

See latest comments. I'm also running the catalog pipeline against this branch now to make sure all the scripts etc work ok

ibm_catalog.json

solutions/baseline/version.tf

ibm_catalog.json

ocofaigh

I suspect you need to run chmod +x on the validation script, as they failed in the pipeline run attempt:

Executing pre-validation..
./catalog-onboard.sh: line 1067: tests/scripts/pre-validation-deploy-slz-roks-and-obs-instances.sh: No such file or directory

ocofaigh · 2025-02-24T17:11:19Z

@jor2 Still a permissions issue on the script:
./catalog-onboard.sh: line 1067: tests/scripts/pre-validation-deploy-slz-roks-and-obs-instances.sh: Permission denied

jor2 · 2025-02-24T20:41:39Z

investigate failure:

 2025/02/24 20:18:18 �[1m-----  New Workspace Action  -----�[21m�[0m
 2025/02/24 20:18:18 Request: activitId=69826159058d3debf275f9dd9de8874b, account=abac0df06b644a9cabc6e44f55b3880e, owner=GoldenEye.Development@ibm.com, requestID=409c489d-800c-4515-a615-d67a34b1a05f
 2025/02/24 20:18:19 Related Activity: action=TERRAFORM_COMMANDS, workspaceID=us-east.workspace.globalcatalog-collection.e88c7dd5, processedBy=orchestrator-6cb446ddb7-gx9wh
 2025/02/24 20:18:19 Related Workspace: name=deploy-arch-ibm-observability-agents-02-24-2025, sourcerelease=(not specified), sourceurl=, folder=terraform-ibm-modules-terraform-ibm-observability-agents-e7c9f65/solutions/baseline
 2025/02/24 20:18:22  --- Ready to execute the command --- 
 2025/02/24 20:18:24 Failed to download from object storage, cannot store downloaded file: open /tmp/deploy-arch-ibm-observability-agents-02-24-20251108998317/terraform-ibm-modules-terraform-ibm-observability-agents-e7c9f65/solutions/baseline/schematics.tfvars: no such file or directory
 2025/02/24 20:18:24 �[1m�[31mCould not fetch varibles from object store 009f8e24-b92a-4103-9f77-9f686e4e6d33, err: cannot store downloaded file: open /tmp/deploy-arch-ibm-observability-agents-02-24-20251108998317/terraform-ibm-modules-terraform-ibm-observability-agents-e7c9f65/solutions/baseline/schematics.tfvars: no such file or directory�[39m�[0m
 2025/02/24 20:18:24 �[1m�[31mThere was an internal Error. Please verify the resources and retry after some time.�[39m�[0m

jor2 · 2025-02-24T20:42:03Z

https://cloud.ibm.com/devops/pipelines/tekton/3571807b-77d7-411d-a035-017e10cf0d95/runs/b39f38aa-627b-4024-9202-7a6caf664015/catalog-onboard/onboard-release?env_id=ibm:yp:us-south

ocofaigh · 2025-02-26T12:33:59Z

@jor2 That error happens because the branch I used to import the temporary version for testing has since been updated. Any time you add a new commit, I need to re-import. Ill clean up now and re-run

ocofaigh · 2025-02-26T12:34:11Z

Actually @jor2 please resolve conflicts

ocofaigh

@jor2 See latest comments. Also perhaps remove Existing VPC layer from the diagram. The DA should work on classic clusters too

ibm_catalog.json

ocofaigh · 2025-02-26T15:00:06Z

ibm_catalog.json

+              "key": "cloud_monitoring_instance_region",
+              "display_name": "Region",
+              "custom_config": {
+                "type": "vpc_region",


Cloud Monitoring may support different regions to VPC - I think we need to add a custom dropdown for this whuch only lists supported Cloud Monitoring regions

monitoring available in every region. what should i do here? how do i create or view the list of already existing custom configs?

@jor2 You will need to create your own dropdown list which only lists the regions that cloud monitoring is supported (same syntax as this https://github.com/terraform-ibm-modules/terraform-ibm-event-notifications/blob/564e73a43888d6fab2fd5706360a11167e8abd48/ibm_catalog.json#L74-L97)

ibm_catalog.json

tests/resources/existing-resources/main.tf

ibm_catalog.json

ocofaigh · 2025-02-26T15:53:53Z

solutions/baseline/variables.tf

+    type = string
+    name = string
+  }))
+  description = "To filter on custom metrics, specify the IBM Cloud Monitoring metrics to include or exclude. [Learn more](https://cloud.ibm.com/docs/monitoring?topic=monitoring-change_kube_agent#change_kube_agent_inc_exc_metrics)"


This is a complex input - it will need a markdown supporting doc

solutions/baseline/variables.tf

ibm_catalog.json

.catalog-onboard-pipeline.yaml

ibm_catalog.json

jor2 · 2025-03-02T22:54:26Z

@ocofaigh what do i do if plan passes and cost fails?

jor2 · 2025-03-04T14:06:30Z

Validation passed when I ran

jor2 · 2025-03-05T13:02:31Z

/run pipeline

ocofaigh

@jor2 you are going to need to update the version of landing zone to the latest in tests/resources/main.tf or the cluster will get into a bad state and agent deploy will fail (this is what happened in Observability DA).
Also I still need to do a final review, so hold off triggering pipeline

ocofaigh

@jor2 Since we are breaking Cloud Logs and Monitoring into new their own DAs, we will also need to split the agents into their own repos / DAs. Can you split the work you have done so they go into these new repos?

feat: move agents to new tiles

04c2024

jor2 self-assigned this Feb 18, 2025

jor2 requested review from Aashiq-J and shemau as code owners February 18, 2025 17:12

Jordan-Williams2 added 2 commits February 18, 2025 17:17

feat: move agents to new tiles

9648dd6

feat: move agents to new tiles

1169af9

ocofaigh requested changes Feb 19, 2025

View reviewed changes

jor2 and others added 5 commits February 21, 2025 13:22

Update ibm_catalog.json

1937027

Co-authored-by: Conall Ó Cofaigh <[email protected]>

Merge branch 'main' into new-tile

f769b58

fix: review feedback

ee07e1d

fix: review feedback

8d5ba1e

Merge branch 'main' into new-tile

23fc95b

ocofaigh requested changes Feb 24, 2025

View reviewed changes

Jordan-Williams2 added 2 commits February 24, 2025 15:07

fix: merge

6019e41

fix: merge

2f4256e

jor2 requested a review from ocofaigh February 24, 2025 15:08

Jordan-Williams2 added 2 commits February 24, 2025 15:10

fix: merge

4b9f033

fix: merge

e7c9f65

ocofaigh requested changes Feb 24, 2025

View reviewed changes

ibm_catalog.json Show resolved Hide resolved

solutions/baseline/version.tf Outdated Show resolved Hide resolved

ibm_catalog.json Outdated Show resolved Hide resolved

ibm_catalog.json Outdated Show resolved Hide resolved

ibm_catalog.json Outdated Show resolved Hide resolved

fix: merge

678f938

ocofaigh requested changes Feb 24, 2025

View reviewed changes

Jordan-Williams2 added 2 commits February 24, 2025 18:31

fix: permissions

8b19ccc

fix: review

31286a1

jor2 and others added 2 commits February 26, 2025 12:36

Merge branch 'main' into new-tile

8c609e6

fix: tidy

33ec278

ocofaigh requested changes Feb 26, 2025

View reviewed changes

ocofaigh reviewed Feb 27, 2025

View reviewed changes

.catalog-onboard-pipeline.yaml Outdated Show resolved Hide resolved

ocofaigh reviewed Feb 27, 2025

View reviewed changes

ibm_catalog.json Outdated Show resolved Hide resolved

ocofaigh reviewed Feb 27, 2025

View reviewed changes

ibm_catalog.json Outdated Show resolved Hide resolved

ocofaigh reviewed Feb 27, 2025

View reviewed changes

ibm_catalog.json Outdated Show resolved Hide resolved

Jordan-Williams2 and others added 8 commits February 27, 2025 14:20

fix: reviewer feedback address

ec17a29

fix: feedback

b029571

fix: feedback

9b78e12

fix: feedback

13524c6

fix: feedback

27518a4

fix: feedback

6ab30cc

Merge branch 'main' into new-tile

3af7d0a

fix: update code

395587b

Jordan-Williams2 added 5 commits March 3, 2025 13:27

fix: validation]

65f1c0a

fix: validation]

e7682c6

fix: validation

0089335

fix: readme

1721c03

fix: readme

b6a1dfc

Jordan-Williams2 added 2 commits March 4, 2025 14:13

fix: readme

d2ca3ca

fix: update regions

ff01d37

ocofaigh requested changes Mar 5, 2025

View reviewed changes

fix: update feedback

99c60b0

ocofaigh requested changes Mar 8, 2025

View reviewed changes

Merge branch 'main' into new-tile

219fa27

ocofaigh closed this Apr 28, 2025

ocofaigh deleted the new-tile branch April 28, 2025 11:49

feat: move agents to new tiles #460

feat: move agents to new tiles #460

Uh oh!

Conversation

jor2 commented Feb 18, 2025

Description

Release required?

Release notes content

Run the pipeline

Checklist for reviewers

For mergers

Uh oh!

ocofaigh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ocofaigh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ocofaigh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ocofaigh left a comment

Choose a reason for hiding this comment

Uh oh!

ocofaigh commented Feb 24, 2025

Uh oh!

jor2 commented Feb 24, 2025

Uh oh!

jor2 commented Feb 24, 2025

Uh oh!

ocofaigh commented Feb 26, 2025

Uh oh!

ocofaigh commented Feb 26, 2025

Uh oh!

ocofaigh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ocofaigh Feb 26, 2025

Choose a reason for hiding this comment

Uh oh!

jor2 Mar 4, 2025

Choose a reason for hiding this comment

Uh oh!

ocofaigh Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ocofaigh Feb 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!