diff --git a/recipes/newrelic/infrastructure/agent-control/rhel.yml b/recipes/newrelic/infrastructure/agent-control/rhel.yml index 8b543cce5..34e8c52d4 100644 --- a/recipes/newrelic/infrastructure/agent-control/rhel.yml +++ b/recipes/newrelic/infrastructure/agent-control/rhel.yml @@ -29,7 +29,7 @@ installTargets: - type: host os: linux platform: redhat - platformVersion: "(7|8|9)\\.*" + platformVersion: "(7|8|9|10)\\.*" keywords: - AgentControl @@ -43,6 +43,7 @@ keywords: - RHEL 7 - RHEL 8 - RHEL 9 + - RHEL 10 - Amazon Linux - Amazon Linux AMI - Amazon Linux 2 diff --git a/recipes/newrelic/infrastructure/centos_rhel.yml b/recipes/newrelic/infrastructure/centos_rhel.yml index 331d6326d..f4c9ef19e 100644 --- a/recipes/newrelic/infrastructure/centos_rhel.yml +++ b/recipes/newrelic/infrastructure/centos_rhel.yml @@ -19,6 +19,7 @@ keywords: - RHEL 7 - RHEL 8 - RHEL 9 + - RHEL 10 processMatch: [] @@ -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: diff --git a/test/definitions/agent-control/logs/redhat10-agent-control-logs.json b/test/definitions/agent-control/logs/redhat10-agent-control-logs.json new file mode 100644 index 000000000..304d69eb0 --- /dev/null +++ b/test/definitions/agent-control/logs/redhat10-agent-control-logs.json @@ -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 + } + } + ] + } +} diff --git a/test/definitions/infra-agent/RHEL10-infra.json b/test/definitions/infra-agent/RHEL10-infra.json new file mode 100644 index 000000000..b91438f71 --- /dev/null +++ b/test/definitions/infra-agent/RHEL10-infra.json @@ -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 + } + } + ] + } + } \ No newline at end of file diff --git a/test/definitions/logging/RHEL10.json b/test/definitions/logging/RHEL10.json new file mode 100644 index 000000000..fa7468acc --- /dev/null +++ b/test/definitions/logging/RHEL10.json @@ -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 + } + } + ] + } + }