From 5a5cfad6c4be7dda37b639e70d5e98be5420acb1 Mon Sep 17 00:00:00 2001
From: Povilas Versockas
Date: Tue, 2 Apr 2024 14:53:49 +0300
Subject: [PATCH] [otel-integration] fix operator and add new preset
---
otel-integration/CHANGELOG.md | 5 +++++
otel-integration/k8s-helm/Chart.yaml | 10 +++++-----
otel-integration/k8s-helm/values-crd-override.yaml | 10 ++++++++++
otel-integration/k8s-helm/values.yaml | 6 +++++-
4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md
index 4d7f7359..6d31f07e 100644
--- a/otel-integration/CHANGELOG.md
+++ b/otel-integration/CHANGELOG.md
@@ -2,6 +2,11 @@
## OpenTelemtry-Integration
+### v0.0.67 / 2024-04-02
+
+- [FIX] Operator generate CRD missing environment variables
+- [FEAT] Add new reduceResourceAttributes preset, which removes uids and other unnecessary resource attributes from metrics.
+
### v0.0.66 / 2024-03-26
- [FEAT] add spanMetricsMulti preset, which allows to specify histogram buckets per application.
diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml
index 8cee86e6..5959c297 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.66
+version: 0.0.67
keywords:
- OpenTelemetry Collector
- OpenTelemetry Agent
@@ -11,22 +11,22 @@ keywords:
dependencies:
- name: opentelemetry-collector
alias: opentelemetry-agent
- version: "0.81.6"
+ version: "0.81.8"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent.enabled
- name: opentelemetry-collector
alias: opentelemetry-agent-windows
- version: "0.81.6"
+ version: "0.81.8"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent-windows.enabled
- name: opentelemetry-collector
alias: opentelemetry-cluster-collector
- version: "0.81.6"
+ version: "0.81.8"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-cluster-collector.enabled
- name: opentelemetry-collector
alias: opentelemetry-gateway
- version: "0.81.6"
+ version: "0.81.8"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-gateway.enabled
sources:
diff --git a/otel-integration/k8s-helm/values-crd-override.yaml b/otel-integration/k8s-helm/values-crd-override.yaml
index b407643b..379ceb12 100644
--- a/otel-integration/k8s-helm/values-crd-override.yaml
+++ b/otel-integration/k8s-helm/values-crd-override.yaml
@@ -3,6 +3,16 @@ opentelemetry-agent:
generate: true
configMap:
create: false
+ # for some reason Operator automatically adds
+ # 4317, 6831, 14268 ports, which leads to duplicate errors
+ # Workaround - we remove them manually.
+ ports:
+ otlp:
+ enabled: false
+ jaeger-compact:
+ enabled: false
+ jaeger-thrift:
+ enabled: false
opentelemetry-cluster-collector:
collectorCRD:
diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml
index d68b3a8a..c1069904 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.66"
+ version: "0.0.67"
extensions:
kubernetesDashboard:
@@ -139,6 +139,10 @@ opentelemetry-agent:
# histogramBuckets: [1s, 2s]
# - selector: route() where attributes["service.name"] == "two"
# histogramBuckets: [5s, 10s]
+ # Removes uids and other uneeded attributes from metric resources.
+ # This reduces target_info cardinality.
+ reduceResourceAttributes:
+ enabled: false
config:
extensions:
zpages: