Skip to content

Commit c93af1d

Browse files
Jordan-Williams2Jordan-Williams2
Jordan-Williams2
authored and
Jordan-Williams2
committed
feat: move logs agents to its own tile SKIP UPGRADE TEST
1 parent 5fc5241 commit c93af1d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2079
-528
lines changed

.catalog-onboard-pipeline.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: v1
3+
offerings:
4+
- name: deploy-arch-ibm-logs-agent
5+
kind: solution
6+
catalog_id: _
7+
offering_id: _
8+
variations:
9+
- name: fully-configurable
10+
mark_ready: true
11+
install_type: fullstack
12+
pre_validation: "tests/scripts/pre-validation-deploy-slz-roks-and-obs-instances.sh"
13+
post_validation: "tests/scripts/post-validation-destroy-slz-roks-and-obs-instances.sh"

.github/settings.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ repository:
2525
# description: ""
2626

2727
# Use a comma-separated list of topics to set on the repo (ensure not to use any caps in the topic string).
28-
topics: terraform, ibm-cloud, terraform-module, core-team, logs-agent, observability, agent, cloud-logs, logging-agent
28+
topics: terraform, ibm-cloud, terraform-module, core-team, logs-agent, logs, agent, cloud-logs, logging-agent

.releaserc

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
}],
1111
["@semantic-release/exec", {
1212
"successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV"
13+
}],
14+
["@semantic-release/exec", {
15+
"publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
1316
}]
1417
]
1518
}

.secrets.baseline

+2-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-11-22T17:36:38Z",
6+
"generated_at": "2025-03-13T13:24:51Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -76,18 +76,7 @@
7676
"name": "TwilioKeyDetector"
7777
}
7878
],
79-
"results": {
80-
"README.md": [
81-
{
82-
"hashed_secret": "ff9ee043d85595eb255c05dfe32ece02a53efbb2",
83-
"is_secret": false,
84-
"is_verified": false,
85-
"line_number": 74,
86-
"type": "Secret Keyword",
87-
"verified_result": null
88-
}
89-
]
90-
},
79+
"results": {},
9180
"version": "0.13.1+ibm.62.dss",
9281
"word_list": {
9382
"file": null,

CODEOWNERS

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Primary owner should be listed first in list of global owners, followed by any secondary owners
2+
* @Aashiq-J @shemau

README.md

+71-125
Large diffs are not rendered by default.

cra-config.yaml

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
#
2-
# Developer tips:
3-
# - 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)
4-
# - Multiple directories can be scanned by CRA. Ensure if there are any deployable architecture in the repository that they are all scanned
5-
# - 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
6-
#
7-
1+
# 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
82
version: "v1"
93
CRA_TARGETS:
10-
- CRA_TARGET: "examples/advanced" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
11-
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
12-
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
13-
# 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.
14-
# SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used.
15-
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.
16-
TF_VAR_prefix: "mock"
17-
TF_VAR_region: "us-south"
4+
- CRA_TARGET: "examples/logs-agent-ocp" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
5+
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`
6+
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).

cra-tf-validate-ignore-rules.json

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
12
{
2-
"scc_rules": []
3+
"scc_rules": [
4+
{
5+
"scc_rule_id": "rule-216e2449-27d7-4afc-929a-b66e196a9cf9",
6+
"description": "Check whether Flow Logs for VPC are enabled",
7+
"ignore_reason": "This rule is not relevant to the module itself, just the VPC resource that is used in the example that is scanned",
8+
"is_valid": false
9+
},
10+
{
11+
"scc_rule_id": "rule-2325054a-c338-474a-9740-0b7034487e40",
12+
"description:": "Check whether OpenShift clusters are accessible only by using private endpoints",
13+
"ignore_reason": "This rule is not relevant to the module itself, just the cluster resource that is used in the example that is scanned",
14+
"is_valid": false
15+
},
16+
{
17+
"scc_rule_id": "rule-64c0bea0-8760-4a6b-a56c-ee375a48961e",
18+
"description:": "Check whether Virtual Private Cloud (VPC) has no public gateways attached",
19+
"ignore_reason": "This rule is not relevant to the module itself, just the VPC resource that is used in the example that is scanned",
20+
"is_valid": false
21+
}
22+
]
323
}

examples/advanced/README.md

-4
This file was deleted.

examples/advanced/main.tf

-32
This file was deleted.

examples/advanced/outputs.tf

-38
This file was deleted.

examples/advanced/variables.tf

-39
This file was deleted.

examples/advanced/version.tf

-16
This file was deleted.

examples/basic/README.md

-11
This file was deleted.

examples/basic/main.tf

-31
This file was deleted.

examples/basic/outputs.tf

-38
This file was deleted.

examples/basic/provider.tf

-8
This file was deleted.

examples/basic/variables.tf

-39
This file was deleted.

examples/basic/version.tf

-16
This file was deleted.

0 commit comments

Comments
 (0)