diff --git a/docs/recipe-spec/recipe-spec.md b/docs/recipe-spec/recipe-spec.md
index 0f2628f15..39004af89 100644
--- a/docs/recipe-spec/recipe-spec.md
+++ b/docs/recipe-spec/recipe-spec.md
@@ -41,11 +41,11 @@ repository: string, required
# dependencies:
# - infrastructure-agent-installer
#
-# A special 'OR' variant for recipe dependencies involves the infrastructure and super agents. It allows the super-agent
-# to be used as an alternative recipe dependency instead of the infrastructure-agent-installer when the super-agent is a targeted install:
+# A special 'OR' variant for recipe dependencies involves the infrastructure and agent controls. It allows the agent-control
+# to be used as an alternative recipe dependency instead of the infrastructure-agent-installer when the agent-control is a targeted install:
# ex:
# dependencies:
-# - infrastructure-agent-installer || super-agent
+# - infrastructure-agent-installer || agent-control
dependencies: list, optional
# Still TBD
diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/agent-control/debian.yml
similarity index 79%
rename from recipes/newrelic/infrastructure/super-agent/debian.yml
rename to recipes/newrelic/infrastructure/agent-control/debian.yml
index c0cc2b821..704251af2 100644
--- a/recipes/newrelic/infrastructure/super-agent/debian.yml
+++ b/recipes/newrelic/infrastructure/agent-control/debian.yml
@@ -1,10 +1,10 @@
# Visit our schema definition for additional information on this file format.
# https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
-name: super-agent
+name: agent-control
displayName: Agent Control
description: New Relic install recipe for Agent Control
-repository: https://github.com/newrelic/newrelic-super-agent
+repository: https://github.com/newrelic/newrelic-agent-control
installTargets:
- type: host
@@ -17,7 +17,7 @@ installTargets:
platformVersion: "(16|18|20|22|24)\\.04"
keywords:
- - SuperAgent
+ - AgentControl
- OpenTelemetry
- OTel
- Infrastructure
@@ -81,18 +81,18 @@ install:
- task: add_gpg_key
- task: add_nr_source
- task: update_apt_nr_source
- - task: install_super_agent
+ - task: install_agent_control
- task: update_otel_license_key
- task: config_supervisors
- task: config_fleet_id
- - task: config_opamp
- - task: config_super_agent_auth
+ - task: config_fleet_control
+ - task: config_agent_control_auth
- task: config_host_monitoring
- task: update_otel_mem_limit
- task: update_otel_end_point
- task: migrate_newrelic_infra_config
- - task: restart_super_agent
- - task: assert_super_agent_status_ok
+ - task: restart_agent_control
+ - task: assert_agent_control_status_ok
- task: signal_recipe_applied
- task: post_install
@@ -104,9 +104,9 @@ install:
detect_previous_install:
cmds:
- |
- if [ -f /etc/newrelic-super-agent/.nr-cli ] ; then
+ if [ -f /etc/newrelic-agent-control/.nr-cli ] ; then
echo "A previous execution of this installation was detected. Some installation tasks will be skipped."
- echo "If you would like to run all the tasks, please remove the /etc/newrelic-super-agent/.nr-cli file and re-run the installation."
+ echo "If you would like to run all the tasks, please remove the /etc/newrelic-agent-control/.nr-cli file and re-run the installation."
fi
assert_pre_req:
@@ -199,7 +199,7 @@ install:
cleanup:
# skipping this task if .nr-cli exists
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] ; then
@@ -208,7 +208,7 @@ install:
setup_infra_license:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] ; then
@@ -224,7 +224,7 @@ install:
sed -i '/^custom_attributes:/d' /etc/newrelic-infra.yml
sed -i "/^is_integrations_only/d" /etc/newrelic-infra.yml
- if [ "{{.NR_SA_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
+ if [ "{{.NR_AC_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
touch /etc/newrelic-infra-do-migrate
else
printf "\nWould you like to migrate this newrelic-infra config to use it with New Relic Agent Control? (y/N): "
@@ -254,7 +254,7 @@ install:
fi
setup_infra_proxy:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] && [ ! -z "$HTTPS_PROXY" ]; then
@@ -341,17 +341,17 @@ install:
# apt will return an error if fails to update any of its sources. Ignore these errors and let the "install_infra" task fail. Just to trigger the pipeline
ignore_error: true
- install_super_agent:
+ install_agent_control:
cmds:
- |
OPTIONS="-o DPkg::Lock::Timeout=60"
if [ ! -z "$HTTPS_PROXY" ]; then
OPTIONS="$OPTIONS -o Acquire::Http::Proxy={{.HTTPS_PROXY}}"
fi
- apt-get $OPTIONS install newrelic-super-agent -y -qq
+ apt-get $OPTIONS install newrelic-agent-control -y -qq
# Check the exit status of the previous command
if [ $? -ne 0 ]; then
- echo "Error: newrelic-super-agent installation failed"
+ echo "Error: newrelic-agent-control installation failed"
echo "Attempting to configure the packages again"
dpkg --configure -a
# Check if there was an error
@@ -371,7 +371,7 @@ install:
# If configured to do so, migrate the newrelic-infra configuration for usage with New Relic Agent Control
migrate_newrelic_infra_config:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ -f /etc/newrelic-infra-do-migrate ]; then
@@ -379,137 +379,125 @@ install:
newrelic-config-migrate
fi
- # Add NR Ingest Key as ENV Var for the super-agent Systemd service (used by Infra Agent and Otel)
+ # Add NR Ingest Key as ENV Var for the agent-control Systemd service (used by Infra Agent and Otel)
update_otel_license_key:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- sed -i "/^NEW_RELIC_LICENSE_KEY/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
- echo 'NEW_RELIC_LICENSE_KEY="{{.NEW_RELIC_LICENSE_KEY}}"' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
+ sed -i "/^NEW_RELIC_LICENSE_KEY/d" /etc/newrelic-agent-control/newrelic-agent-control.conf
+ echo 'NEW_RELIC_LICENSE_KEY="{{.NEW_RELIC_LICENSE_KEY}}"' >> /etc/newrelic-agent-control/newrelic-agent-control.conf
update_otel_mem_limit:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
- sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
- # Add OTLP Endpoint as ENV Var for the Super Agent Systemd service
+ # Add OTLP Endpoint as ENV Var for the Agent Control Systemd service
update_otel_end_point:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
- sed -i "s/endpoint: .*$/endpoint: https:\/\/staging-otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/staging-otlp.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
- sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.eu01.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.eu01.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
else
- sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
fi
config_supervisors:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
- cp /etc/newrelic-super-agent/examples/super-agent-config-no-agents.yaml /etc/newrelic-super-agent/config.yaml
+ cp /etc/newrelic-agent-control/examples/agent-control-config-no-agents.yaml /etc/newrelic-agent-control/config.yaml
+ elif [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
+ cp /etc/newrelic-agent-control/examples/agent-control-config-nr-otel-collector.yaml /etc/newrelic-agent-control/config.yaml
+ elif [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
+ cp /etc/newrelic-agent-control/examples/agent-control-config-nr-infra-agent.yaml /etc/newrelic-agent-control/config.yaml
else
- cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
- fi
- - |
- if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
- sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
- else
- sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
- fi
- - |
- if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
- sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
- else
- sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
+ cp /etc/newrelic-agent-control/examples/agent-control-config-all-agents.yaml /etc/newrelic-agent-control/config.yaml
fi
config_fleet_id:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ ! -z "{{.NR_CLI_FLEET_ID}}" ] ; then
- sed -i 's/^#\s*fleet_id:/fleet_id:/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*#\s*fleet_id:/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-agent-control/config.yaml
fi
- config_opamp:
+ config_fleet_control:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" = "false" ]; then
- sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
+ sed -i '/^\s*fleet_control:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-agent-control/config.yaml
else
- sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/s*#\s*fleet_control:/fleet_control:/g' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" = "false" ]; then
- sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
+ sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-agent-control/config.yaml
else
- sed -i '/^\s*#\s*api-key:/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*headers:/s/# //' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*#\s*api-key:/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*headers:/s/# //' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] ; then
- sed -i 's/api-key: API_KEY_HERE/api-key: {{ .NEW_RELIC_LICENSE_KEY }}/g' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] ; then
+ sed -i 's/api-key: API_KEY_HERE/api-key: {{ .NEW_RELIC_LICENSE_KEY }}/g' /etc/newrelic-agent-control/config.yaml
fi
- |
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
else
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
fi
- config_super_agent_auth:
+ config_agent_control_auth:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
- sed -i '/^\s*#\s*auth_config:\s*$/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*token_url: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*client_id: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*provider: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*private_key_path: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
+ sed -i '/^\s*#\s*auth_config:\s*$/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*token_url: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*client_id: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*provider: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*private_key_path: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
else
- sed -i '/^\s*auth_config:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*token_url: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*client_id: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*provider: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*private_key_path: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*auth_config:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*token_url: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*client_id: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*provider: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*private_key_path: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
set -uo pipefail
- mkdir -p /etc/newrelic-super-agent/keys
- chown root:root /etc/newrelic-super-agent/keys
- chmod 700 /etc/newrelic-super-agent/keys
+ mkdir -p /etc/newrelic-agent-control/keys
+ chown root:root /etc/newrelic-agent-control/keys
+ chmod 700 /etc/newrelic-agent-control/keys
- TEMPORAL_FOLDER=$(mktemp -d newrelic-super-agent.XXXXXXXXXX)
+ TEMPORAL_FOLDER=$(mktemp -d newrelic-agent-control.XXXXXXXXXX)
chown root:root "${TEMPORAL_FOLDER}"
chmod 700 "${TEMPORAL_FOLDER}"
trap "rm -rf $TEMPORAL_FOLDER" EXIT
@@ -656,43 +644,43 @@ install:
CLIENT_ID=$(/usr/local/bin/newrelic utils jq '.data.systemIdentityCreate.clientId' < "$TEMPORAL_FOLDER/response.json" | tr -d '"' )
fi
- mv "$TEMPORAL_FOLDER/key" "/etc/newrelic-super-agent/keys/$CLIENT_ID.key"
- sed -i 's~token_url: PLACEHOLDER~token_url: '"$TOKEN_RENEWAL_ENDPOINT"'~g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/client_id: PLACEHOLDER/client_id: '"$CLIENT_ID"'/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/provider: PLACEHOLDER/provider: local/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's~private_key_path: PLACEHOLDER~private_key_path: '"/etc/newrelic-super-agent/keys/$CLIENT_ID.key"'~g' /etc/newrelic-super-agent/config.yaml
+ mv "$TEMPORAL_FOLDER/key" "/etc/newrelic-agent-control/keys/$CLIENT_ID.key"
+ sed -i 's~token_url: PLACEHOLDER~token_url: '"$TOKEN_RENEWAL_ENDPOINT"'~g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/client_id: PLACEHOLDER/client_id: '"$CLIENT_ID"'/g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/provider: PLACEHOLDER/provider: local/g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's~private_key_path: PLACEHOLDER~private_key_path: '"/etc/newrelic-agent-control/keys/$CLIENT_ID.key"'~g' /etc/newrelic-agent-control/config.yaml
fi
config_host_monitoring:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" = "otel" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" = "otel" ]; then
echo 'is_integrations_only: true' >> /etc/newrelic-infra.yml
- mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
- cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-agent-linux.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ mkdir -p /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values
+ cp /etc/newrelic-agent-control/examples/values-nr-otel-collector-agent-linux.yaml /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
else
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
- mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
- cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-gateway.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ mkdir -p /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values
+ cp /etc/newrelic-agent-control/examples/values-nr-otel-collector-gateway.yaml /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
fi
- restart_super_agent:
+ restart_agent_control:
cmds:
- |
if [ {{.IS_SYSTEMCTL}} -gt 0 ]; then
- systemctl restart newrelic-super-agent
+ systemctl restart newrelic-agent-control
else
if [ {{.IS_INITCTL}} -gt 0 ]; then
- initctl restart newrelic-super-agent
+ initctl restart newrelic-agent-control
else
- /etc/init.d/newrelic-super-agent restart
+ /etc/init.d/newrelic-agent-control restart
fi
fi
- assert_super_agent_status_ok:
+ assert_agent_control_status_ok:
cmds:
- |
MAX_RETRIES=150
@@ -706,23 +694,23 @@ install:
# so jq doesn't fail if empty
statusCheckOutput="{}"
fi
- STATUS=$(echo $statusCheckOutput | /usr/local/bin/newrelic utils jq '.super_agent.healthy')
+ STATUS=$(echo $statusCheckOutput | /usr/local/bin/newrelic utils jq '.agent_control.healthy')
if [ "$STATUS" == "true" ]; then
echo "Agent status check ok."
break
else
if [ "$TRIES" -eq "$MAX_RETRIES" ]; then
# Process-based validation attempt
- IS_AGENT_INSTALLED=$(ps aux | grep newrelic-super-agent | grep -v grep | wc -l)
+ IS_AGENT_INSTALLED=$(ps aux | grep newrelic-agent-control | grep -v grep | wc -l)
if [ $IS_AGENT_INSTALLED -gt 0 ] ; then
- echo "detected newrelic-super-agent process running"
+ echo "detected newrelic-agent-control process running"
exit 0
fi
echo "New Relic Agent Control has not started after installing. Please try again later, or see our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
if [ {{.IS_SYSTEMCTL}} -gt 0 ]; then
- journalctl -u newrelic-super-agent --no-pager
+ journalctl -u newrelic-agent-control --no-pager
fi
exit 31
@@ -735,8 +723,8 @@ install:
signal_recipe_applied:
cmds:
- |
- touch /etc/newrelic-super-agent/.nr-cli
+ touch /etc/newrelic-agent-control/.nr-cli
post_install:
info: |2
- ⚙️ New Relic Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml
+ ⚙️ New Relic Agent Control configuration file can be found in /etc/newrelic-agent-control/config.yaml
diff --git a/recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml b/recipes/newrelic/infrastructure/agent-control/logs/linux-logs.yml
similarity index 95%
rename from recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml
rename to recipes/newrelic/infrastructure/agent-control/logs/linux-logs.yml
index 2ecfc1423..d2d9c4ec8 100644
--- a/recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml
+++ b/recipes/newrelic/infrastructure/agent-control/logs/linux-logs.yml
@@ -1,9 +1,9 @@
# Visit our schema definition for additional information on this file format
# https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
-name: logs-integration-super-agent
+name: logs-integration-agent-control
displayName: Logs Integration
-description: New Relic install recipe for Logging in super-agent
+description: New Relic install recipe for Logging in agent-control
repository: https://github.com/newrelic/infrastructure-agent/tree/master/assets/examples/logging
installTargets:
@@ -135,7 +135,7 @@ install:
rm /etc/newrelic-infra/logging.d/discovered.yml;
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" != "otel" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" != "otel" ]; then
mkdir -p "/etc/newrelic-infra/logging.d"
touch /etc/newrelic-infra/logging.d/logging.yml;
touch /etc/newrelic-infra/logging.d/discovered.yml;
@@ -144,7 +144,7 @@ install:
setup:
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" != "otel" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" != "otel" ]; then
NR_CLI_SKIP_LOGS={{.NR_CLI_SKIP_LOGS}}
target_log_files=()
target_discovered_log_files=()
@@ -259,7 +259,7 @@ install:
- |
sleep 10
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" != "otel" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" != "otel" ]; then
echo "Log configuration:" | tee -a {{.NEW_RELIC_CLI_LOG_FILE_PATH}} > /dev/null
cat /etc/newrelic-infra/logging.d/logging.yml | tee -a {{.NEW_RELIC_CLI_LOG_FILE_PATH}} > /dev/null
echo "Log installation completed" | tee -a {{.NEW_RELIC_CLI_LOG_FILE_PATH}} > /dev/null
@@ -267,7 +267,7 @@ install:
postInstall:
info: |2
- ⚙️ If NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE was set to 'newrelic':
+ ⚙️ If NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE was set to 'newrelic':
⚙️ The Logs configuration file (base configuration) can be found in /etc/newrelic-infra/logging.d/logging.yml
⚙️ The Logs configuration file for discovered processes can be found in /etc/newrelic-infra/logging.d/discovered.yml
Edit these files to make changes or configure advanced features for the Logs integration. See the docs for options:
diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/agent-control/rhel.yml
similarity index 76%
rename from recipes/newrelic/infrastructure/super-agent/rhel.yml
rename to recipes/newrelic/infrastructure/agent-control/rhel.yml
index 04432cf51..c008907ab 100644
--- a/recipes/newrelic/infrastructure/super-agent/rhel.yml
+++ b/recipes/newrelic/infrastructure/agent-control/rhel.yml
@@ -1,10 +1,10 @@
# Visit our schema definition for additional information on this file format.
# https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
-name: super-agent
+name: agent-control
displayName: Agent Control
description: New Relic install recipe for Agent Control
-repository: https://github.com/newrelic/newrelic-super-agent
+repository: https://github.com/newrelic/newrelic-agent-control
installTargets:
- type: host
@@ -32,7 +32,7 @@ installTargets:
platformVersion: "(7|8|9)\\.*"
keywords:
- - SuperAgent
+ - AgentControl
- OpenTelemetry
- OTel
- Infrastructure
@@ -101,18 +101,18 @@ install:
- task: cleanup
- task: setup_infra_license
- task: setup_infra_proxy
- - task: install_super_agent
+ - task: install_agent_control
- task: update_otel_license_key
- task: config_supervisors
- task: config_fleet_id
- - task: config_opamp
- - task: config_super_agent_auth
+ - task: config_fleet_control
+ - task: config_agent_control_auth
- task: config_host_monitoring
- task: update_otel_mem_limit
- task: update_otel_end_point
- task: migrate_newrelic_infra_config
- - task: restart_super_agent
- - task: assert_super_agent_status_ok
+ - task: restart_agent_control
+ - task: assert_agent_control_status_ok
- task: signal_recipe_applied
- task: post_install
@@ -124,9 +124,9 @@ install:
detect_previous_install:
cmds:
- |
- if [ -f /etc/newrelic-super-agent/.nr-cli ] ; then
+ if [ -f /etc/newrelic-agent-control/.nr-cli ] ; then
echo "A previous execution of this installation was detected. Some installation tasks will be skipped."
- echo "If you would like to run all the tasks, please remove the /etc/newrelic-super-agent/.nr-cli file and re-run the installation."
+ echo "If you would like to run all the tasks, please remove the /etc/newrelic-agent-control/.nr-cli file and re-run the installation."
fi
assert_pre_req:
@@ -210,7 +210,7 @@ install:
cleanup:
# skipping this task if .nr-cli exists
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] ; then
@@ -219,7 +219,7 @@ install:
setup_infra_license:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] ; then
@@ -235,7 +235,7 @@ install:
sed -i '/^custom_attributes:/d' /etc/newrelic-infra.yml
sed -i "/^is_integrations_only/d" /etc/newrelic-infra.yml
- if [ "{{.NR_SA_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
+ if [ "{{.NR_AC_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
touch /etc/newrelic-infra-do-migrate
else
printf "\nWould you like to migrate this newrelic-infra config to use it with New Relic Agent Control? (y/N): "
@@ -281,27 +281,27 @@ install:
fi
fi
- install_super_agent:
+ install_agent_control:
cmds:
- |
if [ "{{.AMAZON_LINUX_VERSION}}" != "2" ] && [ "{{.AMAZON_LINUX_VERSION}}" != "2023" ] ; then
- SUPER_AGENT_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
+ AGENT_CONTROL_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
INFRA_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/yum/{{.REPO_DIR}}/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
else
- SUPER_AGENT_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.AMAZON_LINUX_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
+ AGENT_CONTROL_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.AMAZON_LINUX_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
INFRA_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/yum/{{.REPO_DIR}}/{{.AMAZON_LINUX_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
fi
- IS_NEWRELIC_AVAILABLE=$(curl -Ls $SUPER_AGENT_REPO_URL | grep "\[newrelic-infra\]" | wc -l)
+ IS_NEWRELIC_AVAILABLE=$(curl -Ls $AGENT_CONTROL_REPO_URL | grep "\[newrelic-infra\]" | wc -l)
if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
echo "New Relic Agent Control is not available for this architecture {{.ARCH}}. See our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
exit 131
fi
curl -s $INFRA_REPO_URL -o /etc/yum.repos.d/newrelic-infra.repo
- curl -s $SUPER_AGENT_REPO_URL | sed 's/\[newrelic-infra]/\n[newrelic-super-agent]/g' >> /etc/yum.repos.d/newrelic-infra.repo
+ curl -s $AGENT_CONTROL_REPO_URL | sed 's/\[newrelic-infra]/\n[newrelic-agent-control]/g' >> /etc/yum.repos.d/newrelic-infra.repo
- yum -y -q makecache --disablerepo='*' --enablerepo='newrelic-infra' --enablerepo='newrelic-super-agent'
- yum -y -q install newrelic-super-agent
+ yum -y -q makecache --disablerepo='*' --enablerepo='newrelic-infra' --enablerepo='newrelic-agent-control'
+ yum -y -q install newrelic-agent-control
if [ "{{.AMAZON_LINUX_VERSION}}" == "2" ] || [ "{{.AMAZON_LINUX_VERSION}}" == "2023" ] ; then
yum -y -q install fluent-bit
@@ -315,7 +315,7 @@ install:
# If configured to do so, migrate the newrelic-infra configuration for usage with New Relic Agent Control
migrate_newrelic_infra_config:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ -f /etc/newrelic-infra-do-migrate ]; then
@@ -325,134 +325,122 @@ install:
update_otel_license_key:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- sed -i "/^NEW_RELIC_LICENSE_KEY/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
- echo 'NEW_RELIC_LICENSE_KEY="{{.NEW_RELIC_LICENSE_KEY}}"' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
+ sed -i "/^NEW_RELIC_LICENSE_KEY/d" /etc/newrelic-agent-control/newrelic-agent-control.conf
+ echo 'NEW_RELIC_LICENSE_KEY="{{.NEW_RELIC_LICENSE_KEY}}"' >> /etc/newrelic-agent-control/newrelic-agent-control.conf
update_otel_mem_limit:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
- sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
- # Add OTLP Endpoint as ENV Var for the super-agent Systemd service
+ # Add OTLP Endpoint as ENV Var for the agent-control Systemd service
update_otel_end_point:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
- sed -i "s/endpoint: .*$/endpoint: https:\/\/staging-otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/staging-otlp.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
- sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.eu01.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.eu01.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
else
- sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
fi
config_supervisors:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
- cp /etc/newrelic-super-agent/examples/super-agent-config-no-agents.yaml /etc/newrelic-super-agent/config.yaml
+ cp /etc/newrelic-agent-control/examples/agent-control-config-no-agents.yaml /etc/newrelic-agent-control/config.yaml
+ elif [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
+ cp /etc/newrelic-agent-control/examples/agent-control-config-nr-otel-collector.yaml /etc/newrelic-agent-control/config.yaml
+ elif [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
+ cp /etc/newrelic-agent-control/examples/agent-control-config-nr-infra-agent.yaml /etc/newrelic-agent-control/config.yaml
else
- cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
- fi
- - |
- if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
- sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
- else
- sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
- fi
- - |
- if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
- sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
- else
- sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
+ cp /etc/newrelic-agent-control/examples/agent-control-config-all-agents.yaml /etc/newrelic-agent-control/config.yaml
fi
config_fleet_id:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ ! -z "{{.NR_CLI_FLEET_ID}}" ] ; then
- sed -i 's/^#\s*fleet_id:/fleet_id:/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*#\s*fleet_id:/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-agent-control/config.yaml
fi
- config_opamp:
+ config_fleet_control:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" = "false" ]; then
- sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
+ sed -i '/^\s*fleet_control:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-agent-control/config.yaml
else
- sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/s*#\s*fleet_control:/fleet_control:/g' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" = "false" ]; then
- sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
+ sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-agent-control/config.yaml
else
- sed -i '/^\s*#\s*api-key:/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*headers:/s/# //' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*#\s*api-key:/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*headers:/s/# //' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] ; then
- sed -i 's/api-key: API_KEY_HERE/api-key: {{ .NEW_RELIC_LICENSE_KEY }}/g' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] ; then
+ sed -i 's/api-key: API_KEY_HERE/api-key: {{ .NEW_RELIC_LICENSE_KEY }}/g' /etc/newrelic-agent-control/config.yaml
fi
- |
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
else
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
fi
- config_super_agent_auth:
+ config_agent_control_auth:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
- sed -i '/^\s*#\s*auth_config:\s*$/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*token_url: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*client_id: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*provider: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*private_key_path: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
+ sed -i '/^\s*#\s*auth_config:\s*$/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*token_url: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*client_id: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*provider: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*private_key_path: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
else
- sed -i '/^\s*auth_config:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*token_url: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*client_id: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*provider: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*private_key_path: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*auth_config:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*token_url: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*client_id: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*provider: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*private_key_path: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
set -uo pipefail
- mkdir -p /etc/newrelic-super-agent/keys
- chown root:root /etc/newrelic-super-agent/keys
- chmod 700 /etc/newrelic-super-agent/keys
+ mkdir -p /etc/newrelic-agent-control/keys
+ chown root:root /etc/newrelic-agent-control/keys
+ chmod 700 /etc/newrelic-agent-control/keys
- TEMPORAL_FOLDER=$(mktemp -d newrelic-super-agent.XXXXXXXXXX)
+ TEMPORAL_FOLDER=$(mktemp -d newrelic-agent-control.XXXXXXXXXX)
chown root:root "${TEMPORAL_FOLDER}"
chmod 700 "${TEMPORAL_FOLDER}"
trap "rm -rf $TEMPORAL_FOLDER" EXIT
@@ -599,43 +587,43 @@ install:
CLIENT_ID=$(/usr/local/bin/newrelic utils jq '.data.systemIdentityCreate.clientId' < "$TEMPORAL_FOLDER/response.json" | tr -d '"' )
fi
- mv "$TEMPORAL_FOLDER/key" "/etc/newrelic-super-agent/keys/$CLIENT_ID.key"
- sed -i 's~token_url: PLACEHOLDER~token_url: '"$TOKEN_RENEWAL_ENDPOINT"'~g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/client_id: PLACEHOLDER/client_id: '"$CLIENT_ID"'/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/provider: PLACEHOLDER/provider: local/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's~private_key_path: PLACEHOLDER~private_key_path: '"/etc/newrelic-super-agent/keys/$CLIENT_ID.key"'~g' /etc/newrelic-super-agent/config.yaml
+ mv "$TEMPORAL_FOLDER/key" "/etc/newrelic-agent-control/keys/$CLIENT_ID.key"
+ sed -i 's~token_url: PLACEHOLDER~token_url: '"$TOKEN_RENEWAL_ENDPOINT"'~g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/client_id: PLACEHOLDER/client_id: '"$CLIENT_ID"'/g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/provider: PLACEHOLDER/provider: local/g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's~private_key_path: PLACEHOLDER~private_key_path: '"/etc/newrelic-agent-control/keys/$CLIENT_ID.key"'~g' /etc/newrelic-agent-control/config.yaml
fi
config_host_monitoring:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" = "otel" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" = "otel" ]; then
echo 'is_integrations_only: true' >> /etc/newrelic-infra.yml
- mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
- cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-agent-linux.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ mkdir -p /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values
+ cp /etc/newrelic-agent-control/examples/values-nr-otel-collector-agent-linux.yaml /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
else
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
- mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
- cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-gateway.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ mkdir -p /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values
+ cp /etc/newrelic-agent-control/examples/values-nr-otel-collector-gateway.yaml /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
fi
- restart_super_agent:
+ restart_agent_control:
cmds:
- |
if [ {{.IS_SYSTEMCTL}} -gt 0 ]; then
- systemctl restart newrelic-super-agent
+ systemctl restart newrelic-agent-control
else
if [ {{.IS_INITCTL}} -gt 0 ]; then
- initctl restart newrelic-super-agent
+ initctl restart newrelic-agent-control
else
- /etc/init.d/newrelic-super-agent restart
+ /etc/init.d/newrelic-agent-control restart
fi
fi
- assert_super_agent_status_ok:
+ assert_agent_control_status_ok:
cmds:
- |
MAX_RETRIES=150
@@ -649,23 +637,23 @@ install:
# so jq doesn't fail if empty
statusCheckOutput="{}"
fi
- STATUS=$(echo $statusCheckOutput | /usr/local/bin/newrelic utils jq '.super_agent.healthy')
+ STATUS=$(echo $statusCheckOutput | /usr/local/bin/newrelic utils jq '.agent_control.healthy')
if [ "$STATUS" == "true" ]; then
echo "Agent status check ok."
break
else
if [ "$TRIES" -eq "$MAX_RETRIES" ]; then
# Process-based validation attempt
- IS_AGENT_INSTALLED=$(ps aux | grep newrelic-super-agent | grep -v grep | wc -l)
+ IS_AGENT_INSTALLED=$(ps aux | grep newrelic-agent-control | grep -v grep | wc -l)
if [ $IS_AGENT_INSTALLED -gt 0 ] ; then
- echo "detected newrelic-super-agent process running"
+ echo "detected newrelic-agent-control process running"
exit 0
fi
echo "New Relic Agent Control has not started after installing. Please try again later, or see our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
if [ {{.IS_SYSTEMCTL}} -gt 0 ]; then
- journalctl -u newrelic-super-agent --no-pager
+ journalctl -u newrelic-agent-control --no-pager
fi
exit 31
@@ -678,8 +666,8 @@ install:
signal_recipe_applied:
cmds:
- |
- touch /etc/newrelic-super-agent/.nr-cli
+ touch /etc/newrelic-agent-control/.nr-cli
post_install:
info: |2
- ⚙️ New Relic Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml
+ ⚙️ New Relic Agent Control configuration file can be found in /etc/newrelic-agent-control/config.yaml
diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/agent-control/suse.yml
similarity index 75%
rename from recipes/newrelic/infrastructure/super-agent/suse.yml
rename to recipes/newrelic/infrastructure/agent-control/suse.yml
index 3899efe97..43e771357 100644
--- a/recipes/newrelic/infrastructure/super-agent/suse.yml
+++ b/recipes/newrelic/infrastructure/agent-control/suse.yml
@@ -1,10 +1,10 @@
# Visit our schema definition for additional information on this file format.
# https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
-name: super-agent
+name: agent-control
displayName: Agent Control
description: New Relic install recipe for Agent Control
-repository: https://github.com/newrelic/newrelic-super-agent
+repository: https://github.com/newrelic/newrelic-agent-control
installTargets:
- type: host
@@ -13,7 +13,7 @@ installTargets:
platformVersion: "(12|15)\\.*"
keywords:
- - SuperAgent
+ - AgentControl
- OpenTelemetry
- OTel
- Infrastructure
@@ -67,18 +67,18 @@ install:
- task: cleanup
- task: setup_infra_license
- task: setup_infra_proxy
- - task: install_super_agent
+ - task: install_agent_control
- task: update_otel_license_key
- task: config_supervisors
- task: config_fleet_id
- - task: config_opamp
- - task: config_super_agent_auth
+ - task: config_fleet_control
+ - task: config_agent_control_auth
- task: config_host_monitoring
- task: update_otel_mem_limit
- task: update_otel_end_point
- task: migrate_newrelic_infra_config
- - task: restart_super_agent
- - task: assert_super_agent_status_ok
+ - task: restart_agent_control
+ - task: assert_agent_control_status_ok
- task: signal_recipe_applied
- task: post_install
@@ -90,9 +90,9 @@ install:
detect_previous_install:
cmds:
- |
- if [ -f /etc/newrelic-super-agent/.nr-cli ] ; then
+ if [ -f /etc/newrelic-agent-control/.nr-cli ] ; then
echo "A previous execution of this installation was detected. Some installation tasks will be skipped."
- echo "If you would like to run all the tasks, please remove the /etc/newrelic-super-agent/.nr-cli file and re-run the installation."
+ echo "If you would like to run all the tasks, please remove the /etc/newrelic-agent-control/.nr-cli file and re-run the installation."
fi
assert_pre_req:
@@ -170,14 +170,14 @@ install:
cleanup:
# skipping this task if .nr-cli exists
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
rm -rf /var/db/newrelic-infra/data 2>/dev/null
setup_infra_license:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] ; then
@@ -193,7 +193,7 @@ install:
sed -i '/^custom_attributes:/d' /etc/newrelic-infra.yml
sed -i "/^is_integrations_only/d" /etc/newrelic-infra.yml
- if [ "{{.NR_SA_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
+ if [ "{{.NR_AC_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
touch /etc/newrelic-infra-do-migrate
else
printf "\nWould you like to migrate this newrelic-infra config to use it with New Relic Agent Control? (y/N): "
@@ -225,7 +225,7 @@ install:
setup_infra_proxy:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] && [ ! -z "$HTTPS_PROXY" ]; then
@@ -233,12 +233,12 @@ install:
echo 'proxy: {{.HTTPS_PROXY}}' >> /etc/newrelic-infra.yml
fi
- install_super_agent:
+ install_agent_control:
cmds:
- |
ARCH=$(uname -m)
- SUPER_AGENT_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/zypp/sles/{{.SLES_VERSION}}/$ARCH/newrelic-infra.repo")
- IS_NEWRELIC_AVAILABLE=$(curl -Ls $SUPER_AGENT_REPO_URL | grep "\[newrelic-infra\]" | wc -l)
+ AGENT_CONTROL_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/zypp/sles/{{.SLES_VERSION}}/$ARCH/newrelic-infra.repo")
+ IS_NEWRELIC_AVAILABLE=$(curl -Ls $AGENT_CONTROL_REPO_URL | grep "\[newrelic-infra\]" | wc -l)
if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
echo "New Relic Agent Control is not available for this architecture "$ARCH". See our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
exit 131
@@ -246,13 +246,13 @@ install:
INFRA_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/zypp/sles/{{.SLES_VERSION}}/$ARCH/newrelic-infra.repo")
curl -s $INFRA_REPO_URL -o /etc/zypp/repos.d/newrelic-infra.repo
- curl -s $SUPER_AGENT_REPO_URL | sed 's/\[newrelic-infra]/\n[newrelic-super-agent]/g' >> /etc/zypp/repos.d/newrelic-infra.repo
+ curl -s $AGENT_CONTROL_REPO_URL | sed 's/\[newrelic-infra]/\n[newrelic-agent-control]/g' >> /etc/zypp/repos.d/newrelic-infra.repo
- curl -s -L {{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/keys/newrelic_rpm_key_current.gpg > newrelic_rpm_key_current.gpg
- rpm --import newrelic_rpm_key_current.gpg
- zypper -n --quiet ref -r newrelic-infra
- - zypper -n --quiet ref -r newrelic-super-agent
- - zypper -n --quiet install newrelic-super-agent
+ - zypper -n --quiet ref -r newrelic-agent-control
+ - zypper -n --quiet install newrelic-agent-control
- rm newrelic_rpm_key_current.gpg
vars:
SLES_VERSION:
@@ -262,7 +262,7 @@ install:
# If configured to do so, migrate the newrelic-infra configuration for usage with New Relic Agent Control
migrate_newrelic_infra_config:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ -f /etc/newrelic-infra-do-migrate ]; then
@@ -272,134 +272,122 @@ install:
update_otel_license_key:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- sed -i "/^NEW_RELIC_LICENSE_KEY/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
- echo 'NEW_RELIC_LICENSE_KEY="{{.NEW_RELIC_LICENSE_KEY}}"' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
+ sed -i "/^NEW_RELIC_LICENSE_KEY/d" /etc/newrelic-agent-control/newrelic-agent-control.conf
+ echo 'NEW_RELIC_LICENSE_KEY="{{.NEW_RELIC_LICENSE_KEY}}"' >> /etc/newrelic-agent-control/newrelic-agent-control.conf
update_otel_mem_limit:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
- sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
- # Add OTLP Endpoint as ENV Var for the super-agent Systemd service
+ # Add OTLP Endpoint as ENV Var for the agent-control Systemd service
update_otel_end_point:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
- sed -i "s/endpoint: .*$/endpoint: https:\/\/staging-otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/staging-otlp.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
- sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.eu01.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.eu01.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
else
- sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ sed -i "s/endpoint: .*$/endpoint: https:\/\/otlp.nr-data.net:4317/g" /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
fi
config_supervisors:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
- cp /etc/newrelic-super-agent/examples/super-agent-config-no-agents.yaml /etc/newrelic-super-agent/config.yaml
+ cp /etc/newrelic-agent-control/examples/agent-control-config-no-agents.yaml /etc/newrelic-agent-control/config.yaml
+ elif [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
+ cp /etc/newrelic-agent-control/examples/agent-control-config-nr-otel-collector.yaml /etc/newrelic-agent-control/config.yaml
+ elif [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
+ cp /etc/newrelic-agent-control/examples/agent-control-config-nr-infra-agent.yaml /etc/newrelic-agent-control/config.yaml
else
- cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
- fi
- - |
- if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
- sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
- else
- sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
- fi
- - |
- if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
- sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
- else
- sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
+ cp /etc/newrelic-agent-control/examples/agent-control-config-all-agents.yaml /etc/newrelic-agent-control/config.yaml
fi
config_fleet_id:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
if [ ! -z "{{.NR_CLI_FLEET_ID}}" ] ; then
- sed -i 's/^#\s*fleet_id:/fleet_id:/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*#\s*fleet_id:/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-agent-control/config.yaml
fi
- config_opamp:
+ config_fleet_control:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" = "false" ]; then
- sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
+ sed -i '/^\s*fleet_control:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-agent-control/config.yaml
else
- sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/s*#\s*fleet_control:/fleet_control:/g' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/# //' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" = "false" ]; then
- sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" = "false" ]; then
+ sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-agent-control/config.yaml
else
- sed -i '/^\s*#\s*api-key:/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*headers:/s/# //' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*#\s*api-key:/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*headers:/s/# //' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] ; then
- sed -i 's/api-key: API_KEY_HERE/api-key: {{ .NEW_RELIC_LICENSE_KEY }}/g' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] ; then
+ sed -i 's/api-key: API_KEY_HERE/api-key: {{ .NEW_RELIC_LICENSE_KEY }}/g' /etc/newrelic-agent-control/config.yaml
fi
- |
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
else
- sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
+ sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-agent-control/config.yaml
fi
- config_super_agent_auth:
+ config_agent_control_auth:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
- sed -i '/^\s*#\s*auth_config:\s*$/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*token_url: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*client_id: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*provider: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*#\s*private_key_path: PLACEHOLDER/s/# //' /etc/newrelic-super-agent/config.yaml
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
+ sed -i '/^\s*#\s*auth_config:\s*$/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*token_url: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*client_id: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*provider: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*#\s*private_key_path: PLACEHOLDER/s/# //' /etc/newrelic-agent-control/config.yaml
else
- sed -i '/^\s*auth_config:/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*token_url: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*client_id: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*provider: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
- sed -i '/^\s*private_key_path: PLACEHOLDER/s/^/#/' /etc/newrelic-super-agent/config.yaml
+ sed -i '/^\s*auth_config:/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*token_url: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*client_id: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*provider: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
+ sed -i '/^\s*private_key_path: PLACEHOLDER/s/^/#/' /etc/newrelic-agent-control/config.yaml
fi
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_FLEET_ENABLED}}" != "false" ] && [ "{{ .NEW_RELIC_ORGANIZATION }}" != "" ]; then
set -uo pipefail
- mkdir -p /etc/newrelic-super-agent/keys
- chown root:root /etc/newrelic-super-agent/keys
- chmod 700 /etc/newrelic-super-agent/keys
+ mkdir -p /etc/newrelic-agent-control/keys
+ chown root:root /etc/newrelic-agent-control/keys
+ chmod 700 /etc/newrelic-agent-control/keys
- TEMPORAL_FOLDER=$(mktemp -d newrelic-super-agent.XXXXXXXXXX)
+ TEMPORAL_FOLDER=$(mktemp -d newrelic-agent-control.XXXXXXXXXX)
chown root:root "${TEMPORAL_FOLDER}"
chmod 700 "${TEMPORAL_FOLDER}"
trap "rm -rf $TEMPORAL_FOLDER" EXIT
@@ -546,43 +534,43 @@ install:
CLIENT_ID=$(/usr/local/bin/newrelic utils jq '.data.systemIdentityCreate.clientId' < "$TEMPORAL_FOLDER/response.json" | tr -d '"' )
fi
- mv "$TEMPORAL_FOLDER/key" "/etc/newrelic-super-agent/keys/$CLIENT_ID.key"
- sed -i 's~token_url: PLACEHOLDER~token_url: '"$TOKEN_RENEWAL_ENDPOINT"'~g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/client_id: PLACEHOLDER/client_id: '"$CLIENT_ID"'/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's/provider: PLACEHOLDER/provider: local/g' /etc/newrelic-super-agent/config.yaml
- sed -i 's~private_key_path: PLACEHOLDER~private_key_path: '"/etc/newrelic-super-agent/keys/$CLIENT_ID.key"'~g' /etc/newrelic-super-agent/config.yaml
+ mv "$TEMPORAL_FOLDER/key" "/etc/newrelic-agent-control/keys/$CLIENT_ID.key"
+ sed -i 's~token_url: PLACEHOLDER~token_url: '"$TOKEN_RENEWAL_ENDPOINT"'~g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/client_id: PLACEHOLDER/client_id: '"$CLIENT_ID"'/g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's/provider: PLACEHOLDER/provider: local/g' /etc/newrelic-agent-control/config.yaml
+ sed -i 's~private_key_path: PLACEHOLDER~private_key_path: '"/etc/newrelic-agent-control/keys/$CLIENT_ID.key"'~g' /etc/newrelic-agent-control/config.yaml
fi
config_host_monitoring:
status:
- - test -f /etc/newrelic-super-agent/.nr-cli
+ - test -f /etc/newrelic-agent-control/.nr-cli
cmds:
- |
- if [ "{{.NEW_RELIC_SUPER_AGENT_HOST_MONITORING_SOURCE}}" = "otel" ]; then
+ if [ "{{.NEW_RELIC_AGENT_CONTROL_HOST_MONITORING_SOURCE}}" = "otel" ]; then
echo 'is_integrations_only: true' >> /etc/newrelic-infra.yml
- mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
- cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-agent-linux.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ mkdir -p /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values
+ cp /etc/newrelic-agent-control/examples/values-nr-otel-collector-agent-linux.yaml /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
else
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
- mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
- cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-gateway.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
+ mkdir -p /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values
+ cp /etc/newrelic-agent-control/examples/values-nr-otel-collector-gateway.yaml /etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values/values.yaml
fi
fi
- restart_super_agent:
+ restart_agent_control:
cmds:
- |
if [ {{.IS_SYSTEMCTL}} -gt 0 ]; then
- systemctl restart newrelic-super-agent
+ systemctl restart newrelic-agent-control
else
if [ {{.IS_INITCTL}} -gt 0 ]; then
- initctl restart newrelic-super-agent
+ initctl restart newrelic-agent-control
else
- /etc/init.d/newrelic-super-agent restart
+ /etc/init.d/newrelic-agent-control restart
fi
fi
- assert_super_agent_status_ok:
+ assert_agent_control_status_ok:
cmds:
- |
MAX_RETRIES=150
@@ -596,23 +584,23 @@ install:
# so jq doesn't fail if empty
statusCheckOutput="{}"
fi
- STATUS=$(echo $statusCheckOutput | /usr/local/bin/newrelic utils jq '.super_agent.healthy')
+ STATUS=$(echo $statusCheckOutput | /usr/local/bin/newrelic utils jq '.agent_control.healthy')
if [ "$STATUS" == "true" ]; then
echo "Agent status check ok."
break
else
if [ "$TRIES" -eq "$MAX_RETRIES" ]; then
# Process-based validation attempt
- IS_AGENT_INSTALLED=$(ps aux | grep newrelic-super-agent | grep -v grep | wc -l)
+ IS_AGENT_INSTALLED=$(ps aux | grep newrelic-agent-control | grep -v grep | wc -l)
if [ $IS_AGENT_INSTALLED -gt 0 ] ; then
- echo "detected newrelic-super-agent process running"
+ echo "detected newrelic-agent-control process running"
exit 0
fi
echo "New Relic Agent Control has not started after installing. Please try again later, or see our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
if [ {{.IS_SYSTEMCTL}} -gt 0 ]; then
- journalctl -u newrelic-super-agent --no-pager
+ journalctl -u newrelic-agent-control --no-pager
fi
exit 31
@@ -625,8 +613,8 @@ install:
signal_recipe_applied:
cmds:
- |
- touch /etc/newrelic-super-agent/.nr-cli
+ touch /etc/newrelic-agent-control/.nr-cli
post_install:
info: |2
- ⚙️ New Relic Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml
+ ⚙️ New Relic Agent Control configuration file can be found in /etc/newrelic-agent-control/config.yaml
diff --git a/recipes/newrelic/infrastructure/ohi/mysql/debian.yml b/recipes/newrelic/infrastructure/ohi/mysql/debian.yml
index ad820728b..cd423fe19 100644
--- a/recipes/newrelic/infrastructure/ohi/mysql/debian.yml
+++ b/recipes/newrelic/infrastructure/ohi/mysql/debian.yml
@@ -7,7 +7,7 @@ description: New Relic install recipe for default MySQL Open Source on-host inte
repository: https://github.com/newrelic/nri-mysql
dependencies:
- - infrastructure-agent-installer || super-agent
+ - infrastructure-agent-installer || agent-control
installTargets:
- type: host
@@ -82,9 +82,9 @@ install:
cmds:
- |
IS_INFRA_INSTALLED=$(sudo ps aux | grep newrelic-infra-service | grep -v grep | wc -l)
- IS_SUPER_AGENT_INSTALLED=$(sudo ps aux | grep newrelic-super-agent | grep -v grep | wc -l)
- if [ $IS_INFRA_INSTALLED -eq 0 ] && [ $IS_SUPER_AGENT_INSTALLED -eq 0 ] ; then
- 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
+ IS_AGENT_CONTROL_INSTALLED=$(sudo ps aux | grep newrelic-agent-control | grep -v grep | wc -l)
+ if [ $IS_INFRA_INSTALLED -eq 0 ] && [ $IS_AGENT_CONTROL_INSTALLED -eq 0 ] ; then
+ 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
exit 1
fi
diff --git a/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json b/test/definitions-eu/agent-control/debians/debian11-agent-control-eu.json
similarity index 89%
rename from test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json
rename to test/definitions-eu/agent-control/debians/debian11-agent-control-eu.json
index d2bd31993..9b332dfda 100644
--- a/test/definitions-eu/super-agent/debians/debian11-super-agent-eu.json
+++ b/test/definitions-eu/agent-control/debians/debian11-agent-control-eu.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json b/test/definitions-eu/agent-control/debians/ubuntu16-agent-control-eu.json
similarity index 89%
rename from test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json
rename to test/definitions-eu/agent-control/debians/ubuntu16-agent-control-eu.json
index c2c68a6e0..6aab949b4 100644
--- a/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json
+++ b/test/definitions-eu/agent-control/debians/ubuntu16-agent-control-eu.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["ubuntu16-super-eu"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/debians/ubuntu18-super-agent.json b/test/definitions-eu/agent-control/debians/ubuntu18-agent-control-eu.json
similarity index 89%
rename from test/definitions/super-agent/debians/ubuntu18-super-agent.json
rename to test/definitions-eu/agent-control/debians/ubuntu18-agent-control-eu.json
index dc8f24381..dc1f95126 100644
--- a/test/definitions/super-agent/debians/ubuntu18-super-agent.json
+++ b/test/definitions-eu/agent-control/debians/ubuntu18-agent-control-eu.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/debians/ubuntu20-super-agent.json b/test/definitions-eu/agent-control/debians/ubuntu20-agent-control-eu.json
similarity index 89%
rename from test/definitions/super-agent/debians/ubuntu20-super-agent.json
rename to test/definitions-eu/agent-control/debians/ubuntu20-agent-control-eu.json
index 16898390e..e45cd2625 100644
--- a/test/definitions/super-agent/debians/ubuntu20-super-agent.json
+++ b/test/definitions-eu/agent-control/debians/ubuntu20-agent-control-eu.json
@@ -20,15 +20,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json b/test/definitions-eu/agent-control/debians/ubuntu20arm64-agent-control-eu.json
similarity index 89%
rename from test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json
rename to test/definitions-eu/agent-control/debians/ubuntu20arm64-agent-control-eu.json
index 2786f7dee..c3de00323 100644
--- a/test/definitions/super-agent/debians/ubuntu20arm64-super-agent.json
+++ b/test/definitions-eu/agent-control/debians/ubuntu20arm64-agent-control-eu.json
@@ -20,15 +20,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json b/test/definitions-eu/agent-control/debians/ubuntu22-agent-control-eu.json
similarity index 89%
rename from test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json
rename to test/definitions-eu/agent-control/debians/ubuntu22-agent-control-eu.json
index 18c253e8d..a2add3c72 100644
--- a/test/definitions-eu/super-agent/debians/ubuntu22-super-agent-eu.json
+++ b/test/definitions-eu/agent-control/debians/ubuntu22-agent-control-eu.json
@@ -20,15 +20,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/logs/amazonlinux2-super-agent-logs-eu.json b/test/definitions-eu/agent-control/logs/amazonlinux2-agent-control-logs-eu.json
similarity index 87%
rename from test/definitions-eu/super-agent/logs/amazonlinux2-super-agent-logs-eu.json
rename to test/definitions-eu/agent-control/logs/amazonlinux2-agent-control-logs-eu.json
index 5d58a5540..3cdf1cd10 100644
--- a/test/definitions-eu/super-agent/logs/amazonlinux2-super-agent-logs-eu.json
+++ b/test/definitions-eu/agent-control/logs/amazonlinux2-agent-control-logs-eu.json
@@ -19,14 +19,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/amazonlinux2023-x86-super-agent-logs.json b/test/definitions-eu/agent-control/logs/amazonlinux2023-agent-control-logs-eu.json
similarity index 87%
rename from test/definitions/super-agent/logs/amazonlinux2023-x86-super-agent-logs.json
rename to test/definitions-eu/agent-control/logs/amazonlinux2023-agent-control-logs-eu.json
index 6c6072041..309d21f80 100644
--- a/test/definitions/super-agent/logs/amazonlinux2023-x86-super-agent-logs.json
+++ b/test/definitions-eu/agent-control/logs/amazonlinux2023-agent-control-logs-eu.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/debian11-super-agent-logs.json b/test/definitions-eu/agent-control/logs/debian11-agent-control-logs-eu.json
similarity index 87%
rename from test/definitions/super-agent/logs/debian11-super-agent-logs.json
rename to test/definitions-eu/agent-control/logs/debian11-agent-control-logs-eu.json
index d0346c2a3..c89d1c971 100644
--- a/test/definitions/super-agent/logs/debian11-super-agent-logs.json
+++ b/test/definitions-eu/agent-control/logs/debian11-agent-control-logs-eu.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions-eu/super-agent/logs/redhat8-super-agent-logs-eu.json b/test/definitions-eu/agent-control/logs/redhat8-agent-control-logs-eu.json
similarity index 87%
rename from test/definitions-eu/super-agent/logs/redhat8-super-agent-logs-eu.json
rename to test/definitions-eu/agent-control/logs/redhat8-agent-control-logs-eu.json
index e9765939f..044039d6a 100644
--- a/test/definitions-eu/super-agent/logs/redhat8-super-agent-logs-eu.json
+++ b/test/definitions-eu/agent-control/logs/redhat8-agent-control-logs-eu.json
@@ -19,14 +19,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/redhat9-super-agent-logs.json b/test/definitions-eu/agent-control/logs/redhat9-agent-control-logs-eu.json
similarity index 87%
rename from test/definitions/super-agent/logs/redhat9-super-agent-logs.json
rename to test/definitions-eu/agent-control/logs/redhat9-agent-control-logs-eu.json
index 6de6e556e..426ca9abc 100644
--- a/test/definitions/super-agent/logs/redhat9-super-agent-logs.json
+++ b/test/definitions-eu/agent-control/logs/redhat9-agent-control-logs-eu.json
@@ -19,14 +19,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json b/test/definitions-eu/agent-control/logs/suse154-agent-control-logs-eu.json
similarity index 87%
rename from test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json
rename to test/definitions-eu/agent-control/logs/suse154-agent-control-logs-eu.json
index c9f248aa2..ce68e9096 100644
--- a/test/definitions-eu/super-agent/logs/suse154-super-agent-logs-eu.json
+++ b/test/definitions-eu/agent-control/logs/suse154-agent-control-logs-eu.json
@@ -17,14 +17,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/ubuntu20-super-agent-logs.json b/test/definitions-eu/agent-control/logs/ubuntu20-agent-control-logs-eu.json
similarity index 87%
rename from test/definitions/super-agent/logs/ubuntu20-super-agent-logs.json
rename to test/definitions-eu/agent-control/logs/ubuntu20-agent-control-logs-eu.json
index 52ff036c4..e03dbb5a3 100644
--- a/test/definitions/super-agent/logs/ubuntu20-super-agent-logs.json
+++ b/test/definitions-eu/agent-control/logs/ubuntu20-agent-control-logs-eu.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/ubuntu22-super-agent-logs.json b/test/definitions-eu/agent-control/logs/ubuntu22-agent-control-logs-eu.json
similarity index 88%
rename from test/definitions/super-agent/logs/ubuntu22-super-agent-logs.json
rename to test/definitions-eu/agent-control/logs/ubuntu22-agent-control-logs-eu.json
index 2f82f89f7..0b24b2297 100644
--- a/test/definitions/super-agent/logs/ubuntu22-super-agent-logs.json
+++ b/test/definitions-eu/agent-control/logs/ubuntu22-agent-control-logs-eu.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/rhel/awslinux23-super-agent.json b/test/definitions-eu/agent-control/rhel/awslinux23-agent-control-eu.json
similarity index 89%
rename from test/definitions/super-agent/rhel/awslinux23-super-agent.json
rename to test/definitions-eu/agent-control/rhel/awslinux23-agent-control-eu.json
index 940abed18..28f098905 100644
--- a/test/definitions/super-agent/rhel/awslinux23-super-agent.json
+++ b/test/definitions-eu/agent-control/rhel/awslinux23-agent-control-eu.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json b/test/definitions-eu/agent-control/rhel/awslinuxarm64-agent-control-eu.json
similarity index 89%
rename from test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json
rename to test/definitions-eu/agent-control/rhel/awslinuxarm64-agent-control-eu.json
index 9073b814e..d7b4c25dd 100644
--- a/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json
+++ b/test/definitions-eu/agent-control/rhel/awslinuxarm64-agent-control-eu.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json b/test/definitions-eu/agent-control/rhel/redhat8arm64-agent-control-eu.json
similarity index 89%
rename from test/definitions/super-agent/rhel/redhat8arm64-super-agent.json
rename to test/definitions-eu/agent-control/rhel/redhat8arm64-agent-control-eu.json
index ddde59bd9..579b78d39 100644
--- a/test/definitions/super-agent/rhel/redhat8arm64-super-agent.json
+++ b/test/definitions-eu/agent-control/rhel/redhat8arm64-agent-control-eu.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json b/test/definitions-eu/agent-control/suse/suse125-agent-control-eu.json
similarity index 88%
rename from test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json
rename to test/definitions-eu/agent-control/suse/suse125-agent-control-eu.json
index 689e9b194..25cb12201 100644
--- a/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json
+++ b/test/definitions-eu/agent-control/suse/suse125-agent-control-eu.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/suse.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json b/test/definitions-eu/agent-control/suse/suse154-agent-control-eu.json
similarity index 89%
rename from test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json
rename to test/definitions-eu/agent-control/suse/suse154-agent-control-eu.json
index 460ac1fa8..423d32a7f 100644
--- a/test/definitions-eu/super-agent/suse/suse154-super-agent-eu.json
+++ b/test/definitions-eu/agent-control/suse/suse154-agent-control-eu.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/suse.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/debians/debian11-super-agent.json b/test/definitions/agent-control/debians/debian11-agent-control.json
similarity index 89%
rename from test/definitions/super-agent/debians/debian11-super-agent.json
rename to test/definitions/agent-control/debians/debian11-agent-control.json
index d2bd31993..9b332dfda 100644
--- a/test/definitions/super-agent/debians/debian11-super-agent.json
+++ b/test/definitions/agent-control/debians/debian11-agent-control.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/debians/ubuntu16-super-agent.json b/test/definitions/agent-control/debians/ubuntu16-agent-control.json
similarity index 89%
rename from test/definitions/super-agent/debians/ubuntu16-super-agent.json
rename to test/definitions/agent-control/debians/ubuntu16-agent-control.json
index 23d7df2cc..f18aad7ef 100644
--- a/test/definitions/super-agent/debians/ubuntu16-super-agent.json
+++ b/test/definitions/agent-control/debians/ubuntu16-agent-control.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["ubuntu16-super"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json b/test/definitions/agent-control/debians/ubuntu18-agent-control.json
similarity index 89%
rename from test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json
rename to test/definitions/agent-control/debians/ubuntu18-agent-control.json
index dc8f24381..dc1f95126 100644
--- a/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json
+++ b/test/definitions/agent-control/debians/ubuntu18-agent-control.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/debians/ubuntu20-super-agent-eu.json b/test/definitions/agent-control/debians/ubuntu20-agent-control.json
similarity index 89%
rename from test/definitions-eu/super-agent/debians/ubuntu20-super-agent-eu.json
rename to test/definitions/agent-control/debians/ubuntu20-agent-control.json
index 16898390e..e45cd2625 100644
--- a/test/definitions-eu/super-agent/debians/ubuntu20-super-agent-eu.json
+++ b/test/definitions/agent-control/debians/ubuntu20-agent-control.json
@@ -20,15 +20,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/debians/ubuntu20arm64-super-agent-eu.json b/test/definitions/agent-control/debians/ubuntu20arm64-agent-control.json
similarity index 89%
rename from test/definitions-eu/super-agent/debians/ubuntu20arm64-super-agent-eu.json
rename to test/definitions/agent-control/debians/ubuntu20arm64-agent-control.json
index 2786f7dee..c3de00323 100644
--- a/test/definitions-eu/super-agent/debians/ubuntu20arm64-super-agent-eu.json
+++ b/test/definitions/agent-control/debians/ubuntu20arm64-agent-control.json
@@ -20,15 +20,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/debians/ubuntu22-super-agent.json b/test/definitions/agent-control/debians/ubuntu22-agent-control.json
similarity index 89%
rename from test/definitions/super-agent/debians/ubuntu22-super-agent.json
rename to test/definitions/agent-control/debians/ubuntu22-agent-control.json
index 18c253e8d..a2add3c72 100644
--- a/test/definitions/super-agent/debians/ubuntu22-super-agent.json
+++ b/test/definitions/agent-control/debians/ubuntu22-agent-control.json
@@ -20,15 +20,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/debian.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/logs/amazonlinux2-super-agent-logs.json b/test/definitions/agent-control/logs/amazonlinux2-agent-control-logs.json
similarity index 87%
rename from test/definitions/super-agent/logs/amazonlinux2-super-agent-logs.json
rename to test/definitions/agent-control/logs/amazonlinux2-agent-control-logs.json
index 5d58a5540..3cdf1cd10 100644
--- a/test/definitions/super-agent/logs/amazonlinux2-super-agent-logs.json
+++ b/test/definitions/agent-control/logs/amazonlinux2-agent-control-logs.json
@@ -19,14 +19,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/amazonlinux2023-aarch64-super-agent-logs.json b/test/definitions/agent-control/logs/amazonlinux2023-aarch64-agent-control-logs.json
similarity index 88%
rename from test/definitions/super-agent/logs/amazonlinux2023-aarch64-super-agent-logs.json
rename to test/definitions/agent-control/logs/amazonlinux2023-aarch64-agent-control-logs.json
index a98094f3d..79a4a935f 100644
--- a/test/definitions/super-agent/logs/amazonlinux2023-aarch64-super-agent-logs.json
+++ b/test/definitions/agent-control/logs/amazonlinux2023-aarch64-agent-control-logs.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions-eu/super-agent/logs/amazonlinux2023-super-agent-logs-eu.json b/test/definitions/agent-control/logs/amazonlinux2023-x86-agent-control-logs.json
similarity index 87%
rename from test/definitions-eu/super-agent/logs/amazonlinux2023-super-agent-logs-eu.json
rename to test/definitions/agent-control/logs/amazonlinux2023-x86-agent-control-logs.json
index 6c6072041..309d21f80 100644
--- a/test/definitions-eu/super-agent/logs/amazonlinux2023-super-agent-logs-eu.json
+++ b/test/definitions/agent-control/logs/amazonlinux2023-x86-agent-control-logs.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions-eu/super-agent/logs/debian11-super-agent-logs-eu.json b/test/definitions/agent-control/logs/debian11-agent-control-logs.json
similarity index 87%
rename from test/definitions-eu/super-agent/logs/debian11-super-agent-logs-eu.json
rename to test/definitions/agent-control/logs/debian11-agent-control-logs.json
index d0346c2a3..c89d1c971 100644
--- a/test/definitions-eu/super-agent/logs/debian11-super-agent-logs-eu.json
+++ b/test/definitions/agent-control/logs/debian11-agent-control-logs.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/redhat8-super-agent-logs.json b/test/definitions/agent-control/logs/redhat8-agent-control-logs.json
similarity index 87%
rename from test/definitions/super-agent/logs/redhat8-super-agent-logs.json
rename to test/definitions/agent-control/logs/redhat8-agent-control-logs.json
index e9765939f..044039d6a 100644
--- a/test/definitions/super-agent/logs/redhat8-super-agent-logs.json
+++ b/test/definitions/agent-control/logs/redhat8-agent-control-logs.json
@@ -19,14 +19,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions-eu/super-agent/logs/redhat9-super-agent-logs-eu.json b/test/definitions/agent-control/logs/redhat9-agent-control-logs.json
similarity index 87%
rename from test/definitions-eu/super-agent/logs/redhat9-super-agent-logs-eu.json
rename to test/definitions/agent-control/logs/redhat9-agent-control-logs.json
index 6de6e556e..426ca9abc 100644
--- a/test/definitions-eu/super-agent/logs/redhat9-super-agent-logs-eu.json
+++ b/test/definitions/agent-control/logs/redhat9-agent-control-logs.json
@@ -19,14 +19,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/suse154-super-agent-logs.json b/test/definitions/agent-control/logs/suse154-agent-control-logs.json
similarity index 87%
rename from test/definitions/super-agent/logs/suse154-super-agent-logs.json
rename to test/definitions/agent-control/logs/suse154-agent-control-logs.json
index c9f248aa2..ce68e9096 100644
--- a/test/definitions/super-agent/logs/suse154-super-agent-logs.json
+++ b/test/definitions/agent-control/logs/suse154-agent-control-logs.json
@@ -17,14 +17,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions/super-agent/logs/suse155-super-agent-logs.json b/test/definitions/agent-control/logs/suse155-agent-control-logs.json
similarity index 86%
rename from test/definitions/super-agent/logs/suse155-super-agent-logs.json
rename to test/definitions/agent-control/logs/suse155-agent-control-logs.json
index 065327c3d..a2aadc092 100644
--- a/test/definitions/super-agent/logs/suse155-super-agent-logs.json
+++ b/test/definitions/agent-control/logs/suse155-agent-control-logs.json
@@ -17,7 +17,7 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": [
"host1"
],
@@ -25,8 +25,8 @@
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "newrelic_cli_option": "-n super-agent,logs-integration-super-agent",
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/suse.yml",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"env_var": "NEW_RELIC_CLI_SKIP_CORE=1",
"local_recipes": true
diff --git a/test/definitions-eu/super-agent/logs/ubuntu20-super-agent-logs-eu.json b/test/definitions/agent-control/logs/ubuntu20-agent-control-logs.json
similarity index 87%
rename from test/definitions-eu/super-agent/logs/ubuntu20-super-agent-logs-eu.json
rename to test/definitions/agent-control/logs/ubuntu20-agent-control-logs.json
index 52ff036c4..e03dbb5a3 100644
--- a/test/definitions-eu/super-agent/logs/ubuntu20-super-agent-logs-eu.json
+++ b/test/definitions/agent-control/logs/ubuntu20-agent-control-logs.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions-eu/super-agent/logs/ubuntu22-super-agent-logs-eu.json b/test/definitions/agent-control/logs/ubuntu22-agent-control-logs.json
similarity index 88%
rename from test/definitions-eu/super-agent/logs/ubuntu22-super-agent-logs-eu.json
rename to test/definitions/agent-control/logs/ubuntu22-agent-control-logs.json
index 2f82f89f7..0b24b2297 100644
--- a/test/definitions-eu/super-agent/logs/ubuntu22-super-agent-logs-eu.json
+++ b/test/definitions/agent-control/logs/ubuntu22-agent-control-logs.json
@@ -20,14 +20,14 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent_logs",
+ "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 super-agent,logs-integration-super-agent",
+ "newrelic_cli_option": "-n agent-control,logs-integration-agent-control",
"validate_output": "Logs Integration\\s+\\(installed\\)",
"local_recipes": true,
"use_organization_id": true
diff --git a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json b/test/definitions/agent-control/rhel/awslinux23-agent-control.json
similarity index 89%
rename from test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json
rename to test/definitions/agent-control/rhel/awslinux23-agent-control.json
index 940abed18..28f098905 100644
--- a/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json
+++ b/test/definitions/agent-control/rhel/awslinux23-agent-control.json
@@ -18,15 +18,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json b/test/definitions/agent-control/rhel/awslinuxarm64-agent-control.json
similarity index 89%
rename from test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json
rename to test/definitions/agent-control/rhel/awslinuxarm64-agent-control.json
index 9073b814e..d7b4c25dd 100644
--- a/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json
+++ b/test/definitions/agent-control/rhel/awslinuxarm64-agent-control.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json b/test/definitions/agent-control/rhel/redhat8arm64-agent-control.json
similarity index 89%
rename from test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json
rename to test/definitions/agent-control/rhel/redhat8arm64-agent-control.json
index ddde59bd9..579b78d39 100644
--- a/test/definitions-eu/super-agent/rhel/redhat8arm64-super-agent-eu.json
+++ b/test/definitions/agent-control/rhel/redhat8arm64-agent-control.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/rhel.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/suse/suse125-super-agent.json b/test/definitions/agent-control/suse/suse125-agent-control.json
similarity index 88%
rename from test/definitions/super-agent/suse/suse125-super-agent.json
rename to test/definitions/agent-control/suse/suse125-agent-control.json
index 689e9b194..25cb12201 100644
--- a/test/definitions/super-agent/suse/suse125-super-agent.json
+++ b/test/definitions/agent-control/suse/suse125-agent-control.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/suse.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}
diff --git a/test/definitions/super-agent/suse/suse154-super-agent.json b/test/definitions/agent-control/suse/suse154-agent-control.json
similarity index 89%
rename from test/definitions/super-agent/suse/suse154-super-agent.json
rename to test/definitions/agent-control/suse/suse154-agent-control.json
index 460ac1fa8..423d32a7f 100644
--- a/test/definitions/super-agent/suse/suse154-super-agent.json
+++ b/test/definitions/agent-control/suse/suse154-agent-control.json
@@ -17,15 +17,15 @@
"instrumentations": {
"resources": [
{
- "id": "nr_super_agent",
+ "id": "nr_agent_control",
"resource_ids": ["host1"],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
- "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
+ "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/agent-control/suse.yml",
"validate_output": "Agent Control\\s+\\(installed\\)",
- "recipe_targeted": "super-agent",
+ "recipe_targeted": "agent-control",
"use_organization_id": true
}
}