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

chore!: remove agent type references (NR-337618) #1140

Merged
merged 1 commit into from
Dec 17, 2024
Merged

chore!: remove agent type references (NR-337618) #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 4 additions & 16 deletions recipes/newrelic/infrastructure/super-agent/debian.yml
View file
Open in desktop
Copy link
Member

@paologallinaharbur paologallinaharbur Dec 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ It needs released changes on the SA. I'll notify whenever is ready

I'll try to release it today, however the changes will show agent-control and not super-agent 😕 I think you need to sync changes between @rubenruizdegauna and @DavSanchez

Original file line number Diff line number Diff line change
Expand Up @@ -420,25 +420,13 @@ install:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-no-agents.yaml /etc/newrelic-super-agent/config.yaml
elif [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-nr-otel-collector.yaml /etc/newrelic-super-agent/config.yaml
elif [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-nr-infra-agent.yaml /etc/newrelic-super-agent/config.yaml
else
cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
fi
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
else
sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
fi
- |
if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
else
sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
fi

config_fleet_id:
status:
Expand Down
20 changes: 4 additions & 16 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 @@ -363,25 +363,13 @@ install:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-no-agents.yaml /etc/newrelic-super-agent/config.yaml
elif [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-nr-otel-collector.yaml /etc/newrelic-super-agent/config.yaml
elif [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-nr-infra-agent.yaml /etc/newrelic-super-agent/config.yaml
else
cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
fi
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
else
sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
fi
- |
if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
else
sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
fi

config_fleet_id:
status:
Expand Down
20 changes: 4 additions & 16 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 @@ -310,25 +310,13 @@ install:
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ] && [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-no-agents.yaml /etc/newrelic-super-agent/config.yaml
elif [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-nr-otel-collector.yaml /etc/newrelic-super-agent/config.yaml
elif [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
cp /etc/newrelic-super-agent/examples/super-agent-config-nr-infra-agent.yaml /etc/newrelic-super-agent/config.yaml
else
cp /etc/newrelic-super-agent/examples/super-agent-config-all-agents.yaml /etc/newrelic-super-agent/config.yaml
fi
- |
if [ "{{.NR_CLI_INFRA_AGENT}}" = "false" ]; then
sed -i '/^\s*nr-infra-agent:/s/^/#/' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/^/#/' /etc/newrelic-super-agent/config.yaml
else
sed -i '/^\s*#\s*nr-infra-agent:/s/#//' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*#\s*agent_type: "newrelic\/com\.newrelic\.infrastructure_agent/s/#//' /etc/newrelic-super-agent/config.yaml
fi
- |
if [ "{{.NR_CLI_NRDOT}}" = "false" ]; then
sed -i '/^\s*nr-otel-collector:/s/^/#/' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/^/#/' /etc/newrelic-super-agent/config.yaml
else
sed -i '/^\s*#\s*nr-otel-collector:/s/#//' /etc/newrelic-super-agent/config.yaml
sed -i '/^\s*#\s*agent_type: "newrelic\/io\.opentelemetry\.collector/s/#//' /etc/newrelic-super-agent/config.yaml
fi

config_fleet_id:
status:
Expand Down
Loading