Use config examples to set up the super-agent, allowing to have empty…

… agents. (#1054)
newrelic · Mar 7, 2024 · 51aafc4 · 51aafc4
1 parent ee0261f
commit 51aafc4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/super-agent/debian.yml
@@ -341,15 +341,11 @@ install:
 
     config_supervisors:
       cmds:
-        - |
-          # Remove values_file keys from config.yaml
-          sed -i '/^\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
-          sed -i '/^\s*#\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
         - |
           if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
-            sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
+            cp /etc/newrelic-super-agent/examples/super-agent-config-no-agents.yaml /etc/newrelic-super-agent/config.yaml
           else
-            sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
+            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

diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/super-agent/rhel.yml
@@ -278,14 +278,10 @@ install:
     config_supervisors:
       cmds:
         - |
-          # Remove values_file keys from config.yaml
-          sed -i '/^\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
-          sed -i '/^\s*#\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
-        - |
-          if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
-            sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml           
+          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
           else
-            sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
+            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

diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml
@@ -233,14 +233,10 @@ install:
     config_supervisors:
       cmds:
         - |
-          # Remove values_file keys from config.yaml
-          sed -i '/^\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
-          sed -i '/^\s*#\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
-        - |
-          if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
-            sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml           
+          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
           else
-            sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
+            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