Skip to content

Commit 095d908

Browse files
alvarocabanasalvarocabanas
authored
Setup Opamp client for super-agent (#980)
1 parent eba572a commit 095d908

File tree

3 files changed

+91
-7
lines changed

3 files changed

+91
-7
lines changed

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

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ install:
7979
- task: update_otel_mem_limit
8080
- task: update_otel_end_point
8181
- task: config_supervisors
82+
- task: config_opamp
8283
- task: config_host_monitoring
8384
- task: restart_super_agent
8485
- task: assert_super_agent_started
@@ -335,10 +336,10 @@ install:
335336
config_supervisors:
336337
cmds:
337338
- |
338-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false"] ; then
339-
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
339+
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false" ] ; then
340+
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
340341
else
341-
sudo sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
342+
sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
342343
fi
343344
- |
344345
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" ] ; then
@@ -357,6 +358,33 @@ install:
357358
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
358359
fi
359360
361+
config_opamp:
362+
cmds:
363+
- |
364+
if [ "{{.NR_CLI_FLEET_ENABLED}}" == "false" ] ; then
365+
sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
366+
sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
367+
sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
368+
sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-super-agent/config.yaml
369+
else
370+
sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-super-agent/config.yaml
371+
sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/#//' /etc/newrelic-super-agent/config.yaml
372+
sed -i '/^\s*#\s*api-key:/s/#//' /etc/newrelic-super-agent/config.yaml
373+
sed -i '/^\s*#\s*headers:/s/#//' /etc/newrelic-super-agent/config.yaml
374+
fi
375+
- |
376+
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
377+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
378+
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
379+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
380+
else
381+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
382+
fi
383+
- |
384+
if [ "{{.NR_CLI_FLEET_ENABLED}}" != "false" ] ; then
385+
sed -i 's/api-key: API_KEY_HERE/api-key: {{.NEW_RELIC_LICENSE_KEY}}/g' /etc/newrelic-super-agent/config.yaml
386+
fi
387+
360388
config_host_monitoring:
361389
cmds:
362390
- |

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

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ install:
9898
- task: update_otel_mem_limit
9999
- task: update_otel_end_point
100100
- task: config_supervisors
101+
- task: config_opamp
101102
- task: config_host_monitoring
102103
- task: restart_super_agent
103104
- task: assert_super_agent_started
@@ -271,10 +272,10 @@ install:
271272
config_supervisors:
272273
cmds:
273274
- |
274-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false"] ; then
275+
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false" ] ; then
275276
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
276277
else
277-
sudo sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
278+
sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
278279
fi
279280
- |
280281
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" ] ; then
@@ -293,6 +294,33 @@ install:
293294
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
294295
fi
295296
297+
config_opamp:
298+
cmds:
299+
- |
300+
if [ "{{.NR_CLI_FLEET_ENABLED}}" == "false" ] ; then
301+
sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
302+
sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
303+
sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
304+
sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-super-agent/config.yaml
305+
else
306+
sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-super-agent/config.yaml
307+
sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/#//' /etc/newrelic-super-agent/config.yaml
308+
sed -i '/^\s*#\s*api-key:/s/#//' /etc/newrelic-super-agent/config.yaml
309+
sed -i '/^\s*#\s*headers:/s/#//' /etc/newrelic-super-agent/config.yaml
310+
fi
311+
- |
312+
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
313+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
314+
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
315+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
316+
else
317+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
318+
fi
319+
- |
320+
if [ "{{.NR_CLI_FLEET_ENABLED}}" != "false" ] ; then
321+
sed -i 's/api-key: API_KEY_HERE/api-key: {{.NEW_RELIC_LICENSE_KEY}}/g' /etc/newrelic-super-agent/config.yaml
322+
fi
323+
296324
config_host_monitoring:
297325
cmds:
298326
- |

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

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ install:
6969
- task: update_otel_mem_limit
7070
- task: update_otel_end_point
7171
- task: config_supervisors
72+
- task: config_opamp
7273
- task: config_host_monitoring
7374
- task: restart_super_agent
7475
- task: assert_super_agent_started
@@ -225,10 +226,10 @@ install:
225226
config_supervisors:
226227
cmds:
227228
- |
228-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false"] ; then
229+
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false" ] ; then
229230
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
230231
else
231-
sudo sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
232+
sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
232233
fi
233234
- |
234235
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" ] ; then
@@ -247,6 +248,33 @@ install:
247248
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
248249
fi
249250
251+
config_opamp:
252+
cmds:
253+
- |
254+
if [ "{{.NR_CLI_FLEET_ENABLED}}" == "false" ] ; then
255+
sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
256+
sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
257+
sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
258+
sed -i '/^\s*headers:/s/^/#/' /etc/newrelic-super-agent/config.yaml
259+
else
260+
sed -i 's/s*#\s*opamp:/opamp:/g' /etc/newrelic-super-agent/config.yaml
261+
sed -i '/^\s*#\s*endpoint: https:\/\/opamp/s/#//' /etc/newrelic-super-agent/config.yaml
262+
sed -i '/^\s*#\s*api-key:/s/#//' /etc/newrelic-super-agent/config.yaml
263+
sed -i '/^\s*#\s*headers:/s/#//' /etc/newrelic-super-agent/config.yaml
264+
fi
265+
- |
266+
if [ "{{.NEW_RELIC_REGION}}" = "STAGING" ]; then
267+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"staging-service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
268+
elif [ "{{.NEW_RELIC_REGION}}" = "EU" ]; then
269+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.eu.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
270+
else
271+
sed -i 's/\(endpoint: https:\/\/opamp.\).*/\1'"service.newrelic.com\/v1\/opamp"'/' /etc/newrelic-super-agent/config.yaml
272+
fi
273+
- |
274+
if [ "{{.NR_CLI_FLEET_ENABLED}}" != "false" ] ; then
275+
sed -i 's/api-key: API_KEY_HERE/api-key: {{.NEW_RELIC_LICENSE_KEY}}/g' /etc/newrelic-super-agent/config.yaml
276+
fi
277+
250278
config_host_monitoring:
251279
cmds:
252280
- |

0 commit comments

Comments
 (0)