From 53a5f1f080c52ea08c53af8ea5b07e04d03f1939 Mon Sep 17 00:00:00 2001 From: Guillermo Sanchez Gavier Date: Thu, 12 Dec 2024 09:19:49 +0100 Subject: [PATCH] chore!: remove agent type references --- .../infrastructure/super-agent/debian.yml | 20 ++++--------------- .../infrastructure/super-agent/rhel.yml | 20 ++++--------------- .../infrastructure/super-agent/suse.yml | 20 ++++--------------- 3 files changed, 12 insertions(+), 48 deletions(-) diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/super-agent/debian.yml index c0cc2b82..f8359131 100644 --- a/recipes/newrelic/infrastructure/super-agent/debian.yml +++ b/recipes/newrelic/infrastructure/super-agent/debian.yml @@ -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: diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/super-agent/rhel.yml index 04432cf5..af6f525b 100644 --- a/recipes/newrelic/infrastructure/super-agent/rhel.yml +++ b/recipes/newrelic/infrastructure/super-agent/rhel.yml @@ -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: diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml index 3899efe9..1c10f434 100644 --- a/recipes/newrelic/infrastructure/super-agent/suse.yml +++ b/recipes/newrelic/infrastructure/super-agent/suse.yml @@ -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: