Rename Super Agent to Agent Control on all displays

newrelic · Aug 21, 2024 · 30cccff · 30cccff
1 parent 25c8316
commit 30cccff
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/super-agent/debian.yml
@@ -2,8 +2,8 @@
 # https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
 
 name: super-agent
-displayName: New Relic Super Agent
-description: New Relic install recipe for the Super Agent
+displayName: Agent Control
+description: New Relic install recipe for the Agent Control
 repository: https://github.com/newrelic/newrelic-super-agent
 
 installTargets:
@@ -175,18 +175,18 @@ install:
           if [ -n "{{.DEBIAN_CODENAME}}" ]; then
             IS_AGENT_AVAILABLE=$(curl -Is {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/apt/dists/{{.DEBIAN_CODENAME}}/InRelease | grep " 2[0-9][0-9] " | wc -l)
             if [ $IS_AGENT_AVAILABLE -eq 0 ] ; then
-              echo "there is no newrelic super agent available for the distribution with codename '{{.DEBIAN_CODENAME}}'." >&2
+              echo "there is no New Relic Agent Control available for the distribution with codename '{{.DEBIAN_CODENAME}}'." >&2
               exit 131
             fi
           else
             if [ -n "{{.DEBIAN_VERSION_CODENAME}}" ]; then
               IS_INFRA_AVAILABLE=$(curl -Is {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/apt/dists/{{.DEBIAN_VERSION_CODENAME}}/InRelease | grep " 2[0-9][0-9] " | wc -l)
               if [ $IS_INFRA_AVAILABLE -eq 0 ] ; then
-                echo "there is no newrelic super agent available for the distribution with version codename '{{.DEBIAN_VERSION_CODENAME}}'." >&2
+                echo "there is no New Relic Agent Control available for the distribution with version codename '{{.DEBIAN_VERSION_CODENAME}}'." >&2
                 exit 131
               fi
             else
-              echo "there is no newrelic super agent available for the distribution, no version codename was found." >&2
+              echo "there is no New Relic Agent Control available for the distribution, no version codename was found." >&2
               exit 131
             fi
           fi
@@ -227,7 +227,7 @@ install:
               if [ "{{.NR_SA_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 the newrelic super agent? (y/N): "
+                printf "\nWould you like to migrate this newrelic-infra config to use it with the New Relic Agent Control? (y/N): "
                 read -r MIGRATE_NEWRELIC_INFRA_CONFIG
                 MIGRATE_NEWRELIC_INFRA_CONFIG=${MIGRATE_NEWRELIC_INFRA_CONFIG:-N}
 
@@ -368,7 +368,7 @@ install:
           fi
       silent: true
 
-    # If configured to do so, migrate the newrelic-infra configuration for usage with the super agent
+    # If configured to do so, migrate the newrelic-infra configuration for usage with the New Relic Agent Control
     migrate_newrelic_infra_config:
       status:
         - test -f /etc/newrelic-super-agent/.nr-cli
@@ -379,7 +379,7 @@ 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 super-agent Systemd service (used by Infra Agent and Otel)
     update_otel_license_key:
       status:
         - test -f /etc/newrelic-super-agent/.nr-cli
@@ -634,11 +634,12 @@ install:
                   exit 0
                 fi
                 
+                echo "The 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
                 fi
-                
-                echo "The newrelic super agent 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
+          
                 exit 31
               fi
             fi
@@ -653,4 +654,4 @@ install:
 
     post_install:
       info: |2
-          ⚙️  The New Relic Super Agent configuration file can be found in /etc/newrelic-super-agent/config.yaml
+          ⚙️  The New Relic Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml
diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/super-agent/rhel.yml
@@ -2,8 +2,8 @@
 # https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
 
 name: super-agent
-displayName: New Relic Super Agent
-description: New Relic install recipe for the Super Agent
+displayName: Agent Control
+description: New Relic install recipe for the Agent Control
 repository: https://github.com/newrelic/newrelic-super-agent
 
 installTargets:
@@ -199,7 +199,7 @@ install:
           fi
           IS_NEWRELIC_AVAILABLE=$(curl -Ls $REPO_URL | grep "\[newrelic-infra\]" | wc -l)
           if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
-            echo "there is no newrelic super agent available for the distribution '{{.DISTRO_VERSION}}'." >&2
+            echo "there is no New Relic Agent Control available for the distribution '{{.DISTRO_VERSION}}'." >&2
             exit 21
           fi
       vars:
@@ -238,7 +238,7 @@ install:
               if [ "{{.NR_SA_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 the newrelic super agent? (y/N): "
+                printf "\nWould you like to migrate this newrelic-infra config to use it with the New Relic Agent Control? (y/N): "
                 read -r MIGRATE_NEWRELIC_INFRA_CONFIG
                 MIGRATE_NEWRELIC_INFRA_CONFIG=${MIGRATE_NEWRELIC_INFRA_CONFIG:-N}
 
@@ -293,7 +293,7 @@ install:
           fi
           IS_NEWRELIC_AVAILABLE=$(curl -Ls $SUPER_AGENT_REPO_URL | grep "\[newrelic-infra\]" | wc -l)
           if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
-            echo "newrelic super agent 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
+            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
 
@@ -308,7 +308,7 @@ install:
             rpm -E %{rhel}
       silent: true
 
-    # If configured to do so, migrate the newrelic-infra configuration for usage with the super agent
+    # If configured to do so, migrate the newrelic-infra configuration for usage with the New Relic Agent Control
     migrate_newrelic_infra_config:
       status:
         - test -f /etc/newrelic-super-agent/.nr-cli
@@ -336,7 +336,7 @@ install:
             sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-super-agent/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 super-agent Systemd service
     update_otel_end_point:
       status:
         - test -f /etc/newrelic-super-agent/.nr-cli
@@ -572,7 +572,8 @@ install:
                   echo "detected newrelic-super-agent process running"
                   exit 0
                 fi
-                echo "The newrelic super agent 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
+          
+                echo "The 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
@@ -592,4 +593,4 @@ install:
 
     post_install:
       info: |2
-          ⚙️  The New Relic Super Agent configuration file can be found in /etc/newrelic-super-agent/config.yaml
+          ⚙️  The New Relic Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml
diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml
@@ -2,8 +2,8 @@
 # https://github.com/newrelic/open-install-library/blob/main/docs/recipe-spec/recipe-spec.md#schema-definition
 
 name: super-agent
-displayName: New Relic Super Agent
-description: New Relic install recipe for the Super Agent
+displayName: Agent Control
+description: New Relic install recipe for the Agent Control
 repository: https://github.com/newrelic/newrelic-super-agent
 
 installTargets:
@@ -160,7 +160,7 @@ install:
         - |
           IS_INFRA_AVAILABLE=$(curl -Is {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/zypp/sles/{{.SLES_VERSION}}/x86_64/newrelic-infra.repo | grep " 2[0-9][0-9] " | wc -l)
           if [ $IS_INFRA_AVAILABLE -eq 0 ] ; then
-            echo "there is no newrelic super agent available for the distribution '{{.SLES_VERSION}}'." >&2
+            echo "there is no New Relic Agent Control available for the distribution '{{.SLES_VERSION}}'." >&2
             exit 131
           fi
       vars:
@@ -196,7 +196,7 @@ install:
               if [ "{{.NR_SA_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 the newrelic super agent? (y/N): "
+                printf "\nWould you like to migrate this newrelic-infra config to use it with the New Relic Agent Control? (y/N): "
                 read -r MIGRATE_NEWRELIC_INFRA_CONFIG
                 MIGRATE_NEWRELIC_INFRA_CONFIG=${MIGRATE_NEWRELIC_INFRA_CONFIG:-N}
 
@@ -240,7 +240,7 @@ install:
           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)
           if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
-            echo "newrelic super agent 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
+            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
           INFRA_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/zypp/sles/{{.SLES_VERSION}}/$ARCH/newrelic-infra.repo")
@@ -259,7 +259,7 @@ install:
           sh: awk -F= '/VERSION_ID/ {print $2}' /etc/os-release
       silent: true
 
-    # If configured to do so, migrate the newrelic-infra configuration for usage with the super agent
+    # If configured to do so, migrate the newrelic-infra configuration for usage with the New Relic Agent Control
     migrate_newrelic_infra_config:
       status:
         - test -f /etc/newrelic-super-agent/.nr-cli
@@ -287,7 +287,7 @@ install:
             sed -i "s/limit_mib: .*$/limit_mib: 100/g" /etc/newrelic-super-agent/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 super-agent Systemd service
     update_otel_end_point:
       status:
         - test -f /etc/newrelic-super-agent/.nr-cli
@@ -524,7 +524,7 @@ install:
                   exit 0
                 fi
             
-                echo "The newrelic super agent 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
+                echo "The 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
@@ -544,4 +544,4 @@ install:
 
     post_install:
       info: |2
-          ⚙️  The New Relic Super Agent configuration file can be found in /etc/newrelic-super-agent/config.yaml
+          ⚙️  The New Relic Agent Control configuration file can be found in /etc/newrelic-super-agent/config.yaml