-
Notifications
You must be signed in to change notification settings - Fork 3
chore: rename NRDOT agent type #1745
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.
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
Merged
DavSanchez
merged 5 commits into
main
from
chore/rename-opentelemetry-collector-agent-type
Oct 3, 2025
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
76f7f72
chore: rename NRDOT agent type
DavSanchez a69a943
chore: maintain both identifiers for now
DavSanchez d5a09e4
fix: add duplicate agent type to tests
DavSanchez 4f905c4
test: revert config in test
DavSanchez 8a5c8b5
docs: comment why two NRDOT agents are kept
DavSanchez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
177 changes: 177 additions & 0 deletions
177
agent-control/agent-type-registry/newrelic/com.newrelic.opentelemetry.collector-0.1.0.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| namespace: newrelic | ||
| name: com.newrelic.opentelemetry.collector | ||
| version: 0.1.0 | ||
| variables: | ||
| on_host: | ||
| config: | ||
| description: "Newrelic otel collector configuration" | ||
| type: yaml | ||
| required: false | ||
| default: {} | ||
| backoff_delay: | ||
| description: "seconds until next retry if agent fails to start" | ||
| type: string | ||
| required: false | ||
| default: 20s | ||
| health_check: | ||
| # Note the configs added here must align with the health check extension being used on the collector config variable. | ||
| # See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/healthcheckv2extension/README.md#configuration | ||
| # For more details | ||
| path: | ||
| description: "path to health check endpoint" | ||
| type: string | ||
| required: false | ||
| default: "/health/status" # Taken from example at: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/extension/healthcheckv2extension/README.md#configuration | ||
| port: | ||
| description: "port to health check endpoint" | ||
| type: number | ||
| required: false | ||
| default: 13133 | ||
| k8s: | ||
| chart_values: | ||
| nr-k8s-otel-collector: | ||
| description: "Newrelic otel collector chart values" | ||
| type: yaml | ||
| required: false | ||
| default: {} | ||
| global: | ||
| description: "Global values for the chart" | ||
| type: yaml | ||
| required: false | ||
| default: {} | ||
| chart_version: | ||
| description: "Newrelic otel collector chart version" | ||
| type: string | ||
| required: true | ||
| chart_name: | ||
| description: "nr-k8s-otel-collector chart name" | ||
| type: string | ||
| required: false | ||
| default: "nr-k8s-otel-collector" | ||
| chart_repository: | ||
| url: | ||
| description: "chart repository url" | ||
| type: string | ||
| required: false | ||
| default: "https://helm-charts.newrelic.com" | ||
| variants: | ||
| ac_config_field: "chart_repository_urls" | ||
| values: ["https://helm-charts.newrelic.com"] | ||
| secret_reference: | ||
| description: "HelmRepository secret reference (secretRef)" | ||
| type: yaml | ||
| required: false | ||
| default: null | ||
| certificate_secret_reference: | ||
| description: "HelmRepository certificate secret reference (certSecretRef)" | ||
| type: yaml | ||
| required: false | ||
| default: null | ||
| deployment: | ||
| on_host: | ||
| health: | ||
| interval: 5s | ||
| initial_delay: 5s | ||
| timeout: 5s | ||
| http: | ||
| path: "${nr-var:health_check.path}" | ||
| port: ${nr-var:health_check.port} | ||
| version: | ||
| path: /usr/bin/nrdot-collector-host | ||
| args: -v | ||
| regex: \d+\.\d+\.\d+ | ||
| filesystem: | ||
| otel-config: | ||
| config.yaml: | | ||
| ${nr-var:config} | ||
| executables: | ||
| - # Important to note the binary name is nrdot-collector-host matching the new nrdot binary | ||
| id: nrdot-collector-host | ||
| path: /usr/bin/nrdot-collector-host | ||
| args: >- | ||
| --config=${nr-sub:autogenerated_agent_dir}/otel-config/config.yaml | ||
| --feature-gates=-pkg.translator.prometheus.NormalizeName | ||
| env: | ||
| # sets the otel-collector "env" source resource detector | ||
| OTEL_RESOURCE_ATTRIBUTES: "host.id=${nr-ac:host_id}" | ||
| restart_policy: | ||
| backoff_strategy: | ||
| type: fixed | ||
| backoff_delay: ${nr-var:backoff_delay} | ||
| # See com.newrelic.infrastructure Agent type for description of fields. | ||
| k8s: | ||
| health: | ||
| interval: 30s | ||
| initial_delay: 30s | ||
| objects: | ||
| repository: | ||
| apiVersion: source.toolkit.fluxcd.io/v1 | ||
| kind: HelmRepository | ||
| metadata: | ||
| name: ${nr-sub:agent_id} | ||
| namespace: ${nr-ac:namespace} | ||
| spec: | ||
| interval: 30m | ||
| provider: generic | ||
| url: ${nr-var:chart_repository.url} | ||
| secretRef: ${nr-var:chart_repository.secret_reference} | ||
| certSecretRef: ${nr-var:chart_repository.certificate_secret_reference} | ||
| values: | ||
| apiVersion: v1 | ||
| kind: Secret | ||
| metadata: | ||
| name: values-${nr-sub:agent_id} | ||
| namespace: ${nr-ac:namespace} | ||
| stringData: | ||
| default.yaml: | | ||
| global: | ||
| licenseKey: ${nr-env:NR_LICENSE_KEY} | ||
| cluster: ${nr-env:NR_CLUSTER_NAME} | ||
| nrStaging: ${nr-env:NR_STAGING} | ||
| lowDataMode: ${nr-env:NR_LOW_DATA_MODE} | ||
| verboseLog: ${nr-env:NR_VERBOSE_LOG} | ||
| values.yaml: | | ||
| ${nr-var:chart_values.nr-k8s-otel-collector} | ||
| global.yaml: | | ||
| global: | ||
| ${nr-var:chart_values.global | indent 2} | ||
| release: | ||
| apiVersion: helm.toolkit.fluxcd.io/v2 | ||
| kind: HelmRelease | ||
| metadata: | ||
| name: ${nr-sub:agent_id} | ||
| namespace: ${nr-ac:namespace} | ||
| spec: | ||
| targetNamespace: ${nr-ac:namespace_agents} | ||
| releaseName: ${nr-sub:agent_id} | ||
| interval: 30s | ||
| chart: | ||
| spec: | ||
| chart: ${nr-var:chart_name} | ||
| version: ${nr-var:chart_version} | ||
| reconcileStrategy: ChartVersion | ||
| sourceRef: | ||
| kind: HelmRepository | ||
| name: ${nr-sub:agent_id} | ||
| namespace: ${nr-ac:namespace} | ||
| interval: 3m | ||
| install: | ||
| disableWait: true | ||
| disableWaitForJobs: true | ||
| disableTakeOwnership: true | ||
| createNamespace: true | ||
| upgrade: | ||
| disableWait: true | ||
| disableWaitForJobs: true | ||
| disableTakeOwnership: true | ||
| cleanupOnFail: true | ||
| valuesFrom: | ||
| - kind: Secret | ||
| name: values-${nr-sub:agent_id} | ||
| valuesKey: default.yaml | ||
| - kind: Secret | ||
| name: values-${nr-sub:agent_id} | ||
| valuesKey: values.yaml | ||
| - kind: Secret | ||
| name: values-${nr-sub:agent_id} | ||
| valuesKey: global.yaml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've just noticed this comment, copy&pasted for sure but it is a bit misleading, isn't it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well the
com.newrelic.infrastructurehas some descriptions for the fields in comments, so perhaps it makes sense to leave this?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, now I get it. Let's leave it for now but it is really strange: we define the
descriptionfield in thecom.newrelic.infrastructureAgent Type (those fields could be actually used!) and here we add a comment asking to check the other Agent Type 🙃