Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion recipes/newrelic/infrastructure/agent-control/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ installTargets:
- type: host
os: linux
platform: redhat
platformVersion: "(7|8|9)\\.*"
platformVersion: "(7|8|9|10)\\.*"

keywords:
- AgentControl
Expand All @@ -43,6 +43,7 @@ keywords:
- RHEL 7
- RHEL 8
- RHEL 9
- RHEL 10
- Amazon Linux
- Amazon Linux AMI
- Amazon Linux 2
Expand Down
7 changes: 5 additions & 2 deletions recipes/newrelic/infrastructure/centos_rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ keywords:
- RHEL 7
- RHEL 8
- RHEL 9
- RHEL 10

processMatch: []

Expand Down Expand Up @@ -193,13 +194,15 @@ install:
if [ "${NEW_RELIC_FIPS_ENABLED:-false}" = "true" ]; then
echo "FIPS mode enabled. Installing newrelic-infra-fips${VERSION_SUFFIX}..."
curl -s $REPO_URL -o /etc/yum.repos.d/newrelic-infra.repo
sudo sed -i "/^baseurl/s|.*|baseurl=http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/testing-pre-releases/satya-rhel10/infrastructure_agent/linux/yum/el/10/${ARCH}/|" /etc/yum.repos.d/newrelic-infra.repo
yum -y -q makecache --disablerepo='*' --enablerepo='newrelic-infra'
yum -y -q install newrelic-infra-fips${VERSION_SUFFIX}
yum -y -q install newrelic-infra-fips${VERSION_SUFFIX} --nogpgcheck
else
echo "FIPS mode not enabled. Installing newrelic-infra${VERSION_SUFFIX}..."
curl -s $REPO_URL -o /etc/yum.repos.d/newrelic-infra.repo
sudo sed -i "/^baseurl/s|.*|baseurl=http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/testing-pre-releases/satya-rhel10/infrastructure_agent/linux/yum/el/10/${ARCH}/|" /etc/yum.repos.d/newrelic-infra.repo
yum -y -q makecache --disablerepo='*' --enablerepo='newrelic-infra'
yum -y -q install newrelic-infra${VERSION_SUFFIX}
yum -y -q install newrelic-infra${VERSION_SUFFIX} --nogpgcheck
fi
vars:
DISTRO_VERSION:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},

"resources": [
{
"id": "host1",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "RHEL_HA-10.0.?_HVM-????????-x86_64-?-Hourly2-GP2"
}
],

"instrumentations": {
"resources": [
{
"id": "nr_agent_control_logs",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true,
"use_system_identity_auth": true
}
}
]
}
}
34 changes: 34 additions & 0 deletions test/definitions/infra-agent/RHEL10-infra.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},

"resources": [
{
"id": "host1",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "RHEL_HA-10.0.?_HVM-????????-x86_64-?-Hourly2-GP2"
}
],

"instrumentations": {
"resources": [
{
"id": "nr_infra_RHEL10",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"validate_output": "Infrastructure Agent\\s+\\(installed\\)",
"local_recipes": true
}
}
]
}
}
35 changes: 35 additions & 0 deletions test/definitions/logging/RHEL10.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},

"resources": [
{
"id": "host1",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
"ami_name": "RHEL_HA-10.0.?_HVM-????????-x86_64-?-Hourly2-GP2"
}
],

"instrumentations": {
"resources": [
{
"id": "nr_logs_RHEL10",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
"params": {
"newrelic_cli_option": "-n logs-integration",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true
}
}
]
}
}
Loading