Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.10.8
version: 0.10.9

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You don't need to bump this version anymore, our CICD process will do so on release.



dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,11 @@ data:
endpoint: {{ include "nrKubernetesOtel.endpoint" . }}
headers:
api-key: ${env:NR_LICENSE_KEY}
resource:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could we stamp the cluster name through a traditional processor in a pipeline instead? This leaves the door open to stamping other attributes from processors like resource_detection

k8s.cluster.name: {{ include "newrelic.common.cluster" . }}
{{- range $k, $v := .Values.collectorObservability.resource }}
{{ $k }}: {{ $v }}
{{- end }}
{{- end }}
pipelines:
{{- include "nrKubernetesOtel.daemonset.configMap.extraConfig.pipelines" . | nindent 8 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ data:
endpoint: {{ include "nrKubernetesOtel.endpoint" . }}
headers:
api-key: ${env:NR_LICENSE_KEY}
resource:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same thing here.

k8s.cluster.name: {{ include "newrelic.common.cluster" . }}
{{- range $k, $v := .Values.collectorObservability.resource }}
{{ $k }}: {{ $v }}
{{- end }}
{{- end }}
pipelines:
{{- include "nrKubernetesOtel.deployment.configMap.extraConfig.pipelines" . | nindent 8 }}
Expand Down
15 changes: 12 additions & 3 deletions charts/nr-k8s-otel-collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,18 @@ collectorObservability:
# -- (bool) Specifies whether the collector reports its own metrics
# @default -- `false`
enabled: false
# -- Specifies the interval at which the collector reports its metrics (in milliseconds)
# @default -- `60000`
scrapeIntervalMs: 60000
# -- Specifies the interval at which the collector reports its metrics (in seconds)
# @default -- `60`
scrapeIntervalSeconds: 60

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This value should probably remain as scrapeIntervalMs, and instead we should fix this on the deployment and daemonset since periodic.interval accepts ms, not seconds. Alternatively, we could try and normalize this to seconds. Open to ideas.

# -- Additional resource attributes to attach to its internal metrics.
# k8s.cluster.name is automatically populated from the cluster value.
# Useful for adding attributes such as env to distinguish between environments
# in multi-cluster deployments.
# Example:
# resource:
# env: production
# @default -- `{}`
resource: {}

# -- (bool) Send only the [metrics required](https://github.com/newrelic/helm-charts/tree/master/charts/nr-k8s-otel-collector/docs/metrics-lowDataMode.md) to light up the NR kubernetes UI
# @default -- `true`
Expand Down
Loading