Skip to content

Commit 54e5dcc

Browse files
alvarocabanasalvarocabanas
authored
Super Agent recipe, add all repository to allow Fluentbit installation and fix bugs (#994)
1 parent a0f054e commit 54e5dcc

File tree

4 files changed

+54
-40
lines changed

4 files changed

+54
-40
lines changed

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ preInstall:
4343
echo "docker detected with environ, unsupported" >&2
4444
exit 131
4545
fi
46-
if [[ -f /.dockerenv ]] ; then
46+
if [ -f /.dockerenv ] ; then
4747
echo "docker detected with .dockerenv, unsupported" >&2
4848
exit 131
4949
fi
@@ -138,7 +138,7 @@ install:
138138
- |
139139
if [ -n "{{.DEBIAN_CODENAME}}" ]; then
140140
IS_AGENT_AVAILABLE=$(curl -Is {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/apt/dists/{{.DEBIAN_CODENAME}}/InRelease | grep " 2[0-9][0-9] " | wc -l)
141-
if [ $IS_INFRA_AVAILABLE -eq 0 ] ; then
141+
if [ $IS_AGENT_AVAILABLE -eq 0 ] ; then
142142
echo "there is no newrelic super agent available for the distribution with codename '{{.DEBIAN_CODENAME}}'." >&2
143143
exit 131
144144
fi
@@ -199,7 +199,7 @@ install:
199199
setup_infra_proxy:
200200
cmds:
201201
- |
202-
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" && ! -z "$HTTPS_PROXY" ]; then
202+
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false"] && [ ! -z "$HTTPS_PROXY" ]; then
203203
sed -i "/^proxy/d" /etc/newrelic-infra.yml
204204
echo 'proxy: {{.HTTPS_PROXY}}' >> /etc/newrelic-infra.yml
205205
fi
@@ -257,10 +257,13 @@ install:
257257
if [ $IS_ARM -gt 0 ] ; then
258258
ARCH="arm64"
259259
fi
260+
260261
if [ -n "{{.DEBIAN_CODENAME}}" ]; then
261-
printf "deb [arch="$ARCH"] {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/apt {{.DEBIAN_CODENAME}} main" | tee /etc/apt/sources.list.d/newrelic-infra.list > /dev/null
262+
printf "deb [arch="$ARCH"] {{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/apt {{.DEBIAN_CODENAME}} main" | tee /etc/apt/sources.list.d/newrelic-infra.list > /dev/null
263+
printf "\ndeb [arch="$ARCH"] {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/apt {{.DEBIAN_CODENAME}} main" | tee -a /etc/apt/sources.list.d/newrelic-infra.list > /dev/null
262264
else
263-
printf "deb [arch="$ARCH"] {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/apt {{.DEBIAN_VERSION_CODENAME}} main" | tee /etc/apt/sources.list.d/newrelic-infra.list > /dev/null
265+
printf "deb [arch="$ARCH"] {{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/apt {{.DEBIAN_VERSION_CODENAME}} main" | tee /etc/apt/sources.list.d/newrelic-infra.list > /dev/null
266+
printf "\ndeb [arch="$ARCH"] {{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/apt {{.DEBIAN_VERSION_CODENAME}} main" | tee -a /etc/apt/sources.list.d/newrelic-infra.list > /dev/null
264267
fi
265268
vars:
266269
DEBIAN_CODENAME:
@@ -336,21 +339,21 @@ install:
336339
config_supervisors:
337340
cmds:
338341
- |
339-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false" ] ; then
342+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
340343
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
341344
else
342345
sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
343346
fi
344347
- |
345-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" ] ; then
348+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
346349
sed -i '/^\s*nr_infra_agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
347350
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
348351
else
349352
sed -i '/^\s*#\s*nr_infra_agent:/s/#//' /etc/newrelic-super-agent/config.yaml
350353
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
351354
fi
352355
- |
353-
if [ "{{.NR_CLI_NRDOT}}" == "false" ] ; then
356+
if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
354357
sed -i '/^\s*nr_otel_collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
355358
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
356359
else
@@ -364,7 +367,7 @@ install:
364367
config_opamp:
365368
cmds:
366369
- |
367-
if [ "{{.NR_CLI_FLEET_ENABLED}}" == "false" ] ; then
370+
if [ "{{.NR_CLI_FLEET_ENABLED}}" = "false" ] ; then
368371
sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
369372
sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
370373
sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
@@ -391,7 +394,7 @@ install:
391394
config_host_monitoring:
392395
cmds:
393396
- |
394-
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" == "otel" ]; then
397+
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" = "otel" ]; then
395398
echo 'is_secure_forward_only: true' >> /etc/newrelic-infra.yml
396399
else
397400
if [ -f /etc/nr-otel-collector/config.yaml ]; then

‎recipes/newrelic/infrastructure/super-agent/logs/linux-logs.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ displayName: Logs Integration
66
description: New Relic install recipe for Logging in super-agent
77
repository: https://github.com/newrelic/infrastructure-agent/tree/master/assets/examples/logging
88

9-
dependencies:
10-
- super-agent
11-
129
installTargets:
1310
- type: host
1411
os: linux
@@ -71,6 +68,11 @@ installTargets:
7168
platformFamily: rhel
7269
platformVersion: "((7|8)\\.?.*)"
7370
kernelArch: aarch64
71+
- type: host
72+
os: linux
73+
platformFamily: suse
74+
platformVersion: "(15\\.[1-4]|15-SP[1-4])"
75+
kernelArch: aarch64
7476

7577
keywords:
7678
- Logs

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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ preInstall:
5959
echo "docker detected with environ, unsupported" >&2
6060
exit 131
6161
fi
62-
if [[ -f /.dockerenv ]] ; then
62+
if [ -f /.dockerenv ] ; then
6363
echo "docker detected with .dockerenv, unsupported" >&2
6464
exit 131
6565
fi
@@ -154,13 +154,13 @@ install:
154154
exit 15
155155
fi
156156
- |
157-
if [[ {{.AMAZON_LINUX_VERSION}} != "2" && {{.AMAZON_LINUX_VERSION}} != "2023" ]] ; then
158-
REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/yum/{{.REPO_DIR}}/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
157+
if [ "{{.AMAZON_LINUX_VERSION}}" != "2" ] && [ "{{.AMAZON_LINUX_VERSION}}" != "2023" ] ; then
158+
REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
159159
else
160-
REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/yum/{{.REPO_DIR}}/{{.AMAZON_LINUX_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
160+
REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.AMAZON_LINUX_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
161161
fi
162162
IS_NEWRELIC_AVAILABLE=$(curl -Ls $REPO_URL | grep "\[newrelic-infra\]" | wc -l)
163-
if [ $IS_INFRA_AVAILABLE -eq 0 ] ; then
163+
if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
164164
echo "there is no newrelic super agent available for the distribution '{{.DISTRO_VERSION}}'." >&2
165165
exit 21
166166
fi
@@ -225,18 +225,22 @@ install:
225225
install_super_agent:
226226
cmds:
227227
- |
228-
if [[ {{.AMAZON_LINUX_VERSION}} != "2" && {{.AMAZON_LINUX_VERSION}} != "2023" ]] ; then
229-
REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
228+
if [ "{{.AMAZON_LINUX_VERSION}}" != "2" ] && [ "{{.AMAZON_LINUX_VERSION}}" != "2023" ] ; then
229+
SUPER_AGENT_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
230230
else
231-
REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.AMAZON_LINUX_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
231+
SUPER_AGENT_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/yum/{{.REPO_DIR}}/{{.AMAZON_LINUX_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
232232
fi
233-
IS_NEWRELIC_AVAILABLE=$(curl -Ls $REPO_URL | grep "\[newrelic-infra\]" | wc -l)
233+
IS_NEWRELIC_AVAILABLE=$(curl -Ls $SUPER_AGENT_REPO_URL | grep "\[newrelic-infra\]" | wc -l)
234234
if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
235-
echo "newrelic super agent is not available for this architecture "$ARCH". See our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
235+
echo "newrelic super agent is not available for this architecture {{.ARCH}}. See our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
236236
exit 131
237-
fi
238-
curl -s $REPO_URL -o /etc/yum.repos.d/newrelic-infra.repo
239-
yum -y -q makecache --disablerepo='*' --enablerepo='newrelic-infra'
237+
fi
238+
INFRA_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/yum/el/{{.DISTRO_VERSION}}/{{.ARCH}}/newrelic-infra.repo")
239+
240+
curl -s $INFRA_REPO_URL -o /etc/yum.repos.d/newrelic-infra.repo
241+
curl -s $SUPER_AGENT_REPO_URL | sed 's/\[newrelic-infra]/\n[newrelic-super-agent]/g' >> /etc/yum.repos.d/newrelic-infra.repo
242+
243+
yum -y -q makecache --disablerepo='*' --enablerepo='newrelic-infra' --enablerepo='newrelic-super-agent'
240244
yum -y -q install newrelic-super-agent
241245
vars:
242246
DISTRO_VERSION:
@@ -272,21 +276,21 @@ install:
272276
config_supervisors:
273277
cmds:
274278
- |
275-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false" ] ; then
279+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
276280
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
277281
else
278282
sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
279283
fi
280284
- |
281-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" ] ; then
285+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] ; then
282286
sed -i '/^\s*nr_infra_agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
283287
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
284288
else
285289
sed -i '/^\s*#\s*nr_infra_agent:/s/#//' /etc/newrelic-super-agent/config.yaml
286290
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
287291
fi
288292
- |
289-
if [ "{{.NR_CLI_NRDOT}}" == "false" ] ; then
293+
if [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
290294
sed -i '/^\s*nr_otel_collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
291295
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
292296
else
@@ -300,7 +304,7 @@ install:
300304
config_opamp:
301305
cmds:
302306
- |
303-
if [ "{{.NR_CLI_FLEET_ENABLED}}" == "false" ] ; then
307+
if [ "{{.NR_CLI_FLEET_ENABLED}}" = "false" ] ; then
304308
sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
305309
sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
306310
sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
@@ -327,7 +331,7 @@ install:
327331
config_host_monitoring:
328332
cmds:
329333
- |
330-
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" == "otel" ]; then
334+
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" = "otel" ]; then
331335
echo 'is_secure_forward_only: true' >> /etc/newrelic-infra.yml
332336
else
333337
if [ -f /etc/nr-otel-collector/config.yaml ]; then

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ preInstall:
3838
echo "docker detected with environ, unsupported" >&2
3939
exit 131
4040
fi
41-
if [[ -f /.dockerenv ]] ; then
41+
if [ -f /.dockerenv ] ; then
4242
echo "docker detected with .dockerenv, unsupported" >&2
4343
exit 131
4444
fi
@@ -181,16 +181,21 @@ install:
181181
cmds:
182182
- |
183183
ARCH=$(uname -m)
184-
REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/zypp/sles/{{.SLES_VERSION}}/$ARCH/newrelic-infra.repo")
185-
IS_NEWRELIC_AVAILABLE=$(curl -Ls $REPO_URL | grep "\[newrelic-infra\]" | wc -l)
184+
SUPER_AGENT_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}preview/linux/zypp/sles/{{.SLES_VERSION}}/$ARCH/newrelic-infra.repo")
185+
IS_NEWRELIC_AVAILABLE=$(curl -Ls $SUPER_AGENT_REPO_URL | grep "\[newrelic-infra\]" | wc -l)
186186
if [ $IS_NEWRELIC_AVAILABLE -eq 0 ] ; then
187187
echo "newrelic super agent is not available for this architecture "$ARCH". See our documentation for installing manually https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/install-new-relic" >&2
188188
exit 131
189189
fi
190-
curl -s $REPO_URL -o /etc/zypp/repos.d/newrelic-infra.repo
190+
INFRA_REPO_URL=$(echo -n "{{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/linux/zypp/sles/{{.SLES_VERSION}}/$ARCH/newrelic-infra.repo")
191+
192+
curl -s $INFRA_REPO_URL -o /etc/zypp/repos.d/newrelic-infra.repo
193+
curl -s $SUPER_AGENT_REPO_URL | sed 's/\[newrelic-infra]/\n[newrelic-super-agent]/g' >> /etc/zypp/repos.d/newrelic-infra.repo
194+
191195
- curl -s -L {{.NEW_RELIC_DOWNLOAD_URL}}infrastructure_agent/keys/newrelic_rpm_key_current.gpg > newrelic_rpm_key_current.gpg
192196
- rpm --import newrelic_rpm_key_current.gpg
193197
- zypper -n --quiet ref -r newrelic-infra
198+
- zypper -n --quiet ref -r newrelic-super-agent
194199
- zypper -n --quiet install newrelic-super-agent
195200
- rm newrelic_rpm_key_current.gpg
196201
vars:
@@ -226,21 +231,21 @@ install:
226231
config_supervisors:
227232
cmds:
228233
- |
229-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" && "{{.NR_CLI_NRDOT}}" == "false" ] ; then
234+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
230235
sed -i '/^\s*agents:/s/^/#/' /etc/newrelic-super-agent/config.yaml
231236
else
232237
sed -i 's/s*#\s*agents:/agents:/g' /etc/newrelic-super-agent/config.yaml
233238
fi
234239
- |
235-
if [ "{{.NR_CLI_INFRA_AGENT}}" == "false" ] ; then
240+
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] ; then
236241
sed -i '/^\s*nr_infra_agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
237242
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
238243
else
239244
sed -i '/^\s*#\s*nr_infra_agent:/s/#//' /etc/newrelic-super-agent/config.yaml
240245
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
241246
fi
242247
- |
243-
if [ "{{.NR_CLI_NRDOT}}" == "false" ] ; then
248+
if [ "{{.NR_CLI_NRDOT}}" = "false" ] ; then
244249
sed -i '/^\s*nr_otel_collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
245250
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
246251
else
@@ -254,7 +259,7 @@ install:
254259
config_opamp:
255260
cmds:
256261
- |
257-
if [ "{{.NR_CLI_FLEET_ENABLED}}" == "false" ] ; then
262+
if [ "{{.NR_CLI_FLEET_ENABLED}}" = "false" ] ; then
258263
sed -i '/^\s*opamp:/s/^/#/' /etc/newrelic-super-agent/config.yaml
259264
sed -i '/^\s*endpoint: https:\/\/opamp/s/^/#/' /etc/newrelic-super-agent/config.yaml
260265
sed -i '/^\s*api-key:/s/^/#/' /etc/newrelic-super-agent/config.yaml
@@ -281,7 +286,7 @@ install:
281286
config_host_monitoring:
282287
cmds:
283288
- |
284-
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" == "otel" ]; then
289+
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" = "otel" ]; then
285290
echo 'is_secure_forward_only: true' >> /etc/newrelic-infra.yml
286291
else
287292
if [ -f /etc/nr-otel-collector/config.yaml ]; then

0 commit comments

Comments
 (0)