Skip to content

Commit 28a8e27

Browse files
alvarocabanasDavSanchez
alvarocabanas
and
DavSanchez
authored
Remove deprecated values-file modification for super-agent recipe in staging (#998)
* feat: modify repo and path for OTLP endpoint conf * feat: create sub-agent directory * fix: remove deprecated keys from config --------- Co-authored-by: David Sánchez <[email protected]>
1 parent e4df5b7 commit 28a8e27

File tree

3 files changed

+40
-22
lines changed

3 files changed

+40
-22
lines changed

‎recipes/newrelic/infrastructure/super-agent/debian.yml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: super-agent
55
displayName: New Relic Super Agent
66
description: New Relic install recipe for the Super Agent
7-
repository: https://github.com/newrelic/newrelic-supervisor
7+
repository: https://github.com/newrelic/newrelic-super-agent
88

99
installTargets:
1010
- type: host
@@ -328,16 +328,25 @@ install:
328328
sed -i "/^OTEL_EXPORTER_OTLP_ENDPOINT/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
329329
fi
330330
- |
331+
# Remove old config location (to deprecate)
332+
rm -f /etc/newrelic-super-agent/nrdot-values.yaml
333+
sed -i "/^OTEL_EXPORTER_OTLP_ENDPOINT/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
334+
# Create nr_otel_collector sub-agent dir
335+
mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector
331336
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
332-
echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/nrdot-values.yaml
337+
echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
333338
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
334-
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
339+
echo 'otel_exporter_otlp_endpoint: "otlp.eu01.nr-data.net:4317"' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
335340
else
336-
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
341+
echo 'otel_exporter_otlp_endpoint: "otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
337342
fi
338343
339344
config_supervisors:
340345
cmds:
346+
- |
347+
# Remove values_file keys from config.yaml
348+
sed -i '/^\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
349+
sed -i '/^\s*#\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
341350
- |
342351
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
343352
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
@@ -359,9 +368,6 @@ install:
359368
else
360369
sed -i '/^\s*#\s*nr_otel_collector:/s/#//' /etc/newrelic-super-agent/config.yaml
361370
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
362-
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
363-
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
364-
fi
365371
fi
366372
367373
config_opamp:

‎recipes/newrelic/infrastructure/super-agent/rhel.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: super-agent
55
displayName: New Relic Super Agent
66
description: New Relic install recipe for the Super Agent
7-
repository: https://github.com/newrelic/newrelic-supervisor
7+
repository: https://github.com/newrelic/newrelic-super-agent
88

99
installTargets:
1010
- type: host
@@ -265,16 +265,24 @@ install:
265265
sed -i "/^OTEL_EXPORTER_OTLP_ENDPOINT/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
266266
fi
267267
- |
268+
# Remove old config location (to deprecate)
269+
rm -f /etc/newrelic-super-agent/nrdot-values.yaml
270+
# Create nr_otel_collector sub-agent dir
271+
mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector
268272
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
269-
echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/nrdot-values.yaml
273+
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
270274
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
271-
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
275+
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
272276
else
273-
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
277+
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> //etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
274278
fi
275279
276280
config_supervisors:
277281
cmds:
282+
- |
283+
# Remove values_file keys from config.yaml
284+
sed -i '/^\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
285+
sed -i '/^\s*#\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
278286
- |
279287
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
280288
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
@@ -295,10 +303,7 @@ install:
295303
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
296304
else
297305
sed -i '/^\s*#\s*nr_otel_collector:/s/#//' /etc/newrelic-super-agent/config.yaml
298-
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
299-
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
300-
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
301-
fi
306+
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
302307
fi
303308
304309
config_opamp:

‎recipes/newrelic/infrastructure/super-agent/suse.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: super-agent
55
displayName: New Relic Super Agent
66
description: New Relic install recipe for the Super Agent
7-
repository: https://github.com/newrelic/newrelic-supervisor
7+
repository: https://github.com/newrelic/newrelic-super-agent
88

99
installTargets:
1010
- type: host
@@ -220,16 +220,24 @@ install:
220220
sed -i "/^OTEL_EXPORTER_OTLP_ENDPOINT/d" /etc/newrelic-super-agent/newrelic-super-agent.conf
221221
fi
222222
- |
223+
# Remove old config location (to deprecate)
224+
rm -f /etc/newrelic-super-agent/nrdot-values.yaml
225+
# Create nr_otel_collector sub-agent dir
226+
mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector
223227
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
224-
echo 'otel_exporter_otlp_endpoint: "staging-otlp.nr-data.net:4317"' >> /etc/newrelic-super-agent/nrdot-values.yaml
228+
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=staging-otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
225229
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
226-
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
230+
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.eu01.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
227231
else
228-
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/newrelic-super-agent.conf
232+
echo 'OTEL_EXPORTER_OTLP_ENDPOINT=otlp.nr-data.net:4317' >> /etc/newrelic-super-agent/fleet/agents.d/nr_otel_collector/values.yml
229233
fi
230234
231235
config_supervisors:
232236
cmds:
237+
- |
238+
# Remove values_file keys from config.yaml
239+
sed -i '/^\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
240+
sed -i '/^\s*#\s*values_file:/d' /etc/newrelic-super-agent/config.yaml
233241
- |
234242
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
235243
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
@@ -251,9 +259,6 @@ install:
251259
else
252260
sed -i '/^\s*#\s*nr_otel_collector:/s/#//' /etc/newrelic-super-agent/config.yaml
253261
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
254-
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
255-
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
256-
fi
257262
fi
258263
259264
config_opamp:
@@ -271,6 +276,8 @@ install:
271276
sed -i '/^\s*#\s*headers:/s/#//' /etc/newrelic-super-agent/config.yaml
272277
fi
273278
- |
279+
# Remove old config location (to deprecate)
280+
rm -f /etc/newrelic-super-agent/nrdot-values.yaml
274281
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
275282
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
276283
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then

0 commit comments

Comments
 (0)