Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DO NOT MERGE]Test/super agent debian #1089

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[DO NOT MERGE]Test/super agent debian #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
694526b
Modify super-agent's infra-agent config to use the new flag is_integr…
alvarocabanas Jun 26, 2024
5ffa528
chore: Correcting the debian flow of super agent
NSSPKrishna Jun 27, 2024
7e23b0c
chore: Correcting the debian flow of super agent
NSSPKrishna Jun 27, 2024
7ad2a92
chore: Fixing the centos 8
NSSPKrishna Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions recipes/newrelic/infrastructure/super-agent/debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ install:
sed -i "/^license_key/d" /etc/newrelic-infra.yml
sed -i '/^custom_attributes:/,/^\S/{ /^\S/!d }' /etc/newrelic-infra.yml
sed -i '/^custom_attributes:/d' /etc/newrelic-infra.yml
sed -i "/^is_secure_forward_only/d" /etc/newrelic-infra.yml
sed -i "/^is_integrations_only/d" /etc/newrelic-infra.yml

if [ "{{.NR_SA_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
touch /etc/newrelic-infra-do-migrate
Expand Down Expand Up @@ -217,7 +217,7 @@ install:
setup_infra_proxy:
cmds:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false"] && [ ! -z "$HTTPS_PROXY" ]; then
if [ "{{.NR_CLI_INFRA_AGENT}}" != "false" ] && [ ! -z "$HTTPS_PROXY" ]; then
sed -i "/^proxy/d" /etc/newrelic-infra.yml
echo 'proxy: {{.HTTPS_PROXY}}' >> /etc/newrelic-infra.yml
fi
Expand Down Expand Up @@ -430,7 +430,7 @@ install:
cmds:
- |
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" = "otel" ]; then
echo 'is_secure_forward_only: true' >> /etc/newrelic-infra.yml
echo 'is_integrations_only: true' >> /etc/newrelic-infra.yml
mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-agent-linux-0.1.0.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
else
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/super-agent/rhel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ install:
sed -i "/^license_key/d" /etc/newrelic-infra.yml
sed -i '/^custom_attributes:/,/^\S/{ /^\S/!d }' /etc/newrelic-infra.yml
sed -i '/^custom_attributes:/d' /etc/newrelic-infra.yml
sed -i "/^is_secure_forward_only/d" /etc/newrelic-infra.yml
sed -i "/^is_integrations_only/d" /etc/newrelic-infra.yml

if [ "{{.NR_SA_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
touch /etc/newrelic-infra-do-migrate
Expand Down Expand Up @@ -371,7 +371,7 @@ install:
cmds:
- |
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" = "otel" ]; then
echo 'is_secure_forward_only: true' >> /etc/newrelic-infra.yml
echo 'is_integrations_only: true' >> /etc/newrelic-infra.yml
mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-agent-linux-0.1.0.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
else
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/super-agent/suse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ install:
sed -i "/^license_key/d" /etc/newrelic-infra.yml
sed -i '/^custom_attributes:/,/^\S/{ /^\S/!d }' /etc/newrelic-infra.yml
sed -i '/^custom_attributes:/d' /etc/newrelic-infra.yml
sed -i "/^is_secure_forward_only/d" /etc/newrelic-infra.yml
sed -i "/^is_integrations_only/d" /etc/newrelic-infra.yml

if [ "{{.NR_SA_MIGRATE_INFRA_CONFIG}}" == "true" ] || [ "{{.NEW_RELIC_ASSUME_YES}}" == "true" ] ; then
touch /etc/newrelic-infra-do-migrate
Expand Down Expand Up @@ -321,7 +321,7 @@ install:
cmds:
- |
if [ "{{.NR_CLI_HOST_MONITORING_SOURCE}}" = "otel" ]; then
echo 'is_secure_forward_only: true' >> /etc/newrelic-infra.yml
echo 'is_integrations_only: true' >> /etc/newrelic-infra.yml
mkdir -p /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values
cp /etc/newrelic-super-agent/examples/values-nr-otel-collector-agent-linux-0.1.0.yaml /etc/newrelic-super-agent/fleet/agents.d/nr-otel-collector/values/values.yaml
else
Expand Down
9 changes: 9 additions & 0 deletions test/definitions/super-agent/rhel/centos8-super-agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@

"instrumentations": {
"resources": [
{
"id": "nr_infra_setup",
"resource_ids": ["host1"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/shell/roles",
"params": {
"step_prepare": "sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i '|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*"
}
},
{
"id": "nr_super_agent",
"resource_ids": ["host1"],
Expand Down
9 changes: 9 additions & 0 deletions test/definitions/super-agent/rhel/centos8arm64-super-agent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@

"instrumentations": {
"resources": [
{
"id": "nr_infra_setup",
"resource_ids": ["host1"],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/shell/roles",
"params": {
"step_prepare": "sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i '|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*"
}
},
{
"id": "nr_super_agent",
"resource_ids": ["host1"],
Expand Down
Loading