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


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:
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:
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
# -- 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