feat: provide values file to nrdot agent type (#990)

newrelic · Oct 25, 2023 · a0f054e · a0f054e
1 parent 3459db4
commit a0f054e
Show file tree

Hide file tree

Showing 28 changed files with 13 additions and 4 deletions.
diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/super-agent/debian.yml
@@ -326,7 +326,7 @@ install:
           fi
         - |
           if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf  
+            echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/nrdot-values.yaml
           elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
             echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
           else
@@ -356,6 +356,9 @@ install:
           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
+            if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then 
+              sed -i 's/nr_otel_collector:/nr_otel_collector:\n    values_file: "\/etc\/newrelic-super-agent\/nrdot-values\.yaml"/' /etc/newrelic-super-agent/config.yaml
+            fi
           fi
 
     config_opamp:
@@ -427,4 +430,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 Super Agent 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
@@ -262,7 +262,7 @@ install:
           fi
         - |
           if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf  
+            echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/nrdot-values.yaml 
           elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
             echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
           else
@@ -292,6 +292,9 @@ install:
           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
+            if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then 
+              sed -i 's/nr_otel_collector:/nr_otel_collector:\n    values_file: "\/etc\/newrelic-super-agent\/nrdot-values\.yaml"/' /etc/newrelic-super-agent/config.yaml
+            fi
           fi
 
     config_opamp:

diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml
@@ -216,7 +216,7 @@ install:
           fi
         - |
           if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
-            echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf  
+            echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/nrdot-values.yaml
           elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
             echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
           else
@@ -246,6 +246,9 @@ install:
           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
+            if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then 
+              sed -i 's/nr_otel_collector:/nr_otel_collector:\n    values_file: "\/etc\/newrelic-super-agent\/nrdot-values\.yaml"/' /etc/newrelic-super-agent/config.yaml
+            fi
           fi
 
     config_opamp:

diff --git a/...r-agent/debians/debian10-super-agent.json → ...gent/debians/debian10-super-agent-eu.json b/...r-agent/debians/debian10-super-agent.json → ...gent/debians/debian10-super-agent-eu.json
diff --git a/...nt/debians/debian10arm64-super-agent.json → ...debians/debian10arm64-super-agent-eu.json b/...nt/debians/debian10arm64-super-agent.json → ...debians/debian10arm64-super-agent-eu.json
diff --git a/...r-agent/debians/debian11-super-agent.json → ...gent/debians/debian11-super-agent-eu.json b/...r-agent/debians/debian11-super-agent.json → ...gent/debians/debian11-super-agent-eu.json
diff --git a/...r-agent/debians/ubuntu16-super-agent.json → ...gent/debians/ubuntu16-super-agent-eu.json b/...r-agent/debians/ubuntu16-super-agent.json → ...gent/debians/ubuntu16-super-agent-eu.json
diff --git a/...r-agent/debians/ubuntu18-super-agent.json → ...gent/debians/ubuntu18-super-agent-eu.json b/...r-agent/debians/ubuntu18-super-agent.json → ...gent/debians/ubuntu18-super-agent-eu.json
diff --git a/...r-agent/debians/ubuntu20-super-agent.json → ...gent/debians/ubuntu20-super-agent-eu.json b/...r-agent/debians/ubuntu20-super-agent.json → ...gent/debians/ubuntu20-super-agent-eu.json
diff --git a/...nt/debians/ubuntu20arm64-super-agent.json → ...debians/ubuntu20arm64-super-agent-eu.json b/...nt/debians/ubuntu20arm64-super-agent.json → ...debians/ubuntu20arm64-super-agent-eu.json
diff --git a/...r-agent/debians/ubuntu22-super-agent.json → ...gent/debians/ubuntu22-super-agent-eu.json b/...r-agent/debians/ubuntu22-super-agent.json → ...gent/debians/ubuntu22-super-agent-eu.json
diff --git a/...t/logs/amazonlinux2-super-agent-logs.json → ...ogs/amazonlinux2-super-agent-logs-eu.json b/...t/logs/amazonlinux2-super-agent-logs.json → ...ogs/amazonlinux2-super-agent-logs-eu.json
diff --git a/...ogs/amazonlinux2023-super-agent-logs.json → .../amazonlinux2023-super-agent-logs-eu.json b/...ogs/amazonlinux2023-super-agent-logs.json → .../amazonlinux2023-super-agent-logs-eu.json
diff --git a/...agent/logs/debian11-super-agent-logs.json → ...nt/logs/debian11-super-agent-logs-eu.json b/...agent/logs/debian11-super-agent-logs.json → ...nt/logs/debian11-super-agent-logs-eu.json
diff --git a/...-agent/logs/redhat8-super-agent-logs.json → ...ent/logs/redhat8-super-agent-logs-eu.json b/...-agent/logs/redhat8-super-agent-logs.json → ...ent/logs/redhat8-super-agent-logs-eu.json
diff --git a/...-agent/logs/redhat9-super-agent-logs.json → ...ent/logs/redhat9-super-agent-logs-eu.json b/...-agent/logs/redhat9-super-agent-logs.json → ...ent/logs/redhat9-super-agent-logs-eu.json
diff --git a/...-agent/logs/suse154-super-agent-logs.json → ...ent/logs/suse154-super-agent-logs-eu.json b/...-agent/logs/suse154-super-agent-logs.json → ...ent/logs/suse154-super-agent-logs-eu.json
diff --git a/...agent/logs/ubuntu20-super-agent-logs.json → ...nt/logs/ubuntu20-super-agent-logs-eu.json b/...agent/logs/ubuntu20-super-agent-logs.json → ...nt/logs/ubuntu20-super-agent-logs-eu.json
diff --git a/...agent/logs/ubuntu22-super-agent-logs.json → ...nt/logs/ubuntu22-super-agent-logs-eu.json b/...agent/logs/ubuntu22-super-agent-logs.json → ...nt/logs/ubuntu22-super-agent-logs-eu.json
diff --git a/...er-agent/rhel/awslinux23-super-agent.json → ...agent/rhel/awslinux23-super-agent-eu.json b/...er-agent/rhel/awslinux23-super-agent.json → ...agent/rhel/awslinux23-super-agent-eu.json
diff --git a/...agent/rhel/awslinuxarm64-super-agent.json → ...nt/rhel/awslinuxarm64-super-agent-eu.json b/...agent/rhel/awslinuxarm64-super-agent.json → ...nt/rhel/awslinuxarm64-super-agent-eu.json
diff --git a/...super-agent/rhel/centos7-super-agent.json → ...er-agent/rhel/centos7-super-agent-eu.json b/...super-agent/rhel/centos7-super-agent.json → ...er-agent/rhel/centos7-super-agent-eu.json
diff --git a/...super-agent/rhel/centos8-super-agent.json → ...er-agent/rhel/centos8-super-agent-eu.json b/...super-agent/rhel/centos8-super-agent.json → ...er-agent/rhel/centos8-super-agent-eu.json
diff --git a/...-agent/rhel/centos8arm64-super-agent.json → ...ent/rhel/centos8arm64-super-agent-eu.json b/...-agent/rhel/centos8arm64-super-agent.json → ...ent/rhel/centos8arm64-super-agent-eu.json
diff --git a/...super-agent/rhel/redhat7-super-agent.json → ...er-agent/rhel/redhat7-super-agent-eu.json b/...super-agent/rhel/redhat7-super-agent.json → ...er-agent/rhel/redhat7-super-agent-eu.json
diff --git a/...-agent/rhel/redhat8arm64-super-agent.json → ...ent/rhel/redhat8arm64-super-agent-eu.json b/...-agent/rhel/redhat8arm64-super-agent.json → ...ent/rhel/redhat8arm64-super-agent-eu.json
diff --git a/...super-agent/suse/suse125-super-agent.json → ...er-agent/suse/suse125-super-agent-eu.json b/...super-agent/suse/suse125-super-agent.json → ...er-agent/suse/suse125-super-agent-eu.json
diff --git a/...super-agent/suse/suse154-super-agent.json → ...er-agent/suse/suse154-super-agent-eu.json b/...super-agent/suse/suse154-super-agent.json → ...er-agent/suse/suse154-super-agent-eu.json