feat: create sub-agent directory

newrelic · Nov 28, 2023 · cc0204a · cc0204a
1 parent 17ab97c
commit cc0204a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/super-agent/debian.yml
@@ -330,12 +330,14 @@ install:
         - |
           # Remove old config location (to deprecate)
           rm -f /etc/newrelic-super-agent/nrdot-values.yaml
+          # Create nr_otel_collector sub-agent dir
+          mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector
           if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
-            echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
-            echo 'otel_exporter_otlp_endpoint: "otlp.eu01.nr-data.net:4317"' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'otel_exporter_otlp_endpoint: "otlp.eu01.nr-data.net:4317"' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           else
-            echo 'otel_exporter_otlp_endpoint: "otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'otel_exporter_otlp_endpoint: "otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           fi
 
     config_supervisors:

diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/super-agent/rhel.yml
@@ -267,12 +267,14 @@ install:
         - |
           # Remove old config location (to deprecate)
           rm -f /etc/newrelic-super-agent/nrdot-values.yaml
+          # Create nr_otel_collector sub-agent dir
+          mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector
           if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           else
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> //etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> //etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           fi
 
     config_supervisors:

diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml
@@ -220,12 +220,16 @@ install:
             sed -i "/^OTEL_EXPORTER_OTLP_ENDPOINT/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
           fi
         - |
+          # Remove old config location (to deprecate)
+          rm -f /etc/newrelic-super-agent/nrdot-values.yaml
+          # Create nr_otel_collector sub-agent dir
+          mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector
           if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           else
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/agents.d/nr_otel_collector/values.yml
+            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
           fi
 
     config_supervisors: