cleanup comments

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
This commit is contained in:
Michel Hollands 2024-03-28 14:14:25 +00:00
parent 5e908f796c
commit 18a5face81

View File

@ -37,9 +37,9 @@ data:
}
}
{{- if or .Values.local.logs.enabled .Values.cloud.logs.enabled }}
// Logs
{{- if or .Values.local.logs.enabled .Values.cloud.logs.enabled }}
remote.kubernetes.secret "logs_credentials" {
namespace = "{{- .Values.metaMonitoringNamespace -}}"
name = "logs"
@ -77,14 +77,18 @@ data:
{{- end }}
{{- end }}
{{- if or .Values.local.metrics.enabled .Values.cloud.metrics.enabled }}
// Metrics
<<<<<<< HEAD
{{- if or .Values.local.metrics.enabled .Values.cloud.metrics.enabled }}
remote.kubernetes.secret "metrics_credentials" {
namespace = "{{- .Values.metaMonitoringNamespace -}}"
name = "metrics"
}
=======
>>>>>>> bb84e9f (cleanup comments)
discovery.relabel "only_http_metrics" {
targets = discovery.relabel.rename_meta_labels.output
@ -227,14 +231,18 @@ data:
}
{{- end }}
{{- if or .Values.local.traces.enabled .Values.cloud.traces.enabled }}
// Traces
<<<<<<< HEAD
{{- if or .Values.local.traces.enabled .Values.cloud.traces.enabled }}
remote.kubernetes.secret "traces_credentials" {
namespace = "{{- .Values.metaMonitoringNamespace -}}"
name = "traces"
}
=======
>>>>>>> bb84e9f (cleanup comments)
// Shamelessly copied from https://github.com/grafana/intro-to-mlt/blob/main/agent/config.river
otelcol.receiver.otlp "otlp_receiver" {
// We don't technically need this, but it shows how to change listen address and incoming port.