From 2be887abbdb0ab9cf1e6c311e369799b670ec751 Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Fri, 31 Jan 2025 16:04:45 +0200 Subject: [PATCH] [otel-integration] add extraConfig (#508) --- otel-integration/CHANGELOG.md | 4 + otel-integration/k8s-helm/Chart.yaml | 12 +-- otel-integration/k8s-helm/values.yaml | 113 +++++++++++++++++++++++++- 3 files changed, 120 insertions(+), 9 deletions(-) diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md index c549b26a..04f3a0e8 100644 --- a/otel-integration/CHANGELOG.md +++ b/otel-integration/CHANGELOG.md @@ -2,6 +2,10 @@ ## OpenTelemtry-Integration +### v0.0.138 / 2025-01-31 + +- [Feat] Add extraConfig to allow adding extra processors, receivers, exporters, and connectors to the collector. + ### v0.0.137 / 2025-01-29 - [Feat] Enable hostEntity and kubernetesResource preset diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml index 5658c816..addfd46e 100644 --- a/otel-integration/k8s-helm/Chart.yaml +++ b/otel-integration/k8s-helm/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: otel-integration description: OpenTelemetry Integration -version: 0.0.137 +version: 0.0.138 keywords: - OpenTelemetry Collector - OpenTelemetry Agent @@ -11,27 +11,27 @@ keywords: dependencies: - name: opentelemetry-collector alias: opentelemetry-agent - version: "0.105.1" + version: "0.105.2" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent.enabled - name: opentelemetry-collector alias: opentelemetry-agent-windows - version: "0.105.1" + version: "0.105.2" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-agent-windows.enabled - name: opentelemetry-collector alias: opentelemetry-cluster-collector - version: "0.105.1" + version: "0.105.2" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-cluster-collector.enabled - name: opentelemetry-collector alias: opentelemetry-receiver - version: "0.105.1" + version: "0.105.2" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-receiver.enabled - name: opentelemetry-collector alias: opentelemetry-gateway - version: "0.105.1" + version: "0.105.2" repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual condition: opentelemetry-gateway.enabled - name: coralogix-ebpf-agent diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index 4de23aee..61aae9c4 100644 --- a/otel-integration/k8s-helm/values.yaml +++ b/otel-integration/k8s-helm/values.yaml @@ -5,7 +5,7 @@ global: defaultSubsystemName: "integration" logLevel: "warn" collectionInterval: "30s" - version: "0.0.137" + version: "0.0.138" extensions: kubernetesDashboard: @@ -47,7 +47,42 @@ opentelemetry-agent: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - + # Extra config for the collector + # This is used to add extra receivers, processors, exporters, and connectors + # to the "logs", "metrics", and "traces" pipelines and other pipelines managed by the chart. + # Processors are added at the end of the pipeline before batching. + # You cannot use this to add new pipelines, instead use the + # config.service.pipelines field to add new pipelines. + extraConfig: {} + # extraConfig: + # receivers: + # otlp/3: + # protocols: + # grpc: + # endpoint: ${env:MY_POD_IP}:4317 + # http: + # endpoint: ${env:MY_POD_IP}:4318 + # processors: + # batch: {} + # exporters: + # debug/2: {} + # connectors: + # spanmetrics/2: + # metrics: + # enabled: true + # service: + # pipelines: + # logs: + # receivers: + # - otlp/3 + # processors: + # - batch/2 + # exporters: + # - debug/2 + # metrics: + # receivers: + # - otlp/3 + # - spanmetrics/2 targetAllocator: enabled: false replicas: 1 @@ -464,7 +499,42 @@ opentelemetry-cluster-collector: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - + # Extra config for the collector + # This is used to add extra receivers, processors, exporters, and connectors + # to the "logs", "metrics", and "traces" pipelines and other pipelines managed by the chart. + # Processors are added at the end of the pipeline before batching. + # You cannot use this to add new pipelines, instead use the + # config.service.pipelines field to add new pipelines. + extraConfig: {} + # extraConfig: + # receivers: + # otlp/3: + # protocols: + # grpc: + # endpoint: ${env:MY_POD_IP}:4317 + # http: + # endpoint: ${env:MY_POD_IP}:4318 + # processors: + # batch: {} + # exporters: + # debug/2: {} + # connectors: + # spanmetrics/2: + # metrics: + # enabled: true + # service: + # pipelines: + # logs: + # receivers: + # - otlp/3 + # processors: + # - batch/2 + # exporters: + # - debug/2 + # metrics: + # receivers: + # - otlp/3 + # - spanmetrics/2 config: extensions: zpages: @@ -741,6 +811,43 @@ opentelemetry-gateway: fieldRef: apiVersion: v1 fieldPath: spec.nodeName + # Extra config for the collector + # This is used to add extra receivers, processors, exporters, and connectors + # to the "logs", "metrics", and "traces" pipelines and other pipelines managed by the chart. + # Processors are added at the end of the pipeline before batching. + # You cannot use this to add new pipelines, instead use the + # config.service.pipelines field to add new pipelines. + extraConfig: {} + # extraConfig: + # receivers: + # otlp/3: + # protocols: + # grpc: + # endpoint: ${env:MY_POD_IP}:4317 + # http: + # endpoint: ${env:MY_POD_IP}:4318 + # processors: + # batch: {} + # exporters: + # debug/2: {} + # connectors: + # spanmetrics/2: + # metrics: + # enabled: true + # service: + # pipelines: + # logs: + # receivers: + # - otlp/3 + # processors: + # - batch/2 + # exporters: + # - debug/2 + # metrics: + # receivers: + # - otlp/3 + # - spanmetrics/2 + presets: fleetManagement: enabled: false