Skip to content

Commit 80ed5d7

Browse files
gsanchezgaviergsanchezgavier
authored
feat(superagent): Add fleet (#1070)
* add fleet_id config * unify scripts * fix regex
1 parent 10f5239 commit 80ed5d7

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ install:
7878
- task: install_super_agent
7979
- task: update_otel_license_key
8080
- task: config_supervisors
81+
- task: config_fleet_id
8182
- task: config_opamp
8283
- task: config_host_monitoring
8384
- task: update_otel_mem_limit
@@ -390,6 +391,14 @@ install:
390391
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
391392
fi
392393
394+
config_fleet_id:
395+
cmds:
396+
- |
397+
if [ ! -z "{{.NR_CLI_FLEET_ID}}" ] ; then
398+
sed -i 's/^#\s*fleet_id:/fleet_id:/g' /etc/newrelic-super-agent/config.yaml
399+
sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-super-agent/config.yaml
400+
fi
401+
393402
config_opamp:
394403
cmds:
395404
- |

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ install:
100100
- task: install_super_agent
101101
- task: update_otel_license_key
102102
- task: config_supervisors
103+
- task: config_fleet_id
103104
- task: config_opamp
104105
- task: config_host_monitoring
105106
- task: update_otel_mem_limit
@@ -315,20 +316,28 @@ install:
315316
cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
316317
fi
317318
- |
318-
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] ; then
319+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
319320
sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
320321
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
321322
else
322323
sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
323324
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
324325
fi
325326
- |
326-
if [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
327+
if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
327328
sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
328329
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
329330
else
330331
sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
331-
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
332+
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
333+
fi
334+
335+
config_fleet_id:
336+
cmds:
337+
- |
338+
if [ ! -z "{{.NR_CLI_FLEET_ID}}" ] ; then
339+
sed -i 's/^#\s*fleet_id:/fleet_id:/g' /etc/newrelic-super-agent/config.yaml
340+
sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-super-agent/config.yaml
332341
fi
333342
334343
config_opamp:

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ install:
6767
- task: install_super_agent
6868
- task: update_otel_license_key
6969
- task: config_supervisors
70+
- task: config_fleet_id
7071
- task: config_opamp
7172
- task: config_host_monitoring
7273
- task: update_otel_mem_limit
@@ -247,11 +248,11 @@ install:
247248
cmds:
248249
- |
249250
if [ "{{.NR_CLI_NRDOT}}" != "false" ]; then
250-
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
251+
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
251252
sed -i "s/endpoint: .*$/endpoint: staging-otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
252-
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
253+
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
253254
sed -i "s/endpoint: .*$/endpoint: otlp.eu01.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
254-
else
255+
else
255256
sed -i "s/endpoint: .*$/endpoint: otlp.nr-data.net:4317/g" /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
256257
fi
257258
fi
@@ -265,22 +266,30 @@ install:
265266
cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
266267
fi
267268
- |
268-
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] ; then
269+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
269270
sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
270271
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
271272
else
272273
sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
273274
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
274275
fi
275276
- |
276-
if [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
277+
if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
277278
sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
278279
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
279280
else
280281
sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
281282
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
282283
fi
283284
285+
config_fleet_id:
286+
cmds:
287+
- |
288+
if [ ! -z "{{.NR_CLI_FLEET_ID}}" ] ; then
289+
sed -i 's/^#\s*fleet_id:/fleet_id:/g' /etc/newrelic-super-agent/config.yaml
290+
sed -i 's/fleet_id: FLEET_ID_HERE/fleet_id: {{.NR_CLI_FLEET_ID}}/g' /etc/newrelic-super-agent/config.yaml
291+
fi
292+
284293
config_opamp:
285294
cmds:
286295
- |
@@ -296,8 +305,6 @@ install:
296305
sed -i '/^\s*#\s*headers:/s/#//' /etc/newrelic-super-agent/config.yaml
297306
fi
298307
- |
299-
# Remove old config location (to deprecate)
300-
rm -f /etc/newrelic-super-agent/nrdot-values.yaml
301308
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
302309
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
303310
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then

0 commit comments

Comments
 (0)