diff --git a/charts/feature-application-observability/README.md b/charts/feature-application-observability/README.md index a67effbb5..a314ce02c 100644 --- a/charts/feature-application-observability/README.md +++ b/charts/feature-application-observability/README.md @@ -74,6 +74,31 @@ Actual integration testing in a live environment should be done in the main [k8s | processors.memoryLimiter.enabled | bool | `false` | Use a memory limiter. | | processors.memoryLimiter.limit | string | `"0MiB"` | Maximum amount of memory targeted to be allocated by the process heap. | +### Receivers: Jaeger + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| receivers.jaeger.grpc | object | `{"enabled":false,"port":14250}` | Configuration for the Jaeger receiver using the gRPC protocol. | +| receivers.jaeger.include_debug_metrics | bool | `false` | Whether to include high-cardinality debug metrics. | +| receivers.jaeger.thriftBinary | object | `{"enabled":false,"port":6832}` | Configuration for the Jaeger receiver using the Thrift binary protocol. | +| receivers.jaeger.thriftCompact | object | `{"enabled":false,"port":6831}` | Configuration for the Jaeger receiver using the Thrift compact protocol. | +| receivers.jaeger.thriftHttp | object | `{"enabled":false,"port":14268}` | Configuration for the Jaeger receiver using the Thrift HTTP protocol. | + +### Receivers: OTLP + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| receivers.otlp.grpc | object | `{"enabled":false,"port":4317}` | The OTLP gRPC receiver configuration. | +| receivers.otlp.http | object | `{"enabled":false,"port":4318}` | The OTLP HTTP receiver configuration. | +| receivers.otlp.include_debug_metrics | bool | `false` | Whether to include high-cardinality debug metrics. | + +### Receivers: Zipkin + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| receivers.zipkin | object | `{"enabled":false,"include_debug_metrics":false,"port":9411}` | The Zipkin receiver configuration. | +| receivers.zipkin.include_debug_metrics | bool | `false` | Whether to include high-cardinality debug metrics. | + ### Other Values | Key | Type | Default | Description | @@ -87,15 +112,6 @@ Actual integration testing in a live environment should be done in the main [k8s | metrics.enabled | bool | `true` | | | metrics.filters | object | `{"datapoint":[],"metric":[]}` | Apply a filter to metrics received via the OTLP or OTLP HTTP receivers. ([docs](https://grafana.com/docs/alloy/latest/reference/components/otelcol/otelcol.processor.filter/)) | | metrics.transforms | object | `{"datapoint":[],"metric":[],"resource":[]}` | Apply a transformation to metrics received via the OTLP or OTLP HTTP receivers. ([docs](https://grafana.com/docs/alloy/latest/reference/components/otelcol/otelcol.processor.transform/)) | -| receivers.grpc.enabled | bool | `false` | | -| receivers.grpc.include_debug_metrics | bool | `false` | | -| receivers.grpc.port | int | `4317` | | -| receivers.http.enabled | bool | `false` | | -| receivers.http.include_debug_metrics | bool | `false` | | -| receivers.http.port | int | `4318` | | -| receivers.zipkin.enabled | bool | `false` | | -| receivers.zipkin.include_debug_metrics | bool | `false` | | -| receivers.zipkin.port | int | `9411` | | | traces.enabled | bool | `true` | | | traces.filters | object | `{"span":[],"spanevent":[]}` | Apply a filter to traces received via the OTLP or OTLP HTTP receivers. ([docs](https://grafana.com/docs/alloy/latest/reference/components/otelcol/otelcol.processor.filter/)) | | traces.transforms | object | `{"resource":[],"span":[],"spanevent":[]}` | Apply a transformation to traces received via the OTLP or OTLP HTTP receivers. ([docs](https://grafana.com/docs/alloy/latest/reference/components/otelcol/otelcol.processor.transform/)) | diff --git a/charts/feature-application-observability/templates/_module.alloy.tpl b/charts/feature-application-observability/templates/_module.alloy.tpl index c53b98bf2..9e4a20a5c 100644 --- a/charts/feature-application-observability/templates/_module.alloy.tpl +++ b/charts/feature-application-observability/templates/_module.alloy.tpl @@ -24,6 +24,7 @@ declare "application_observability" { // Receivers --> Resource Detection Processor {{- $next := printf "[%s]" $resourceDetection }} {{- include "feature.applicationObservability.receiver.otlp.alloy" (dict "Values" $.Values "metricsOutput" $next "logsOutput" $next "tracesOutput" $next ) | indent 2 }} + {{- include "feature.applicationObservability.receiver.jaeger.alloy" (dict "Values" $.Values "tracesOutput" $next ) | indent 2 }} {{- include "feature.applicationObservability.receiver.zipkin.alloy" (dict "Values" $.Values "tracesOutput" $next ) | indent 2 }} // Resource Detection Processor --> K8s Attribute Processor diff --git a/charts/feature-application-observability/templates/_notes.tpl b/charts/feature-application-observability/templates/_notes.tpl index e3f754c68..8361257f8 100644 --- a/charts/feature-application-observability/templates/_notes.tpl +++ b/charts/feature-application-observability/templates/_notes.tpl @@ -2,8 +2,12 @@ {{- define "feature.applicationObservability.notes.task" }} {{- $receivers := list }} -{{- if .Values.receivers.grpc.enabled }}{{- $receivers = append $receivers "OTLP gRPC" }}{{ end }} -{{- if .Values.receivers.http.enabled }}{{- $receivers = append $receivers "OTLP HTTP" }}{{ end }} +{{- if .Values.receivers.otlp.grpc.enabled }}{{- $receivers = append $receivers "OTLP gRPC" }}{{ end }} +{{- if .Values.receivers.otlp.http.enabled }}{{- $receivers = append $receivers "OTLP HTTP" }}{{ end }} +{{- if .Values.receivers.jaeger.grpc.enabled }}{{- $receivers = append $receivers "Jaeger gRPC" }}{{ end }} +{{- if .Values.receivers.jaeger.thriftBinary.enabled }}{{- $receivers = append $receivers "Jaeger Thrift Binary" }}{{ end }} +{{- if .Values.receivers.jaeger.thriftCompact.enabled }}{{- $receivers = append $receivers "Jaeger Thrift Compact" }}{{ end }} +{{- if .Values.receivers.jaeger.thriftHttp.enabled }}{{- $receivers = append $receivers "Jaeger Thrift HTTP" }}{{ end }} {{- if .Values.receivers.zipkin.enabled }}{{- $receivers = append $receivers "Zipkin" }}{{ end }} {{- $receiverWord := len $receivers | plural "receiver" "receivers" }} Gather application data via {{ include "english_list" $receivers }} {{ $receiverWord }} @@ -11,12 +15,24 @@ Gather application data via {{ include "english_list" $receivers }} {{ $receiver {{- define "feature.applicationObservability.notes.actions" }} Configure your applications to send telemetry data to: -{{- if .Values.receivers.grpc.enabled }} -* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.grpc.port }} (OTLP gRPC) +{{- if .Values.receivers.otlp.grpc.enabled }} +* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.otlp.grpc.port }} (OTLP gRPC) {{ end }} -{{- if .Values.receivers.http.enabled }} -* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.http.port }} (OTLP HTTP) +{{- if .Values.receivers.otlp.http.enabled }} +* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.otlp.http.port }} (OTLP HTTP) {{ end }} +{{- if .Values.receivers.jaeger.grpc.enabled }} +* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.jaeger.grpc.port }} (Jaeger gRPC) +{{- end }} +{{- if .Values.receivers.jaeger.thriftBinary.enabled }} +* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.jaeger.thriftBinary.port }} (Jaeger Thrift Binary) +{{- end }} +{{- if .Values.receivers.jaeger.thriftCompact.enabled }} +* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.jaeger.thriftCompact.port }} (Jaeger Thrift Compact) +{{- end }} +{{- if .Values.receivers.jaeger.thriftHttp.enabled }} +* http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.jaeger.thriftHttp.port }} (Jaeger Thrift HTTP) +{{- end }} {{- if .Values.receivers.zipkin.enabled }} * http://{{ .Collector.ServiceName }}.{{ .Collector.Namespace }}.svc.cluster.local:{{ .Values.receivers.zipkin.port }} (Zipkin) {{ end }} @@ -24,8 +40,12 @@ Configure your applications to send telemetry data to: {{- define "feature.applicationObservability.summary" -}} {{- $receivers := list }} -{{- if .Values.receivers.grpc.enabled }}{{- $receivers = append $receivers "otlpgrpc" }}{{ end }} -{{- if .Values.receivers.http.enabled }}{{- $receivers = append $receivers "otlphttp" }}{{ end }} +{{- if .Values.receivers.otlp.grpc.enabled }}{{- $receivers = append $receivers "otlpgrpc" }}{{ end }} +{{- if .Values.receivers.otlp.http.enabled }}{{- $receivers = append $receivers "otlphttp" }}{{ end }} +{{- if .Values.receivers.jaeger.grpc.enabled }}{{- $receivers = append $receivers "jaegergrpc" }}{{ end }} +{{- if .Values.receivers.jaeger.thriftBinary.enabled }}{{- $receivers = append $receivers "jaegerthriftbinary" }}{{ end }} +{{- if .Values.receivers.jaeger.thriftCompact.enabled }}{{- $receivers = append $receivers "jaegerthriftcompact" }}{{ end }} +{{- if .Values.receivers.jaeger.thriftHttp.enabled }}{{- $receivers = append $receivers "jaegerthrifthttp" }}{{ end }} {{- if .Values.receivers.zipkin.enabled }}{{- $receivers = append $receivers "zipkin" }}{{ end }} version: {{ .Chart.Version }} protocols: {{ $receivers | join "," }} diff --git a/charts/feature-application-observability/templates/_receiver_jaeger.tpl b/charts/feature-application-observability/templates/_receiver_jaeger.tpl new file mode 100644 index 000000000..da2bde1a5 --- /dev/null +++ b/charts/feature-application-observability/templates/_receiver_jaeger.tpl @@ -0,0 +1,38 @@ +{{/* Inputs: Values (values) tracesOutput */}} +{{- define "feature.applicationObservability.receiver.jaeger.alloy" }} +{{- if or .Values.receivers.jaeger.grpc.enabled .Values.receivers.jaeger.thriftBinary.enabled .Values.receivers.jaeger.thriftCompact.enabled .Values.receivers.jaeger.thriftBinary.enabled }} +otelcol.receiver.jaeger "receiver" { + protocols { +{{- if .Values.receivers.jaeger.grpc.enabled -}} + grpc { + endpoint = "0.0.0.0:{{ .Values.receivers.jaeger.grpc | int }}" + } +{{- end }} +{{- if .Values.receivers.jaeger.thriftBinary.enabled }} + thrift_binary { + endpoint = "0.0.0.0:{{ .Values.receivers.jaeger.thriftBinary | int }}" + } +{{- end }} +{{- if .Values.receivers.jaeger.thriftCompact.enabled }} + thrift_compact { + endpoint = "0.0.0.0:{{ .Values.receivers.jaeger.thriftCompact | int }}" + } +{{- end }} +{{- if .Values.receivers.jaeger.thriftHttp.enabled }} + thrift_http { + endpoint = "0.0.0.0:{{ .Values.receivers.jaeger.thriftHttp | int }}" + } +{{- end }} + } + + debug_metrics { + disable_high_cardinality_metrics = {{ not .Values.receivers.jaeger.include_debug_metrics }} + } + output { +{{- if and .tracesOutput .Values.traces.enabled }} + traces = {{ .tracesOutput }} +{{- end }} + } +} +{{- end }} +{{- end }} diff --git a/charts/feature-application-observability/templates/_receiver_otlp.tpl b/charts/feature-application-observability/templates/_receiver_otlp.tpl index 70ef8d3bd..5516b6792 100644 --- a/charts/feature-application-observability/templates/_receiver_otlp.tpl +++ b/charts/feature-application-observability/templates/_receiver_otlp.tpl @@ -1,19 +1,19 @@ {{/* Inputs: Values (values) metricsOutput, logsOutput, tracesOutput */}} {{- define "feature.applicationObservability.receiver.otlp.alloy" }} -{{- if or .Values.receivers.grpc.enabled .Values.receivers.http.enabled }} +{{- if or .Values.receivers.otlp.grpc.enabled .Values.receivers.otlp.http.enabled }} otelcol.receiver.otlp "receiver" { -{{- if .Values.receivers.grpc.enabled }} +{{- if .Values.receivers.otlp.grpc.enabled }} grpc { - endpoint = "0.0.0.0:{{ .Values.receivers.grpc.port | int }}" + endpoint = "0.0.0.0:{{ .Values.receivers.otlp.grpc.port | int }}" } {{- end }} -{{- if .Values.receivers.http.enabled }} +{{- if .Values.receivers.otlp.http.enabled }} http { - endpoint = "0.0.0.0:{{ .Values.receivers.http.port | int }}" + endpoint = "0.0.0.0:{{ .Values.receivers.otlp.http.port | int }}" } {{- end }} debug_metrics { - disable_high_cardinality_metrics = {{ not (or .Values.receivers.grpc.include_debug_metrics .Values.receivers.http.include_debug_metrics) }} + disable_high_cardinality_metrics = {{ not .Values.receivers.otlp.include_debug_metrics }} } output { {{- if and .metricsOutput .Values.metrics.enabled }} diff --git a/charts/feature-application-observability/templates/_validation.tpl b/charts/feature-application-observability/templates/_validation.tpl index 048765663..d011dec4a 100644 --- a/charts/feature-application-observability/templates/_validation.tpl +++ b/charts/feature-application-observability/templates/_validation.tpl @@ -1,12 +1,15 @@ {{- define "feature.applicationObservability.validate" }} -{{- $aRecevierIsEnabled := or .Values.receivers.grpc.enabled .Values.receivers.http.enabled .Values.receivers.zipkin.enabled }} +{{- $aRecevierIsEnabled := or .Values.receivers.otlp.grpc.enabled .Values.receivers.otlp.http.enabled }} +{{- $aRecevierIsEnabled = or $aRecevierIsEnabled .Values.receivers.zipkin.enabled }} +{{- $aRecevierIsEnabled = or $aRecevierIsEnabled .Values.receivers.jaeger.grpc.enabled .Values.receivers.jaeger.thriftBinary.enabled .Values.receivers.jaeger.thriftCompact.enabled .Values.receivers.jaeger.thriftHttp.enabled }} {{- if not $aRecevierIsEnabled }} {{- $msg := list "" "At least one receiver must be enabled to use Application Observability." }} {{- $msg = append $msg "Please enable one. For example:" }} {{- $msg = append $msg "applicationObservability:" }} {{- $msg = append $msg " receivers:" }} - {{- $msg = append $msg " grpc:" }} - {{- $msg = append $msg " enabled: true" }} + {{- $msg = append $msg " otlp:" }} + {{- $msg = append $msg " grpc:" }} + {{- $msg = append $msg " enabled: true" }} {{- $msg = append $msg "See https://github.com/grafana/k8s-monitoring-helm/tree/main/charts/feature-application-observability for more details." }} {{- fail (join "\n" $msg) }} {{- end }} diff --git a/charts/feature-application-observability/tests/default_test.yaml b/charts/feature-application-observability/tests/default_test.yaml index 6e6ffbdc2..765492263 100644 --- a/charts/feature-application-observability/tests/default_test.yaml +++ b/charts/feature-application-observability/tests/default_test.yaml @@ -7,10 +7,20 @@ tests: set: deployAsConfigMap: true receivers: - grpc: - enabled: true - http: - enabled: true + otlp: + grpc: + enabled: true + http: + enabled: true + jaeger: + grpc: + enabled: true + thriftBinary: + enabled: true + thriftCompact: + enabled: true + thriftHttp: + enabled: true zipkin: enabled: true asserts: @@ -49,6 +59,28 @@ tests: traces = [otelcol.processor.resourcedetection.default.input] } } + otelcol.receiver.jaeger "receiver" { + protocols {grpc { + endpoint = "0.0.0.0:0" + } + thrift_binary { + endpoint = "0.0.0.0:0" + } + thrift_compact { + endpoint = "0.0.0.0:0" + } + thrift_http { + endpoint = "0.0.0.0:0" + } + } + + debug_metrics { + disable_high_cardinality_metrics = true + } + output { + traces = [otelcol.processor.resourcedetection.default.input] + } + } otelcol.receiver.zipkin "receiver" { endpoint = "0.0.0.0:9411" debug_metrics { diff --git a/charts/feature-application-observability/tests/validation_test.yaml b/charts/feature-application-observability/tests/validation_test.yaml index 8abd98ce0..9228dfeff 100644 --- a/charts/feature-application-observability/tests/validation_test.yaml +++ b/charts/feature-application-observability/tests/validation_test.yaml @@ -14,6 +14,7 @@ tests: Please enable one. For example: applicationObservability: receivers: - grpc: - enabled: true + otlp: + grpc: + enabled: true See https://github.com/grafana/k8s-monitoring-helm/tree/main/charts/feature-application-observability for more details. diff --git a/charts/feature-application-observability/values.schema.json b/charts/feature-application-observability/values.schema.json index fdfb8fc06..4895d8e1f 100644 --- a/charts/feature-application-observability/values.schema.json +++ b/charts/feature-application-observability/values.schema.json @@ -138,31 +138,85 @@ "receivers": { "type": "object", "properties": { - "grpc": { + "jaeger": { "type": "object", "properties": { - "enabled": { - "type": "boolean" + "grpc": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "port": { + "type": "integer" + } + } }, "include_debug_metrics": { "type": "boolean" }, - "port": { - "type": "integer" + "thriftBinary": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "port": { + "type": "integer" + } + } + }, + "thriftCompact": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "port": { + "type": "integer" + } + } + }, + "thriftHttp": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "port": { + "type": "integer" + } + } } } }, - "http": { + "otlp": { "type": "object", "properties": { - "enabled": { - "type": "boolean" + "grpc": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "port": { + "type": "integer" + } + } + }, + "http": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "port": { + "type": "integer" + } + } }, "include_debug_metrics": { "type": "boolean" - }, - "port": { - "type": "integer" } } }, diff --git a/charts/feature-application-observability/values.yaml b/charts/feature-application-observability/values.yaml index 8f1a8726f..f84f2c65e 100644 --- a/charts/feature-application-observability/values.yaml +++ b/charts/feature-application-observability/values.yaml @@ -8,17 +8,60 @@ nameOverride: "" fullnameOverride: "" receivers: - grpc: - enabled: false - port: 4317 + otlp: + # -- The OTLP gRPC receiver configuration. + # @section -- Receivers: OTLP + grpc: + enabled: false + port: 4317 + + # -- The OTLP HTTP receiver configuration. + # @section -- Receivers: OTLP + http: + enabled: false + port: 4318 + + # -- Whether to include high-cardinality debug metrics. + # @section -- Receivers: OTLP include_debug_metrics: false - http: - enabled: false - port: 4318 + + jaeger: + # -- Configuration for the Jaeger receiver using the gRPC protocol. + # @section -- Receivers: Jaeger + grpc: + enabled: false + port: 14250 + + # -- Configuration for the Jaeger receiver using the Thrift binary protocol. + # @section -- Receivers: Jaeger + thriftBinary: + enabled: false + port: 6832 + + # -- Configuration for the Jaeger receiver using the Thrift compact protocol. + # @section -- Receivers: Jaeger + thriftCompact: + enabled: false + port: 6831 + + # -- Configuration for the Jaeger receiver using the Thrift HTTP protocol. + # @section -- Receivers: Jaeger + thriftHttp: + enabled: false + port: 14268 + + # -- Whether to include high-cardinality debug metrics. + # @section -- Receivers: Jaeger include_debug_metrics: false + + # -- The Zipkin receiver configuration. + # @section -- Receivers: Zipkin zipkin: enabled: false port: 9411 + + # -- Whether to include high-cardinality debug metrics. + # @section -- Receivers: Zipkin include_debug_metrics: false processors: diff --git a/charts/feature-pod-logs/templates/_collector_validation.tpl b/charts/feature-pod-logs/templates/_collector_validation.tpl index 34ecabb39..2f852e2aa 100644 --- a/charts/feature-pod-logs/templates/_collector_validation.tpl +++ b/charts/feature-pod-logs/templates/_collector_validation.tpl @@ -19,5 +19,4 @@ {{- fail (printf "Pod Logs feature requires Alloy to be in clustering mode when using the \"kubernetesApi\" gather method.\nPlease set:\n%s:\n alloy:\n clustering:\n enabled: true" .CollectorName) }} {{- end -}} {{- end -}} - {{- end -}} diff --git a/charts/k8s-monitoring/Chart.lock b/charts/k8s-monitoring/Chart.lock index 92575faee..2ecd86ab4 100644 --- a/charts/k8s-monitoring/Chart.lock +++ b/charts/k8s-monitoring/Chart.lock @@ -45,4 +45,4 @@ dependencies: repository: https://grafana.github.io/helm-charts version: 0.10.0 digest: sha256:5805f8a2eb47cc7ed65d2f8b94d07a3bf474143d179bf781be69c5f7ce1a4d00 -generated: "2024-11-26T14:43:42.607469-06:00" +generated: "2024-11-26T15:55:57.980954-06:00" diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz index 03d25bcd4..3e9017836 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz index ef75be977..fa756be85 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz index 156d6cdf4..ccf04b886 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-auto-instrumentation-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz index 3878cd603..1219c86a4 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz index 975f1a587..2bee26560 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz index 00e52b9cd..d35d28831 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz index ca01dbc82..8d41854fb 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-node-logs-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz index 416e2d9dc..f8404a5a6 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz index de63515da..6856b0f24 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz index 0ee8a5364..7f3bc9c29 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/README.md b/charts/k8s-monitoring/docs/examples/auth/bearer-token/README.md index 9a76476df..a3a1a5e4a 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/README.md +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/README.md @@ -44,8 +44,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + jaeger: + thriftHttp: + enabled: true prometheusOperatorObjects: enabled: true @@ -67,8 +68,8 @@ alloy-receiver: enabled: true alloy: extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: jaeger-grpc + port: 14268 + targetPort: 14268 protocol: TCP ``` diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-receiver.alloy index ef0ddb011..40b2427dc 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-receiver.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-receiver.alloy @@ -151,20 +151,7 @@ declare "application_observability" { comment = "Must be a list of trace destinations where collected trace should be forwarded to" } - // Receivers --> Resource Detection Processor - otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" - } - debug_metrics { - disable_high_cardinality_metrics = true - } - output { - metrics = [otelcol.processor.resourcedetection.default.input] - logs = [otelcol.processor.resourcedetection.default.input] - traces = [otelcol.processor.resourcedetection.default.input] - } - } + // Receivers --> Resource Detection Processor // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml index 8f0e65ccd..971f9d3cc 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml @@ -217,7 +217,7 @@ data: grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.5", namespace="default"} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge - grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 + grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="jaegerthrifthttp", version="1.0.0"} 1 grafana_kubernetes_monitoring_feature_info{feature="podLogs", method="volumes", version="1.0.0"} 1 grafana_kubernetes_monitoring_feature_info{feature="prometheusOperatorObjects", version="1.0.0"} 1 --- @@ -535,20 +535,7 @@ data: comment = "Must be a list of trace destinations where collected trace should be forwarded to" } - // Receivers --> Resource Detection Processor - otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" - } - debug_metrics { - disable_high_cardinality_metrics = true - } - output { - metrics = [otelcol.processor.resourcedetection.default.input] - logs = [otelcol.processor.resourcedetection.default.input] - traces = [otelcol.processor.resourcedetection.default.input] - } - } + // Receivers --> Resource Detection Processor // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { @@ -1111,9 +1098,9 @@ spec: port: 12345 targetPort: 12345 protocol: "TCP" - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: jaeger-grpc + port: 14268 + targetPort: 14268 protocol: TCP --- # Source: k8s-monitoring/charts/alloy-logs/templates/controllers/daemonset.yaml @@ -1281,8 +1268,8 @@ spec: ports: - containerPort: 12345 name: http-metrics - - containerPort: 4317 - name: otlp-grpc + - containerPort: 14268 + name: jaeger-grpc protocol: TCP readinessProbe: httpGet: diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/values.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/values.yaml index ba46b3caf..e23cd1ba8 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/values.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/values.yaml @@ -31,8 +31,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + jaeger: + thriftHttp: + enabled: true prometheusOperatorObjects: enabled: true @@ -54,7 +55,7 @@ alloy-receiver: enabled: true alloy: extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: jaeger-grpc + port: 14268 + targetPort: 14268 protocol: TCP diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/README.md b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/README.md index c6ad90110..5ed0c09bb 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/README.md +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/README.md @@ -49,8 +49,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + grpc: + enabled: true prometheusOperatorObjects: enabled: true diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.alloy index f7e2157e9..b9acd2073 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-receiver.alloy @@ -152,7 +152,7 @@ declare "application_observability" { logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml index c9536ceb1..133e971ca 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml @@ -525,7 +525,7 @@ data: logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/values.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/values.yaml index c8dee91b7..9c9e5b698 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/values.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/values.yaml @@ -37,8 +37,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + grpc: + enabled: true prometheusOperatorObjects: enabled: true diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/README.md b/charts/k8s-monitoring/docs/examples/auth/external-secrets/README.md index b2bc0f660..76af1e7aa 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/README.md +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/README.md @@ -53,8 +53,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + jaeger: + grpc: + enabled: true prometheusOperatorObjects: enabled: true @@ -72,8 +73,8 @@ alloy-receiver: enabled: true alloy: extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: jaeger-grpc + port: 14250 + targetPort: 14250 protocol: TCP ``` diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-receiver.alloy index 78a71eddf..36b2caecc 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-receiver.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-receiver.alloy @@ -171,17 +171,17 @@ declare "application_observability" { comment = "Must be a list of trace destinations where collected trace should be forwarded to" } - // Receivers --> Resource Detection Processor - otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" + // Receivers --> Resource Detection Processor + otelcol.receiver.jaeger "receiver" { + protocols {grpc { + endpoint = "0.0.0.0:0" + } } + debug_metrics { disable_high_cardinality_metrics = true } output { - metrics = [otelcol.processor.resourcedetection.default.input] - logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } } diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml index 66b199fc5..d4ab85030 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml @@ -214,7 +214,7 @@ data: grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.5", namespace="default"} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge - grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 + grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="jaegergrpc", version="1.0.0"} 1 grafana_kubernetes_monitoring_feature_info{feature="podLogs", method="volumes", version="1.0.0"} 1 grafana_kubernetes_monitoring_feature_info{feature="prometheusOperatorObjects", version="1.0.0"} 1 --- @@ -564,17 +564,17 @@ data: comment = "Must be a list of trace destinations where collected trace should be forwarded to" } - // Receivers --> Resource Detection Processor - otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" + // Receivers --> Resource Detection Processor + otelcol.receiver.jaeger "receiver" { + protocols {grpc { + endpoint = "0.0.0.0:0" + } } + debug_metrics { disable_high_cardinality_metrics = true } output { - metrics = [otelcol.processor.resourcedetection.default.input] - logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } } @@ -1140,9 +1140,9 @@ spec: port: 12345 targetPort: 12345 protocol: "TCP" - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: jaeger-grpc + port: 14250 + targetPort: 14250 protocol: TCP --- # Source: k8s-monitoring/charts/alloy-logs/templates/controllers/daemonset.yaml @@ -1307,8 +1307,8 @@ spec: ports: - containerPort: 12345 name: http-metrics - - containerPort: 4317 - name: otlp-grpc + - containerPort: 14250 + name: jaeger-grpc protocol: TCP readinessProbe: httpGet: diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/values.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/values.yaml index c4caa32a9..c353c2065 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/values.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/values.yaml @@ -41,8 +41,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + jaeger: + grpc: + enabled: true prometheusOperatorObjects: enabled: true @@ -60,7 +61,7 @@ alloy-receiver: enabled: true alloy: extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: jaeger-grpc + port: 14250 + targetPort: 14250 protocol: TCP diff --git a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/README.md b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/README.md index 65e8e4908..3e58e2e63 100644 --- a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/README.md +++ b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/README.md @@ -28,15 +28,16 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + http: + enabled: true alloy-receiver: enabled: true alloy: extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: otlp-http + port: 4318 + targetPort: 4318 protocol: TCP ``` diff --git a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/alloy-receiver.alloy index faf55306a..f8492ba1a 100644 --- a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/alloy-receiver.alloy +++ b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/alloy-receiver.alloy @@ -75,8 +75,8 @@ declare "application_observability" { // Receivers --> Resource Detection Processor otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" + http { + endpoint = "0.0.0.0:4318" } debug_metrics { disable_high_cardinality_metrics = true @@ -86,7 +86,7 @@ declare "application_observability" { logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml index 433918389..2ee9c976c 100644 --- a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml @@ -100,8 +100,8 @@ data: // Receivers --> Resource Detection Processor otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" + http { + endpoint = "0.0.0.0:4318" } debug_metrics { disable_high_cardinality_metrics = true @@ -111,7 +111,7 @@ data: logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { @@ -247,7 +247,7 @@ data: grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.5", namespace="default"} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge - grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 + grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlphttp", version="1.0.0"} 1 --- # Source: k8s-monitoring/charts/alloy-receiver/templates/rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -397,9 +397,9 @@ spec: port: 12345 targetPort: 12345 protocol: "TCP" - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: otlp-http + port: 4318 + targetPort: 4318 protocol: TCP --- # Source: k8s-monitoring/charts/alloy-receiver/templates/controllers/daemonset.yaml @@ -451,8 +451,8 @@ spec: ports: - containerPort: 12345 name: http-metrics - - containerPort: 4317 - name: otlp-grpc + - containerPort: 4318 + name: otlp-http protocol: TCP readinessProbe: httpGet: diff --git a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/values.yaml b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/values.yaml index d022486ee..1a884eef2 100644 --- a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/values.yaml +++ b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/values.yaml @@ -13,14 +13,15 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + http: + enabled: true alloy-receiver: enabled: true alloy: extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: otlp-http + port: 4318 + targetPort: 4318 protocol: TCP diff --git a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/README.md b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/README.md index 47ca4625d..24bf18067 100644 --- a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/README.md +++ b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/README.md @@ -22,8 +22,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + grpc: + enabled: true autoInstrumentation: enabled: true diff --git a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/alloy-receiver.alloy index 1ee25ba72..5cc06b117 100644 --- a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/alloy-receiver.alloy +++ b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/alloy-receiver.alloy @@ -86,7 +86,7 @@ declare "application_observability" { logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml index 641f305ec..afc2fd059 100644 --- a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/output.yaml @@ -321,7 +321,7 @@ data: logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/values.yaml b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/values.yaml index ed23f7358..f495b3496 100644 --- a/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/values.yaml +++ b/charts/k8s-monitoring/docs/examples/features/auto-instrumentation/beyla-metrics-and-traces/values.yaml @@ -13,8 +13,9 @@ destinations: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + grpc: + enabled: true autoInstrumentation: enabled: true diff --git a/charts/k8s-monitoring/docs/examples/proxies/README.md b/charts/k8s-monitoring/docs/examples/proxies/README.md index 863a57908..44c49c145 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/README.md +++ b/charts/k8s-monitoring/docs/examples/proxies/README.md @@ -56,7 +56,7 @@ clusterEvents: applicationObservability: enabled: true receivers: - grpc: + zipkin: enabled: true podLogs: @@ -80,9 +80,9 @@ alloy-receiver: - name: NO_PROXY value: kubernetes.default.svc extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: zipkin + port: 9411 + targetPort: 9411 protocol: TCP alloy-profiles: enabled: true diff --git a/charts/k8s-monitoring/docs/examples/proxies/alloy-receiver.alloy b/charts/k8s-monitoring/docs/examples/proxies/alloy-receiver.alloy index e28ba1166..e3445b526 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/alloy-receiver.alloy +++ b/charts/k8s-monitoring/docs/examples/proxies/alloy-receiver.alloy @@ -129,20 +129,16 @@ declare "application_observability" { comment = "Must be a list of trace destinations where collected trace should be forwarded to" } - // Receivers --> Resource Detection Processor - otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" - } + // Receivers --> Resource Detection Processor + otelcol.receiver.zipkin "receiver" { + endpoint = "0.0.0.0:9411" debug_metrics { disable_high_cardinality_metrics = true } output { - metrics = [otelcol.processor.resourcedetection.default.input] - logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/docs/examples/proxies/output.yaml b/charts/k8s-monitoring/docs/examples/proxies/output.yaml index 011c84daf..84af97eb9 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/output.yaml +++ b/charts/k8s-monitoring/docs/examples/proxies/output.yaml @@ -574,7 +574,7 @@ data: grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.5", namespace="default"} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge - grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 + grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="zipkin", version="1.0.0"} 1 grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 grafana_kubernetes_monitoring_feature_info{feature="clusterEvents", version="1.0.0"} 1 grafana_kubernetes_monitoring_feature_info{feature="podLogs", method="volumes", version="1.0.0"} 1 @@ -871,20 +871,16 @@ data: comment = "Must be a list of trace destinations where collected trace should be forwarded to" } - // Receivers --> Resource Detection Processor - otelcol.receiver.otlp "receiver" { - grpc { - endpoint = "0.0.0.0:4317" - } + // Receivers --> Resource Detection Processor + otelcol.receiver.zipkin "receiver" { + endpoint = "0.0.0.0:9411" debug_metrics { disable_high_cardinality_metrics = true } output { - metrics = [otelcol.processor.resourcedetection.default.input] - logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { @@ -4211,9 +4207,9 @@ spec: port: 12345 targetPort: 12345 protocol: "TCP" - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: zipkin + port: 9411 + targetPort: 9411 protocol: TCP --- # Source: k8s-monitoring/charts/alloy-singleton/templates/service.yaml @@ -4582,8 +4578,8 @@ spec: ports: - containerPort: 12345 name: http-metrics - - containerPort: 4317 - name: otlp-grpc + - containerPort: 9411 + name: zipkin protocol: TCP readinessProbe: httpGet: diff --git a/charts/k8s-monitoring/docs/examples/proxies/values.yaml b/charts/k8s-monitoring/docs/examples/proxies/values.yaml index 33031352f..527ae3a6a 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/values.yaml +++ b/charts/k8s-monitoring/docs/examples/proxies/values.yaml @@ -39,7 +39,7 @@ clusterEvents: applicationObservability: enabled: true receivers: - grpc: + zipkin: enabled: true podLogs: @@ -63,9 +63,9 @@ alloy-receiver: - name: NO_PROXY value: kubernetes.default.svc extraPorts: - - name: otlp-grpc - port: 4317 - targetPort: 4317 + - name: zipkin + port: 9411 + targetPort: 9411 protocol: TCP alloy-profiles: enabled: true diff --git a/charts/k8s-monitoring/templates/features/_feature_application_observability.tpl b/charts/k8s-monitoring/templates/features/_feature_application_observability.tpl index 2782b1618..d449ce916 100644 --- a/charts/k8s-monitoring/templates/features/_feature_application_observability.tpl +++ b/charts/k8s-monitoring/templates/features/_feature_application_observability.tpl @@ -49,27 +49,39 @@ application_observability "feature" { {{- range $collector := include "features.applicationObservability.collectors" . | fromYamlArray }} {{- include "collectors.require_collector" (dict "Values" $.Values "name" $collector "feature" $featureName) }} - {{- if $.Values.applicationObservability.receivers.grpc.enabled }} - {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.grpc.port "portName" "otlp-grpc" "portProtocol" "TCP") }} + {{- if $.Values.applicationObservability.receivers.otlp.grpc.enabled }} + {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.otlp.grpc.port "portName" "otlp-grpc" "portProtocol" "TCP") }} {{- end -}} - {{- if $.Values.applicationObservability.receivers.http.enabled }} - {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.http.port "portName" "otlp-http" "portProtocol" "TCP") }} + {{- if $.Values.applicationObservability.receivers.otlp.http.enabled }} + {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.otlp.http.port "portName" "otlp-http" "portProtocol" "TCP") }} {{- end -}} {{- if $.Values.applicationObservability.receivers.zipkin.enabled }} {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.zipkin.port "portName" "zipkin" "portProtocol" "TCP") }} {{- end -}} + {{- if $.Values.applicationObservability.receivers.jaeger.grpc.enabled }} + {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.jaeger.grpc.port "portName" "jaeger-grpc" "portProtocol" "TCP") }} + {{- end -}} + {{- if $.Values.applicationObservability.receivers.jaeger.thriftBinary.enabled }} + {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.jaeger.thriftBinary.port "portName" "jaeger-grpc" "portProtocol" "TCP") }} + {{- end -}} + {{- if $.Values.applicationObservability.receivers.jaeger.thriftCompact.enabled }} + {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.jaeger.thriftCompact.port "portName" "jaeger-grpc" "portProtocol" "TCP") }} + {{- end -}} + {{- if $.Values.applicationObservability.receivers.jaeger.thriftHttp.enabled }} + {{- include "collectors.require_extra_port" (dict "Values" $.Values "name" $collector "feature" $featureName "portNumber" $.Values.applicationObservability.receivers.jaeger.thriftHttp.port "portName" "jaeger-grpc" "portProtocol" "TCP") }} + {{- end -}} {{- include "feature.applicationObservability.validate" (dict "Values" $.Values.applicationObservability) }} {{- end -}} {{- end -}} {{- end -}} {{- define "features.applicationObservability.receiver.grpc" }} - {{- if and .Values.applicationObservability.enabled .Values.applicationObservability.receivers.grpc.enabled }} -http://{{ include "alloy.fullname" (index .Subcharts .Values.applicationObservability.collector) }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.applicationObservability.receivers.grpc.port }} + {{- if and .Values.applicationObservability.enabled .Values.applicationObservability.receivers.otlp.grpc.enabled }} +http://{{ include "alloy.fullname" (index .Subcharts .Values.applicationObservability.collector) }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.applicationObservability.receivers.otlp.grpc.port }} {{- end }} {{- end }} {{- define "features.applicationObservability.receiver.http" }} - {{- if and .Values.applicationObservability.enabled .Values.applicationObservability.receivers.http.enabled }} -http://{{ include "alloy.fullname" (index .Subcharts .Values.applicationObservability.collector) }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.applicationObservability.receivers.http.port }} + {{- if and .Values.applicationObservability.enabled .Values.applicationObservability.receivers.otlp.http.enabled }} +http://{{ include "alloy.fullname" (index .Subcharts .Values.applicationObservability.collector) }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.applicationObservability.receivers.otlp.http.port }} {{- end }} {{- end }} diff --git a/charts/k8s-monitoring/tests/beyla_config_test.yaml b/charts/k8s-monitoring/tests/beyla_config_test.yaml index b48b1a3f6..daefcd9e7 100644 --- a/charts/k8s-monitoring/tests/beyla_config_test.yaml +++ b/charts/k8s-monitoring/tests/beyla_config_test.yaml @@ -55,8 +55,9 @@ tests: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + grpc: + enabled: true alloy-receiver: enabled: true alloy: diff --git a/charts/k8s-monitoring/tests/integration/auto-instrumentation/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/auto-instrumentation/.rendered/output.yaml index 66aafaf38..9bbb2ad2c 100644 --- a/charts/k8s-monitoring/tests/integration/auto-instrumentation/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/auto-instrumentation/.rendered/output.yaml @@ -387,7 +387,7 @@ data: logs = [otelcol.processor.resourcedetection.default.input] traces = [otelcol.processor.resourcedetection.default.input] } - } + } // Resource Detection Processor --> K8s Attribute Processor otelcol.processor.resourcedetection "default" { diff --git a/charts/k8s-monitoring/tests/integration/auto-instrumentation/values.yaml b/charts/k8s-monitoring/tests/integration/auto-instrumentation/values.yaml index 2c075752a..8bf852906 100644 --- a/charts/k8s-monitoring/tests/integration/auto-instrumentation/values.yaml +++ b/charts/k8s-monitoring/tests/integration/auto-instrumentation/values.yaml @@ -27,8 +27,9 @@ autoInstrumentation: applicationObservability: enabled: true receivers: - grpc: - enabled: true + otlp: + grpc: + enabled: true selfReporting: {scrapeInterval: 1m} # Force self-report to be generated within test time