[otel-integration] Add fleet management config (#436)

* Add fleet management config Signed-off-by: Matej Gera <[email protected]> * Add changelog Signed-off-by: Matej Gera <[email protected]> * Adjust resource attributes supression Signed-off-by: Matej Gera <[email protected]> --------- Signed-off-by: Matej Gera <[email protected]>
coralogix · Aug 6, 2024 · 98db4da · 98db4da
1 parent 4ed4e0a
commit 98db4da
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## OpenTelemtry-Integration
 
+## v0.0.93 / 2024-08-06
+- [Feat] Add more defaults for fleet management preset
+
 ## v0.0.92 / 2024-08-05
 - [Feat] add more system attributes to host entity event preset
 - [Feat] Add fleet management preset

diff --git 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.92
+version: 0.0.93
 keywords:
   - OpenTelemetry Collector
   - OpenTelemetry Agent

diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml
@@ -3,9 +3,9 @@ global:
   clusterName: ""
   defaultApplicationName: "otel"
   defaultSubsystemName: "integration"
-  logLevel: "warn"
+  logLevel: "debug"
   collectionInterval: "30s"
-  version: "0.0.92"
+  version: "0.0.93"
 
   extensions:
     kubernetesDashboard:
@@ -91,6 +91,11 @@ opentelemetry-agent:
       enabled: true
       clusterName: "{{.Values.global.clusterName}}"
       integrationName: "coralogix-integration-helm"
+    fleetManagement:
+      enabled: false
+      agentType: "agent"
+      clusterName: "{{.Values.global.clusterName}}"
+
     logsCollection:
       enabled: true
       includeCollectorLogs: true
@@ -274,8 +279,8 @@ opentelemetry-agent:
         resource:
           # Supress this attribute, as we don't want the UUID of the collector to be sent,
           # instead we rely on instance label generated by Prometheus receiver.
-          service.instance.id: ""
-          service.name: ""
+          - service.instance.id:
+          - service.name:
         logs:
           level: "{{ .Values.global.logLevel }}"
           encoding: json
@@ -379,6 +384,10 @@ opentelemetry-cluster-collector:
     priorityValue: 1000000000
   replicaCount: 1
   presets:
+    fleetManagement:
+      enabled: false
+      agentType: "cluster-collector"
+      clusterName: "{{.Values.global.clusterName}}"
     clusterMetrics:
       enabled: true
     kubernetesEvents:
@@ -592,8 +601,8 @@ opentelemetry-cluster-collector:
         resource:
           # Supress this attribute, as we don't want the UUID of the collector to be sent,
           # instead we rely on instance label generated by Prometheus receiver.
-          service.instance.id: ""
-          service.name: ""
+          - service.instance.id:
+          - service.name:
         logs:
           level: "{{ .Values.global.logLevel }}"
           encoding: json
@@ -685,6 +694,10 @@ opentelemetry-gateway:
           apiVersion: v1
           fieldPath: spec.nodeName
   presets:
+    fleetManagement:
+      enabled: false
+      agentType: "gateway"
+      clusterName: "{{.Values.global.clusterName}}"
     kubernetesAttributes:
       enabled: true
     metadata:
@@ -785,8 +798,8 @@ opentelemetry-gateway:
         resource:
           # Supress this attribute, as we don't want the UUID of the collector to be sent,
           # instead we rely on instance label generated by Prometheus receiver.
-          service.instance.id: ""
-          service.name: ""
+          - service.instance.id:
+          - service.name:
         logs:
           level: "{{ .Values.global.logLevel }}"
           encoding: json