-
Notifications
You must be signed in to change notification settings - Fork 183
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore!: remove replacing values in configuration marked by 'replace' …
…suffix make values in configuration for otelcol dependended on otelcol parameters in values.yaml removes "otelcol.k8s.cluster.name" which was added in #1721 and it is no longer in use this pull request reverts changes introduced in #1721 related to #1729
- Loading branch information
1 parent
647968d
commit 4892a55
Showing
6 changed files
with
58 additions
and
59 deletions.
There are no files selected for viewing
This file contains 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 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 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 |
---|---|---|
@@ -1,6 +1 @@ | ||
{{- $yamlFile := toYaml $.Values.otelagent.config }} | ||
{{- $otelTracesService := include "traces.otelagent.exporter.endpoint" . }} | ||
{{- $yamlFile = replace "exporters.otlptraces.endpoint.replace" $otelTracesService $yamlFile }} | ||
{{- $otelMetricsService := printf "%s.%s" ( include "sumologic.metadata.name.otelcol.service-metrics" . ) .Release.Namespace }} | ||
{{- $yamlFile = replace "exporters.otlpmetrics.endpoint.replace" $otelMetricsService $yamlFile }} | ||
{{ tpl ($yamlFile | replace ": '{{" ": {{" | replace "}}'" "}}") . | nindent 2 }} | ||
{{ tpl (toYaml .Values.otelagent.config | replace ": '{{" ": {{" | replace "}}'" "}}") . | nindent 2 }} |
This file contains 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 |
---|---|---|
@@ -1,26 +1 @@ | ||
{{- $yamlFile := toYaml $.Values.otelcol.config }} | ||
{{- $_collector := .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }} | ||
{{- $sourceName := .Values.otelcol.sourceMetadata.sourceName | quote }} | ||
{{- $sourceCategory := .Values.otelcol.sourceMetadata.sourceCategory | quote }} | ||
{{- $sourceCategoryPrefix := .Values.otelcol.sourceMetadata.sourceCategoryPrefix | quote }} | ||
{{- $sourceCategoryReplaceDash := .Values.otelcol.sourceMetadata.sourceCategoryReplaceDash | quote }} | ||
{{- $excludeNamespaceRegex := .Values.otelcol.sourceMetadata.excludeNamespaceRegex | quote }} | ||
{{- $excludePodRegex := .Values.otelcol.sourceMetadata.excludePodRegex | quote }} | ||
{{- $excludeContainerRegex := .Values.otelcol.sourceMetadata.excludeContainerRegex | quote }} | ||
{{- $excludeHostRegex := .Values.otelcol.sourceMetadata.excludeHostRegex | quote }} | ||
{{- $clusterName := include "sumologic.clusterNameReplaceSpaceWithDash" . }} | ||
|
||
{{- $yamlFile := replace "processors.source.collector.replace" $_collector $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.name.replace" $sourceName $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.category.replace" $sourceCategory $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.category_prefix.replace" $sourceCategoryPrefix $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.category_replace_dash.replace" $sourceCategoryReplaceDash $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.exclude_namespace_regex.replace" $excludeNamespaceRegex $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.exclude_pod_regex.replace" $excludePodRegex $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.exclude_container_regex.replace" $excludeContainerRegex $yamlFile }} | ||
{{- $yamlFile := replace "processors.source.exclude_host_regex.replace" $excludeHostRegex $yamlFile }} | ||
{{- $yamlFile := replace "processors.resource.cluster.replace" $clusterName $yamlFile }} | ||
{{- $yamlFile := replace "exporters.sumologic.source_name.replace" $sourceName $yamlFile }} | ||
{{- $yamlFile := replace "exporters.sumologic.source_category.replace" $sourceCategory $yamlFile }} | ||
|
||
{{- tpl ($yamlFile | replace ": '{{" ": {{" | replace "}}'" "}}") . | nindent 2 }} | ||
{{- tpl (toYaml .Values.otelcol.config | replace ": '{{" ": {{" | replace "}}'" "}}") . | nindent 2 }} |
This file contains 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 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