Skip to content
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b6db4f2
feat: move logs agents to its own tile
Apr 2, 2025
0371c6c
fix: catalog.json SKIP UPGRADE TESTS
Apr 2, 2025
d6b558c
Merge branch 'main' into agent-da
jor2 Apr 3, 2025
f5aa84b
fix: merge conflicts
Apr 7, 2025
31df561
fix: update code
Apr 7, 2025
294ab94
fix: update code
Apr 7, 2025
9e9bbec
fix: address feedback
Apr 9, 2025
99f6118
fix: address feedback
Apr 9, 2025
04eebf3
Merge branch 'main' into agent-da
jor2 Apr 14, 2025
cfe48a4
fix: address feedback
Apr 14, 2025
5dbe4f3
Merge branch 'main' into agent-da
jor2 Apr 21, 2025
7962834
Merge branch 'main' into agent-da
jor2 Apr 28, 2025
9cdb0eb
fix: making in-line with monitoring repo
Apr 28, 2025
0068224
fix: making in-line with monitoring repo
Apr 28, 2025
c5dd363
fix: required
Apr 28, 2025
1e5ffc8
fix: required
Apr 28, 2025
b36dd50
fix: update ibm catalog
Apr 29, 2025
69af5fd
fix: update permissions
Apr 29, 2025
8e58620
Merge branch 'main' into agent-da
jor2 Apr 29, 2025
7647573
Merge branch 'main' into agent-da
jor2 Apr 30, 2025
59b615f
fix: update code
Apr 30, 2025
8b5bb94
fix: update code
Apr 30, 2025
db1a403
fix: update code
May 1, 2025
f45db29
Merge branch 'main' into agent-da
jor2 May 5, 2025
27b9f9a
fix: address feedback
May 5, 2025
60a93e8
Merge branch 'main' of github.com:terraform-ibm-modules/terraform-ibm…
May 5, 2025
86d5cf1
Merge branch 'agent-da' of github.com:terraform-ibm-modules/terraform…
May 5, 2025
9894a12
Update CODEOWNERS
jor2 May 5, 2025
44cb53a
fix: address feedback
May 6, 2025
64d99cf
Merge branch 'agent-da' of github.com:terraform-ibm-modules/terraform…
May 6, 2025
7e3d7d5
fix: address feedback
May 6, 2025
9b4d1a8
fix: address feedback
May 6, 2025
288f906
Merge branch 'main' into agent-da
jor2 May 7, 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-logs-agent
kind: solution
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
offering_id: b3fb668c-6f9d-4db3-9073-9a677ccf4394
variations:
- name: fully-configurable
mark_ready: true
install_type: fullstack
pre_validation: "tests/scripts/pre-validation-deploy-ocp-and-logs-instances.sh"
post_validation: "tests/scripts/post-validation-destroy-ocp-and-logs-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 deploy the IBM Cloud Logs Agent on a Cluster"

# 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, logs-agent, observability, agent, cloud-logs, logging-agent
topics: terraform, ibm-cloud, terraform-module, core-team, logs-agent, observability, logs, agent, cloud-logs, logging-agent
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-13T13:24:51Z",
"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
182 changes: 83 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/logs-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).
22 changes: 21 additions & 1 deletion cra-tf-validate-ignore-rules.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@

{
"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