Skip to content

fix: nrdot onhost agent#1832

Merged
gsanchezgavier merged 2 commits intomainfrom
gsanchez/test/nrdot-e2e-onhost
Nov 4, 2025
Merged

fix: nrdot onhost agent#1832
gsanchezgavier merged 2 commits intomainfrom
gsanchez/test/nrdot-e2e-onhost

Conversation

@gsanchezgavier
Copy link
Contributor

  • Adds an e2e for nrdot (currently using a feature branch)

Fixes nrdot

  • agent id matches with local config ref
  • config template convert to yaml
  • removing the prometheus flag due to nrdot(onhost) not having prometheus receivers/processors anymore (details)

@gsanchezgavier gsanchezgavier requested a review from a team as a code owner November 4, 2025 14:00
Self {
otel_agent_values_path: PathBuf::from(
"/etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values",
"/etc/newrelic-agent-control/fleet/agents.d/nrdot/values",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

All this is a bit fragile , we should use defaults const to improve it a bit

Copy link
Contributor

Choose a reason for hiding this comment

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

That's true, and do you want to leave it out of this PR? you can move this to a constant at the top of the file like it's done for infra-agent you can even compose it in 2 :

  • /etc/newrelic-agent-control/
  • fleet/agents.d/nrdot/values

So it can be matched on the test

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes i will create a separate pr, try to find find other part like this . I think we can release without that

@gsanchezgavier gsanchezgavier added the onhost-extended-e2e Execution of on host e2e in the current branch label Nov 4, 2025
Self {
otel_agent_values_path: PathBuf::from(
"/etc/newrelic-agent-control/fleet/agents.d/nr-otel-collector/values",
"/etc/newrelic-agent-control/fleet/agents.d/nrdot/values",
Copy link
Contributor

Choose a reason for hiding this comment

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

That's true, and do you want to leave it out of this PR? you can move this to a constant at the top of the file like it's done for infra-agent you can even compose it in 2 :

  • /etc/newrelic-agent-control/
  • fleet/agents.d/nrdot/values

So it can be matched on the test

@@ -1,2 +1,2 @@
config: |
config:
{{ OTEL_COLLECTOR_CONFIG }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

credits to @sigilioso on this one

LOCAL_PACKAGE_PATH ?= $(CURDIR)/../../dist
RECIPE_BRANCH ?= main
RECIPE_BRANCH ?= NR_483970_use_cli_host_monitoring

Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't you leave it to main?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, main is broken. Once your Pr is merged on the recipe please move this to main

alvarocabanas
alvarocabanas previously approved these changes Nov 4, 2025
Copy link
Contributor

@alvarocabanas alvarocabanas left a comment

Choose a reason for hiding this comment

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

LGTM

@gsanchezgavier gsanchezgavier merged commit 9bc0d4a into main Nov 4, 2025
34 checks passed
@gsanchezgavier gsanchezgavier deleted the gsanchez/test/nrdot-e2e-onhost branch November 4, 2025 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

onhost-extended-e2e Execution of on host e2e in the current branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants