Skip to content

Commit

Permalink
chore(k8s-infra): deprecate metrics/internal pipeline for otel-agent
Browse files Browse the repository at this point in the history
Signed-off-by: Prashant Shahi <[email protected]>
  • Loading branch information
prashant-shahi committed Oct 4, 2024
1 parent d6b1b89 commit 387ff54
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
11 changes: 4 additions & 7 deletions charts/k8s-infra/templates/_config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ Build config file for daemonset OpenTelemetry Collector: OtelAgent
{{- if or (eq (len $config.service.pipelines.traces.receivers) 0) (eq (len $config.service.pipelines.traces.exporters) 0) }}
{{- $_ := unset $config.service.pipelines "traces" }}
{{- end }}
{{- if or (eq (len (index (index $config.service.pipelines "metrics/internal") "receivers")) 0) (eq (len (index (index $config.service.pipelines "metrics/internal") "exporters")) 0) }}
{{- $_ := unset $config.service.pipelines "metrics/internal" }}
{{- end }}
{{- tpl (toYaml $config) . }}
{{- end }}

Expand Down Expand Up @@ -169,8 +166,8 @@ receivers:

{{- define "opentelemetry-collector.applyHostMetricsConfig" -}}
{{- $config := mustMergeOverwrite (include "opentelemetry-collector.hostMetricsConfig" .Values | fromYaml) .config }}
{{- if index $config.service.pipelines "metrics/internal" }}
{{- $_ := set (index $config.service.pipelines "metrics/internal") "receivers" (append (index (index $config.service.pipelines "metrics/internal") "receivers") "hostmetrics" | uniq) }}
{{- if $config.service.pipelines.metrics }}
{{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "hostmetrics" | uniq) }}
{{- end }}
{{- $config | toYaml }}
{{- end }}
Expand All @@ -188,8 +185,8 @@ receivers:

{{- define "opentelemetry-collector.applyKubeletMetricsConfig" -}}
{{- $config := mustMergeOverwrite (include "opentelemetry-collector.kubeletMetricsConfig" .Values | fromYaml) .config }}
{{- if index $config.service.pipelines "metrics/internal" }}
{{- $_ := set (index $config.service.pipelines "metrics/internal") "receivers" (append (index (index $config.service.pipelines "metrics/internal") "receivers") "kubeletstats" | uniq) }}
{{- if $config.service.pipelines.metrics }}
{{- $_ := set $config.service.pipelines.metrics "receivers" (append $config.service.pipelines.metrics.receivers "kubeletstats" | uniq) }}
{{- end }}
{{- $config | toYaml }}
{{- end }}
Expand Down
4 changes: 0 additions & 4 deletions charts/k8s-infra/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -572,10 +572,6 @@ otelAgent:
receivers: [otlp]
processors: [batch]
exporters: []
metrics/internal:
receivers: []
processors: [batch]
exporters: []
logs:
receivers: [otlp]
processors: [batch]
Expand Down

0 comments on commit 387ff54

Please sign in to comment.