Skip to content

Commit

Permalink
Merge pull request #1144 from newrelic/agent_control_renaming
Browse files Browse the repository at this point in the history
fix(agent-control): rename Super Agent to Agent Control in OIL
  • Loading branch information
shashank-reddy-nr authored Jan 7, 2025
2 parents 7ed34dd + f3dea42 commit 8ec70e9
Show file tree
Hide file tree
Showing 46 changed files with 408 additions and 444 deletions.
6 changes: 3 additions & 3 deletions docs/recipe-spec/recipe-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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;
Expand All @@ -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=()
Expand Down Expand Up @@ -259,15 +259,15 @@ 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
fi
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:
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions recipes/newrelic/infrastructure/ohi/mysql/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Loading

0 comments on commit 8ec70e9

Please sign in to comment.