Skip to content

Commit 8ec70e9

Browse files
shashank-reddy-nrshashank-reddy-nr
authored
Merge pull request #1144 from newrelic/agent_control_renaming
fix(agent-control): rename Super Agent to Agent Control in OIL
2 parents 7ed34dd + f3dea42 commit 8ec70e9

File tree

46 files changed

+408
-444
lines changed

Some content is hidden

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

46 files changed

+408
-444
lines changed

‎docs/recipe-spec/recipe-spec.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ repository: string, required
4141
# dependencies:
4242
# - infrastructure-agent-installer
4343
#
44-
# A special 'OR' variant for recipe dependencies involves the infrastructure and super agents. It allows the super-agent
45-
# to be used as an alternative recipe dependency instead of the infrastructure-agent-installer when the super-agent is a targeted install:
44+
# A special 'OR' variant for recipe dependencies involves the infrastructure and agent controls. It allows the agent-control
45+
# to be used as an alternative recipe dependency instead of the infrastructure-agent-installer when the agent-control is a targeted install:
4646
# ex:
4747
# dependencies:
48-
# - infrastructure-agent-installer || super-agent
48+
# - infrastructure-agent-installer || agent-control
4949
dependencies: list, optional
5050

5151
# Still TBD

‎recipes/newrelic/infrastructure/super-agent/debian.yml renamed to ‎recipes/newrelic/infrastructure/agent-control/debian.yml

Lines changed: 96 additions & 108 deletions
Large diffs are not rendered by default.

‎recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml renamed to ‎recipes/newrelic/infrastructure/agent-control/logs/linux-logs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Visit our schema definition for additional information on this file format
22
# https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
33

4-
name: logs-integration-super-agent
4+
name: logs-integration-agent-control
55
displayName: Logs Integration
6-
description: New Relic install recipe for Logging in super-agent
6+
description: New Relic install recipe for Logging in agent-control
77
repository: https://github.com/newrelic/infrastructure-agent/tree/master/assets/examples/logging
88

99
installTargets:
@@ -135,7 +135,7 @@ install:
135135
rm /etc/newrelic-infra/logging.d/discovered.yml;
136136
fi
137137
- |
138-
if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" != "otel" ]; then
138+
if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" != "otel" ]; then
139139
mkdir -p "/etc/newrelic-infra/logging.d"
140140
touch /etc/newrelic-infra/logging.d/logging.yml;
141141
touch /etc/newrelic-infra/logging.d/discovered.yml;
@@ -144,7 +144,7 @@ install:
144144
setup:
145145
cmds:
146146
- |
147-
if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" != "otel" ]; then
147+
if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" != "otel" ]; then
148148
NR_CLI_SKIP_LOGS={{.NR_CLI_SKIP_LOGS}}
149149
target_log_files=()
150150
target_discovered_log_files=()
@@ -259,15 +259,15 @@ install:
259259
- |
260260
sleep 10
261261
- |
262-
if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" != "otel" ]; then
262+
if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" != "otel" ]; then
263263
echo "Log configuration:" | tee -a {{.NEW_RELIC_CLI_LOG_FILE_PATH}} > /dev/null
264264
cat /etc/newrelic-infra/logging.d/logging.yml | tee -a {{.NEW_RELIC_CLI_LOG_FILE_PATH}} > /dev/null
265265
echo "Log installation completed" | tee -a {{.NEW_RELIC_CLI_LOG_FILE_PATH}} > /dev/null
266266
fi
267267
268268
postInstall:
269269
info: |2
270-
⚙️ If NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE was set to 'newrelic':
270+
⚙️ If NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE was set to 'newrelic':
271271
⚙️ The Logs configuration file (base configuration) can be found in /etc/newrelic-infra/logging.d/logging.yml
272272
⚙️ The Logs configuration file for discovered processes can be found in /etc/newrelic-infra/logging.d/discovered.yml
273273
Edit these files to make changes or configure advanced features for the Logs integration. See the docs for options:

‎recipes/newrelic/infrastructure/super-agent/rhel.yml renamed to ‎recipes/newrelic/infrastructure/agent-control/rhel.yml

Lines changed: 98 additions & 110 deletions
Large diffs are not rendered by default.

‎recipes/newrelic/infrastructure/super-agent/suse.yml renamed to ‎recipes/newrelic/infrastructure/agent-control/suse.yml

Lines changed: 98 additions & 110 deletions
Large diffs are not rendered by default.

‎recipes/newrelic/infrastructure/ohi/mysql/debian.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: New Relic install recipe for default MySQL Open Source on-host inte
77
repository: https://github.com/newrelic/nri-mysql
88

99
dependencies:
10-
- infrastructure-agent-installer || super-agent
10+
- infrastructure-agent-installer || agent-control
1111

1212
installTargets:
1313
- type: host
@@ -82,9 +82,9 @@ install:
8282
cmds:
8383
- |
8484
IS_INFRA_INSTALLED=$(sudo ps aux | grep newrelic-infra-service | grep -v grep | wc -l)
85-
IS_SUPER_AGENT_INSTALLED=$(sudo ps aux | grep newrelic-super-agent | grep -v grep | wc -l)
86-
if [ $IS_INFRA_INSTALLED -eq 0 ] && [ $IS_SUPER_AGENT_INSTALLED -eq 0 ] ; then
87-
echo "The infrastructure agent or the super agent is required to install this integration. We recommend going through our guided install path for this pre-requisite which can be found at: https://docs.newrelic.com/docs/full-stack-observability/observe-everything/get-started/new-relic-guided-install-overview" >&2
85+
IS_AGENT_CONTROL_INSTALLED=$(sudo ps aux | grep newrelic-agent-control | grep -v grep | wc -l)
86+
if [ $IS_INFRA_INSTALLED -eq 0 ] && [ $IS_AGENT_CONTROL_INSTALLED -eq 0 ] ; then
87+
echo "The infrastructure agent or the agent control is required to install this integration. We recommend going through our guided install path for this pre-requisite which can be found at: https://docs.newrelic.com/docs/full-stack-observability/observe-everything/get-started/new-relic-guided-install-overview" >&2
8888
exit 1
8989
fi
9090

‎test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json renamed to ‎test/definitions-eu/agent-control/debians/debian11-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"instrumentations": {
1919
"resources": [
2020
{
21-
"id": "nr_super_agent",
21+
"id": "nr_agent_control",
2222
"resource_ids": ["host1"],
2323
"provider": "newrelic",
2424
"source_repository": "https://github.com/newrelic/open-install-library.git",
2525
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2626
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
27+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
2828
"validate_output": "Agent Control\\s+\\(installed\\)",
29-
"recipe_targeted": "super-agent",
29+
"recipe_targeted": "agent-control",
3030
"use_organization_id": true
3131
}
3232
}

‎test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json renamed to ‎test/definitions-eu/agent-control/debians/ubuntu16-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"instrumentations": {
1919
"resources": [
2020
{
21-
"id": "nr_super_agent",
21+
"id": "nr_agent_control",
2222
"resource_ids": ["ubuntu16-super-eu"],
2323
"provider": "newrelic",
2424
"source_repository": "https://github.com/newrelic/open-install-library.git",
2525
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2626
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
27+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
2828
"validate_output": "Agent Control\\s+\\(installed\\)",
29-
"recipe_targeted": "super-agent",
29+
"recipe_targeted": "agent-control",
3030
"use_organization_id": true
3131
}
3232
}

‎test/definitions/super-agent/debians/ubuntu18-super-agent.json renamed to ‎test/definitions-eu/agent-control/debians/ubuntu18-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"instrumentations": {
1919
"resources": [
2020
{
21-
"id": "nr_super_agent",
21+
"id": "nr_agent_control",
2222
"resource_ids": ["host1"],
2323
"provider": "newrelic",
2424
"source_repository": "https://github.com/newrelic/open-install-library.git",
2525
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2626
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
27+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
2828
"validate_output": "Agent Control\\s+\\(installed\\)",
29-
"recipe_targeted": "super-agent",
29+
"recipe_targeted": "agent-control",
3030
"use_organization_id": true
3131
}
3232
}

‎test/definitions/super-agent/debians/ubuntu20-super-agent.json renamed to ‎test/definitions-eu/agent-control/debians/ubuntu20-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
"instrumentations": {
2121
"resources": [
2222
{
23-
"id": "nr_super_agent",
23+
"id": "nr_agent_control",
2424
"resource_ids": ["host1"],
2525
"provider": "newrelic",
2626
"source_repository": "https://github.com/newrelic/open-install-library.git",
2727
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2828
"params": {
29-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
29+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
3030
"validate_output": "Agent Control\\s+\\(installed\\)",
31-
"recipe_targeted": "super-agent",
31+
"recipe_targeted": "agent-control",
3232
"use_organization_id": true
3333
}
3434
}

‎test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json renamed to ‎test/definitions-eu/agent-control/debians/ubuntu20arm64-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
"instrumentations": {
2121
"resources": [
2222
{
23-
"id": "nr_super_agent",
23+
"id": "nr_agent_control",
2424
"resource_ids": ["host1"],
2525
"provider": "newrelic",
2626
"source_repository": "https://github.com/newrelic/open-install-library.git",
2727
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2828
"params": {
29-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
29+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
3030
"validate_output": "Agent Control\\s+\\(installed\\)",
31-
"recipe_targeted": "super-agent",
31+
"recipe_targeted": "agent-control",
3232
"use_organization_id": true
3333
}
3434
}

‎test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json renamed to ‎test/definitions-eu/agent-control/debians/ubuntu22-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
"instrumentations": {
2121
"resources": [
2222
{
23-
"id": "nr_super_agent",
23+
"id": "nr_agent_control",
2424
"resource_ids": ["host1"],
2525
"provider": "newrelic",
2626
"source_repository": "https://github.com/newrelic/open-install-library.git",
2727
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2828
"params": {
29-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
29+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
3030
"validate_output": "Agent Control\\s+\\(installed\\)",
31-
"recipe_targeted": "super-agent",
31+
"recipe_targeted": "agent-control",
3232
"use_organization_id": true
3333
}
3434
}

‎test/definitions-eu/super-agent/logs/amazonlinux2-super-agent-logs-eu.json renamed to ‎test/definitions-eu/agent-control/logs/amazonlinux2-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"instrumentations": {
2020
"resources": [
2121
{
22-
"id": "nr_super_agent_logs",
22+
"id": "nr_agent_control_logs",
2323
"resource_ids": ["host1"],
2424
"provider": "newrelic",
2525
"source_repository": "https://github.com/newrelic/open-install-library",
2626
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2727
"params": {
2828
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
29-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
29+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
3030
"validate_output": "Logs Integration\\s+\\(installed\\)",
3131
"local_recipes": true,
3232
"use_organization_id": true

‎test/definitions/super-agent/logs/amazonlinux2023-x86-super-agent-logs.json renamed to ‎test/definitions-eu/agent-control/logs/amazonlinux2023-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
"instrumentations": {
2121
"resources": [
2222
{
23-
"id": "nr_super_agent_logs",
23+
"id": "nr_agent_control_logs",
2424
"resource_ids": ["host1"],
2525
"provider": "newrelic",
2626
"source_repository": "https://github.com/newrelic/open-install-library",
2727
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2828
"params": {
2929
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
30-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
30+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
3131
"validate_output": "Logs Integration\\s+\\(installed\\)",
3232
"local_recipes": true,
3333
"use_organization_id": true

‎test/definitions/super-agent/logs/debian11-super-agent-logs.json renamed to ‎test/definitions-eu/agent-control/logs/debian11-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
"instrumentations": {
2121
"resources": [
2222
{
23-
"id": "nr_super_agent_logs",
23+
"id": "nr_agent_control_logs",
2424
"resource_ids": ["host1"],
2525
"provider": "newrelic",
2626
"source_repository": "https://github.com/newrelic/open-install-library",
2727
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2828
"params": {
2929
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
30-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
30+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
3131
"validate_output": "Logs Integration\\s+\\(installed\\)",
3232
"local_recipes": true,
3333
"use_organization_id": true

‎test/definitions-eu/super-agent/logs/redhat8-super-agent-logs-eu.json renamed to ‎test/definitions-eu/agent-control/logs/redhat8-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"instrumentations": {
2020
"resources": [
2121
{
22-
"id": "nr_super_agent_logs",
22+
"id": "nr_agent_control_logs",
2323
"resource_ids": ["host1"],
2424
"provider": "newrelic",
2525
"source_repository": "https://github.com/newrelic/open-install-library",
2626
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2727
"params": {
2828
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
29-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
29+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
3030
"validate_output": "Logs Integration\\s+\\(installed\\)",
3131
"local_recipes": true,
3232
"use_organization_id": true

‎test/definitions/super-agent/logs/redhat9-super-agent-logs.json renamed to ‎test/definitions-eu/agent-control/logs/redhat9-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
"instrumentations": {
2020
"resources": [
2121
{
22-
"id": "nr_super_agent_logs",
22+
"id": "nr_agent_control_logs",
2323
"resource_ids": ["host1"],
2424
"provider": "newrelic",
2525
"source_repository": "https://github.com/newrelic/open-install-library",
2626
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2727
"params": {
2828
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
29-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
29+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
3030
"validate_output": "Logs Integration\\s+\\(installed\\)",
3131
"local_recipes": true,
3232
"use_organization_id": true

‎test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json renamed to ‎test/definitions-eu/agent-control/logs/suse154-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"instrumentations": {
1818
"resources": [
1919
{
20-
"id": "nr_super_agent_logs",
20+
"id": "nr_agent_control_logs",
2121
"resource_ids": ["host1"],
2222
"provider": "newrelic",
2323
"source_repository": "https://github.com/newrelic/open-install-library",
2424
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2525
"params": {
2626
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
27-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
27+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
2828
"validate_output": "Logs Integration\\s+\\(installed\\)",
2929
"local_recipes": true,
3030
"use_organization_id": true

‎test/definitions/super-agent/logs/ubuntu20-super-agent-logs.json renamed to ‎test/definitions-eu/agent-control/logs/ubuntu20-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
"instrumentations": {
2121
"resources": [
2222
{
23-
"id": "nr_super_agent_logs",
23+
"id": "nr_agent_control_logs",
2424
"resource_ids": ["host1"],
2525
"provider": "newrelic",
2626
"source_repository": "https://github.com/newrelic/open-install-library",
2727
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2828
"params": {
2929
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
30-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
30+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
3131
"validate_output": "Logs Integration\\s+\\(installed\\)",
3232
"local_recipes": true,
3333
"use_organization_id": true

‎test/definitions/super-agent/logs/ubuntu22-super-agent-logs.json renamed to ‎test/definitions-eu/agent-control/logs/ubuntu22-agent-control-logs-eu.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
"instrumentations": {
2121
"resources": [
2222
{
23-
"id": "nr_super_agent_logs",
23+
"id": "nr_agent_control_logs",
2424
"resource_ids": ["host1"],
2525
"provider": "newrelic",
2626
"source_repository": "https://github.com/newrelic/open-install-library",
2727
"deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
2828
"params": {
2929
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
30-
"newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
30+
"newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
3131
"validate_output": "Logs Integration\\s+\\(installed\\)",
3232
"local_recipes": true,
3333
"use_organization_id": true

‎test/definitions/super-agent/rhel/awslinux23-super-agent.json renamed to ‎test/definitions-eu/agent-control/rhel/awslinux23-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"instrumentations": {
1919
"resources": [
2020
{
21-
"id": "nr_super_agent",
21+
"id": "nr_agent_control",
2222
"resource_ids": ["host1"],
2323
"provider": "newrelic",
2424
"source_repository": "https://github.com/newrelic/open-install-library.git",
2525
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2626
"params": {
27-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
27+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
2828
"validate_output": "Agent Control\\s+\\(installed\\)",
29-
"recipe_targeted": "super-agent",
29+
"recipe_targeted": "agent-control",
3030
"use_organization_id": true
3131
}
3232
}

‎test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json renamed to ‎test/definitions-eu/agent-control/rhel/awslinuxarm64-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"instrumentations": {
1818
"resources": [
1919
{
20-
"id": "nr_super_agent",
20+
"id": "nr_agent_control",
2121
"resource_ids": ["host1"],
2222
"provider": "newrelic",
2323
"source_repository": "https://github.com/newrelic/open-install-library.git",
2424
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2525
"params": {
26-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
26+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
2727
"validate_output": "Agent Control\\s+\\(installed\\)",
28-
"recipe_targeted": "super-agent",
28+
"recipe_targeted": "agent-control",
2929
"use_organization_id": true
3030
}
3131
}

‎test/definitions/super-agent/rhel/redhat8arm64-super-agent.json renamed to ‎test/definitions-eu/agent-control/rhel/redhat8arm64-agent-control-eu.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"instrumentations": {
1818
"resources": [
1919
{
20-
"id": "nr_super_agent",
20+
"id": "nr_agent_control",
2121
"resource_ids": ["host1"],
2222
"provider": "newrelic",
2323
"source_repository": "https://github.com/newrelic/open-install-library.git",
2424
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
2525
"params": {
26-
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
26+
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
2727
"validate_output": "Agent Control\\s+\\(installed\\)",
28-
"recipe_targeted": "super-agent",
28+
"recipe_targeted": "agent-control",
2929
"use_organization_id": true
3030
}
3131
}

0 commit comments

Comments
 (0)