diff --git a/charts/meta-monitoring/templates/agent/_helpers-agent.tpl b/charts/meta-monitoring/templates/agent/_helpers-agent.tpl index a6f5661..475d4e8 100644 --- a/charts/meta-monitoring/templates/agent/_helpers-agent.tpl +++ b/charts/meta-monitoring/templates/agent/_helpers-agent.tpl @@ -51,7 +51,7 @@ {{- $list = append $list ("otelcol.exporter.otlp.local.input") }} {{- end }} {{- if .Values.cloud.traces.enabled }} -{{- $list = append $list ("otelcol.exporter.otlp.cloud.input") }} +{{- $list = append $list ("otelcol.exporter.otlphttp.cloud.input") }} {{- end }} {{- join ", " $list }} {{- end }} \ No newline at end of file diff --git a/charts/meta-monitoring/templates/agent/config.yaml b/charts/meta-monitoring/templates/agent/config.yaml index 498ce69..b8e51e3 100644 --- a/charts/meta-monitoring/templates/agent/config.yaml +++ b/charts/meta-monitoring/templates/agent/config.yaml @@ -9,7 +9,7 @@ data: role = "pod" namespaces { own_namespace = true - names = [ {{ include "agent.all_namespaces" . }} ] + names = [ {{ include "agent.namespaces" . }} ] } } @@ -295,13 +295,23 @@ data: // In this case, the Agent is listening on all available bindable addresses on port 4317 (which is the // default OTLP gRPC port) for the OTLP protocol. grpc { - endpoint = "0.0.0.0:4317" + endpoint = "0.0.0.0:4317" } // We define where to send the output of all ingested traces. In this case, to the OpenTelemetry batch processor // named 'default'. output { - traces = [otelcol.processor.batch.default.input] + traces = [otelcol.processor.batch.default.input] + } + } + + otelcol.receiver.jaeger "jaeger" { + protocols { + thrift_http {} + } + + output { + traces = [otelcol.processor.batch.default.input] } } @@ -335,25 +345,6 @@ data: } {{- end }} - {{- if or .Values.local.traces.enabled .Values.cloud.traces.enabled }} - // The OpenTelemetry exporter exports processed trace spans to another target that is listening for OTLP format traces. - // A unique label, 'local', is added to uniquely identify this exporter. - otelcol.exporter.otlp "local" { - // Define the client for exporting. - client { - // Send to the locally running Tempo instance, on port 4317 (OTLP gRPC). - endpoint = "meta-tempo-distributor:4317" - // Configure TLS settings for communicating with the endpoint. - tls { - // The connection is insecure. - insecure = true - // Do not verify TLS certificates when connecting. - insecure_skip_verify = true - } - } - } - {{- end }} - {{- if .Values.cloud.logs.enabled }} loki.write "cloud" { endpoint { @@ -379,7 +370,7 @@ data: {{- end }} {{- if .Values.cloud.traces.enabled }} - otelcol.exporter.otlp "cloud" { + otelcol.exporter.otlphttp "cloud" { client { endpoint = nonsensitive(remote.kubernetes.secret.traces_credentials.data["endpoint"]) auth = otelcol.auth.basic.creds.handler diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml index 89dddee..d01bd05 100644 --- a/charts/meta-monitoring/values.yaml +++ b/charts/meta-monitoring/values.yaml @@ -267,6 +267,15 @@ alloy: memory: '600Mi' limits: memory: '4Gi' + extraPorts: + - name: "otel" + port: 4317 + targetPort: 4317 + protocol: "TCP" + - name: "thrifthttp" + port: 14268 + targetPort: 14268 + protocol: "TCP" controller: type: "statefulset" autoscaling: