Skip to content

feat: initial module + DA #7

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

Merged
merged 41 commits into from
Apr 25, 2025
Merged

feat: initial module + DA #7

merged 41 commits into from
Apr 25, 2025

Conversation

jor2
Copy link
Member

@jor2 jor2 commented Mar 24, 2025

Description

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.

@jor2 jor2 self-assigned this Mar 24, 2025
@jor2 jor2 marked this pull request as ready for review April 2, 2025 14:59
@jor2
Copy link
Member Author

jor2 commented Apr 2, 2025

/run pipeline

@jor2
Copy link
Member Author

jor2 commented Apr 2, 2025

/run pipeline

Copy link
Member

@ocofaigh ocofaigh left a comment

Choose a reason for hiding this comment

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

Many of the same comments that I already left in the cloud logs agent PR. Please try to be more consistent.

  • Diagram updates:
    • Resource Group -> Existing resource group
    • data -> metrics
    • Monitoring Instance -> Existing Monitoring instance
    • Move Monitoring instance icon outside of resource group. It doesn't have to be in the same RG as the cluster.
  • update codeowners
  • update .github/settings.yml with descrption
  • update .releaserc to trigger catalog pipeline

@jor2
Copy link
Member Author

jor2 commented Apr 4, 2025

/run pipeline

@jor2
Copy link
Member Author

jor2 commented Apr 4, 2025

Screenshot 2025-04-04 at 17 15 22

@jor2 jor2 requested a review from ocofaigh April 4, 2025 16:35
@jor2
Copy link
Member Author

jor2 commented Apr 14, 2025

Destroy complete! Resources: 12 destroyed.
Post-validation completed successfully
Logging into catalog account..
API endpoint:     https://cloud.ibm.com/
Region:
User:             [[email protected]](mailto:[email protected])
Account:          GoldenEye GoldenEye Operations's Account (9f9af00a96104f49b6509aa715f9d6a5) <-> 2325206
Resource group:   No resource group targeted, use 'ibmcloud target -g RESOURCE_GROUP'
Login was successful after 1 attempts.
Checking code freeze..
API response: {"href":"[https://pnp-api-oss.cloud.ibm.com/changemgmt/api/v3/windows","offset":0,"limit":25,"total_count":0,"first":{"href":"https://pnp-api-oss.cloud.ibm.com/changemgmt/api/v3/windows?offset=0&limit=25"},"last":{"href":"https://pnp-api-oss.cloud.ibm.com/changemgmt/api/v3/windows?offset=0&limit=25"},"windows](https://pnp-api-oss.cloud.ibm.com/changemgmt/api/v3/windows%22,%22offset%22:0,%22limit%22:25,%22total_count%22:0,%22first%22:%7B%22href%22:%22https://pnp-api-oss.cloud.ibm.com/changemgmt/api/v3/windows?offset=0&limit=25%22},%22last%22:{%22href%22:%22https://pnp-api-oss.cloud.ibm.com/changemgmt/api/v3/windows?offset=0&limit=25%22},%22windows)":[]}
There is no code freeze window defined
Marking version as ready..
Marking version v0.0.1-temp4 as ready in offering Cloud automation for Monitoring agent...
FAILED
Error response from server. Status code: 400; message: {"message":"Cannot move to state: [consumable]: Version[v0.0.1-temp4] is based on a git Branch [https://github.com/terraform-ibm-modules/terraform-ibm-monitoring-agent/tree/agent-da].","code":400,"global_transaction_id":"910e9205-52b7-4660-93d5-78a778fcdc53"}

Copy link
Member

@ocofaigh ocofaigh left a comment

Choose a reason for hiding this comment

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

The image registry and the image digest needs to be exposed as variables (with default values) so users can override if needed

Copy link
Member

@ocofaigh ocofaigh left a comment

Choose a reason for hiding this comment

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

see comments

variables.tf Outdated
nullable = false
}

variable "instance_region" {
Copy link
Member

Choose a reason for hiding this comment

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

I think this one should be prefixed with cloud_monitoring_:

cloud_monitoring_instance_region

variables.tf Outdated
nullable = false
}

variable "endpoint_type" {
Copy link
Member

Choose a reason for hiding this comment

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

I think this one should be prefixed with cloud_monitoring_instance:

cloud_monitoring_instance_endpoint_type

Copy link
Member

@ocofaigh ocofaigh left a comment

Choose a reason for hiding this comment

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

few more comments

Copy link
Member

@ocofaigh ocofaigh left a comment

Choose a reason for hiding this comment

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

see comments on renovate updates too

variables.tf Outdated
variable "chart_version" {
description = "The version of the Cloud Monitoring agent helm chart to deploy."
type = string
default = "1.79.0" # Replace with the desired version
Copy link
Member

Choose a reason for hiding this comment

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

For renovate to manage this, please change to:

Suggested change
default = "1.79.0" # Replace with the desired version
default = "1.79.0" # registryUrl: charts.sysdig.com

Copy link
Member

Choose a reason for hiding this comment

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

You also need to update the renovate.json file with the following contents:

{
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": ["github>terraform-ibm-modules/common-dev-assets:commonRenovateConfig"],
  "customManagers": [
    {
      "customType": "regex",
      "description": "Update docker image digest to latest in variables.tf",
      "fileMatch": ["variables.tf$"],
      "datasourceTemplate": "docker",
      "matchStrings": [
        "default\\s*=\\s*\"(?<currentValue>[\\w.-]+)@(?<currentDigest>sha256:[a-f0-9]+)\"\\s*# datasource: (?<depName>[^\\s]+)"
      ]
    },
    {
      "customType": "regex",
      "description": "Update sysdig-deploy helm chart version to latest in variables.tf",
      "fileMatch": ["variables.tf$"],
      "matchStrings": ["default\\s*=\\s*\"(?<currentValue>.*?)\"\\s*# registryUrl: charts.sysdig.com\\n"],
      "depNameTemplate": "sysdig-deploy",
      "datasourceTemplate": "helm",
      "registryUrlTemplate": "https://charts.sysdig.com"
    }
  ],
  "packageRules": [
    {
      "description": "Bundle image + helm chart updates into the same PR",
      "matchPackageNames": ["icr.io/ext/sysdig/agent", "sysdig-deploy"],
      "groupName": "Charts and Images",
      "commitMessageExtra": "to latest",
      "group": true
    }
  ]
}

@ocofaigh
Copy link
Member

/run pipeline

@ocofaigh
Copy link
Member

Test failed with:

│ {"incidentID":"ded0d700-d477-acb7-95be-c34c3f19570e","code":"A0862a","description":"Could
│ not connect to IAM service. Try again later.","type":"Authentication"}

Unrelated to changes in this PR so re-running..

@ocofaigh
Copy link
Member

/run pipeline

@ocofaigh ocofaigh merged commit 613811c into main Apr 25, 2025
2 checks passed
@ocofaigh ocofaigh deleted the agent-da branch April 25, 2025 17:34
@terraform-ibm-modules-ops
Copy link
Contributor

🎉 This PR is included in version 1.0.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