Skip to content
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
711a8b6
feat: initial module + DA
Mar 24, 2025
cb9494f
Merge branch 'main' into agent-da
jor2 Apr 2, 2025
2ecdbb7
feat: update code
Apr 2, 2025
b29584c
feat: update code
Apr 2, 2025
c808266
feat: update code
Apr 2, 2025
13c8f99
fix: catalog.json SKIP UPGRADE TESTS
Apr 2, 2025
df3c030
fix: update outputs
Apr 2, 2025
1b9cb91
fix: add dir
Apr 2, 2025
5f908cd
fix: outbound traffic
Apr 2, 2025
8198c0b
fix: outbound traffic
Apr 2, 2025
a969063
fix: outbound traffic
Apr 2, 2025
9e939dc
fix: address feedback
Apr 4, 2025
eaae3d2
Merge branch 'main' into agent-da
jor2 Apr 4, 2025
fc9ce23
fix: address feedback
Apr 4, 2025
c9b83a2
fix: address feedback
Apr 4, 2025
5b9d124
fix: address feedback
Apr 4, 2025
4aa3fbc
Merge branch 'main' into agent-da
jor2 Apr 7, 2025
e3ada1e
fix: address feedback
Apr 7, 2025
e2f7c9c
fix: address feedback
Apr 7, 2025
2c211b2
Merge branch 'main' into agent-da
jor2 Apr 7, 2025
fe841bd
fix: address feedback
Apr 7, 2025
d80d603
fix: address feedback
Apr 7, 2025
ce0f7e1
Merge branch 'main' into agent-da
jor2 Apr 9, 2025
acb982e
fix: address feedback
Apr 9, 2025
b7b304b
fix: address feedback
Apr 9, 2025
c341bb0
fix: address feedback
Apr 10, 2025
137a2ec
fix: address feedback
Apr 10, 2025
67c941a
Merge branch 'main' into agent-da
jor2 Apr 14, 2025
b22a686
fix: address feedback
Apr 14, 2025
86e52a1
fix: address feedback
Apr 14, 2025
b8725c5
fix: address feedback
Apr 14, 2025
2fbe1fd
fix: address feedback
Apr 14, 2025
dfbaaee
fix: address feedback
Apr 14, 2025
4924c43
Merge branch 'main' into agent-da
jor2 Apr 21, 2025
17ec977
fix: address feedback
Apr 24, 2025
ede2e70
fix: address feedback
Apr 24, 2025
01ebab4
tests: add plan tests
Apr 24, 2025
4dd7a9f
fix: address feedback
Apr 24, 2025
78eb2cb
fix: address feedback
Apr 25, 2025
cb8b621
fix: address feedback
Apr 25, 2025
715df11
fix: address feedback
Apr 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .catalog-onboard-pipeline.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
apiVersion: v1
offerings:
- name: deploy-arch-ibm-monitoring-agent
kind: solution
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
offering_id: b0a00765-ee91-4c2a-87fc-df46dbc58cdb
variations:
- name: fully-configurable
mark_ready: true
install_type: fullstack
pre_validation: "tests/scripts/pre-validation-deploy-slz-roks-and-obs-instances.sh"
post_validation: "tests/scripts/post-validation-deploy-slz-roks-and-obs-instances.sh"
4 changes: 2 additions & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repository:

# Uncomment this description property
# and update the description to the current repo description.
# description: ""
description: "Terraform module to install and configure the Monitoring Agent on IBM Cloud Kubernetes Service and Red Hat OpenShift on IBM Cloud."

# Use a comma-separated list of topics to set on the repo (ensure not to use any caps in the topic string).
topics: terraform, ibm-cloud, terraform-module, core-team, monitoring-agent, sysdig-agent, observability, agent, sysdig
topics: terraform, ibm-cloud, terraform-module, core-team, monitoring-agent, sysdig-agent, observability, monitoring, agent, sysdig
3 changes: 3 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
}],
["@semantic-release/exec", {
"successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV"
}],
["@semantic-release/exec",{
"publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
}]
]
}
15 changes: 2 additions & 13 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2024-11-22T17:36:38Z",
"generated_at": "2025-03-24T23:50:52Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -76,18 +76,7 @@
"name": "TwilioKeyDetector"
}
],
"results": {
"README.md": [
{
"hashed_secret": "ff9ee043d85595eb255c05dfe32ece02a53efbb2",
"is_secret": false,
"is_verified": false,
"line_number": 74,
"type": "Secret Keyword",
"verified_result": null
}
]
},
"results": {},
"version": "0.13.1+ibm.62.dss",
"word_list": {
"file": null,
Expand Down
2 changes: 2 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Primary owner should be listed first in list of global owners, followed by any secondary owners
* @jor2 @Aashiq-J
172 changes: 73 additions & 99 deletions README.md

Large diffs are not rendered by default.

19 changes: 4 additions & 15 deletions cra-config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
#
# Developer tips:
# - CRA = Code Risk Analyzer (more info on CRA: https://cloud.ibm.com/docs/code-risk-analyzer-cli-plugin?topic=code-risk-analyzer-cli-plugin-cra-cli-plugin)
# - Multiple directories can be scanned by CRA. Ensure if there are any deployable architecture in the repository that they are all scanned
# - More info about supported configurations at https://github.com/terraform-ibm-modules/common-pipeline-assets/blob/main/.github/workflows/terraform-test-pipeline.md#cra-config-yaml
#

# More info about this file at https://github.com/terraform-ibm-modules/common-pipeline-assets/blob/main/.github/workflows/terraform-test-pipeline.md#cra-config-yaml
version: "v1"
CRA_TARGETS:
- CRA_TARGET: "examples/advanced" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
# SCC_INSTANCE_ID: "" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used.
# SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used.
CRA_ENVIRONMENT_VARIABLES: # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
TF_VAR_prefix: "mock"
TF_VAR_region: "us-south"
- CRA_TARGET: "examples/obs-agent-ocp" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json" # CRA Ignore file to use. If not provided, it checks the repo root directory for `cra-tf-validate-ignore-rules.json`
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
21 changes: 20 additions & 1 deletion cra-tf-validate-ignore-rules.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
{
"scc_rules": []
"scc_rules": [
{
"scc_rule_id": "rule-216e2449-27d7-4afc-929a-b66e196a9cf9",
"description": "Check whether Flow Logs for VPC are enabled",
"ignore_reason": "This rule is not relevant to the module itself, just the VPC resource that is used in the example that is scanned",
"is_valid": false
},
{
"scc_rule_id": "rule-2325054a-c338-474a-9740-0b7034487e40",
"description:": "Check whether OpenShift clusters are accessible only by using private endpoints",
"ignore_reason": "This rule is not relevant to the module itself, just the cluster resource that is used in the example that is scanned",
"is_valid": false
},
{
"scc_rule_id": "rule-64c0bea0-8760-4a6b-a56c-ee375a48961e",
"description:": "Check whether Virtual Private Cloud (VPC) has no public gateways attached",
"ignore_reason": "This rule is not relevant to the module itself, just the VPC resource that is used in the example that is scanned",
"is_valid": false
}
]
}
4 changes: 0 additions & 4 deletions examples/advanced/README.md

This file was deleted.

32 changes: 0 additions & 32 deletions examples/advanced/main.tf

This file was deleted.

38 changes: 0 additions & 38 deletions examples/advanced/outputs.tf

This file was deleted.

39 changes: 0 additions & 39 deletions examples/advanced/variables.tf

This file was deleted.

16 changes: 0 additions & 16 deletions examples/advanced/version.tf

This file was deleted.

11 changes: 0 additions & 11 deletions examples/basic/README.md

This file was deleted.

31 changes: 0 additions & 31 deletions examples/basic/main.tf

This file was deleted.

38 changes: 0 additions & 38 deletions examples/basic/outputs.tf

This file was deleted.

8 changes: 0 additions & 8 deletions examples/basic/provider.tf

This file was deleted.

39 changes: 0 additions & 39 deletions examples/basic/variables.tf

This file was deleted.

16 changes: 0 additions & 16 deletions examples/basic/version.tf

This file was deleted.

Loading