logzio-logs-collector version 2.0.2

[Feature] add dynamic auto resource detection

Author: 8naama

charts/logzio-logs-collector/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changes by Version
 
 <!-- next version -->
+## 2.0.2
+- Add support for auto resource detection with `distribution` and `resourceDetection.enabled` flags.
+
 ## 2.0.1
 - Add support for global tolerations
+
 ## 2.0.0
 - **Breaking changes**
     - Secret values are now global

charts/logzio-logs-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: logzio-logs-collector
-version: 2.0.1
+version: 2.0.2
 description: kubernetes logs collection agent for logz.io based on opentelemetry collector
 type: application
 home: https://logz.io/

charts/logzio-logs-collector/templates/_config.tpl

@@ -8,16 +8,26 @@
 {{- define "logs-collector.loggingDaemonsetConfig" -}}
 {{- $values := deepCopy .Values -}}
 {{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) -}}
-{{- $config := include "logs-collector.baseLoggingConfig" $data -}}
-{{- tpl $config . -}}
+{{- $config := deepCopy .Values.config }}
+
+{{- if (eq (include "logs-collector.resourceDetectionEnabled" .) "true") }}
+  {{- include "logs-collector.addResourceDetectionProcessors" (dict "config" $config "distribution" .Values.global.distribution) }}
+{{- end }}
+
+{{- tpl ($config | toYaml) . -}}
 {{- end }}
 
 # Build config file for standalone logs Collector
 {{- define "logs-collector.loggingStandaloneConfig" -}}
 {{- $values := deepCopy .Values -}}
 {{- $data := dict "Values" $values | mustMergeOverwrite (deepCopy .) -}}
-{{- $config := include "logs-collector.baseLoggingConfig" $data -}}
-{{- tpl $config . -}}
+{{- $config := deepCopy .Values.config }}
+
+{{- if (eq (include "logs-collector.resourceDetectionEnabled" .) "true") }}
+  {{- include "logs-collector.addResourceDetectionProcessors" (dict "config" $config "distribution" .Values.global.distribution) }}
+{{- end }}
+
+{{- tpl ($config | toYaml) . -}}
 {{- end }}
 
 {{/* Build the list of port for service */}}
@@ -52,4 +62,39 @@
   {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
+
+{{/* Build config for Resource Detection according to distribution */}}
+{{- define "logs-collector.resourceDetectionConfig" -}}
+{{- if . }}
+{{- if eq . "eks" }}
+resourcedetection/distribution:
+  timeout: 15s
+  detectors: ["eks", "ec2"]
+{{- else if eq . "aks" }}
+resourcedetection/distribution:
+  detectors: ["aks", "azure"]
+{{- else if eq . "gke" }}
+resourcedetection/distribution:
+  detectors: ["gcp"]
+{{- else }}
+resourcedetection/all:
+  detectors: [ec2, azure, gcp]
+{{- end }}
+{{- else }}
+resourcedetection/all:
+  detectors: [ec2, azure, gcp]
+{{- end }}
+{{- end }}
+
+{{/* Append Resource Detection to Opentelemetry config */}}
+{{- define "logs-collector.addResourceDetectionProcessors" -}}
+{{- $config := .config -}}
+{{- $resDetectionConfig := (include "logs-collector.resourceDetectionConfig" .distribution | fromYaml) }}
+  {{- if $resDetectionConfig }}
+    {{- range $key, $value := $resDetectionConfig }}
+      {{- $_ := set $config "processors" (merge (index $config "processors") (dict $key $value)) }}
+      {{- $_ := set (index $config "service" "pipelines" "logs") "processors" (prepend (index $config "service" "pipelines" "logs" "processors") $key) }}
+    {{- end }}
+  {{- end }}
 {{- end }}

charts/logzio-logs-collector/templates/_helpers.tpl

@@ -204,3 +204,17 @@ listener.logz.io
 {{- end -}}
 {{- end }}
 
+{{/*
+Returns the value of resource detection enablement state
+*/}}
+{{- define "logs-collector.resourceDetectionEnabled" -}}
+{{- if (hasKey .Values "resourceDetection") }}
+{{- if (hasKey .Values.resourceDetection "enabled") }}
+{{- .Values.resourceDetection.enabled }}
+{{- else }}
+{{- .Values.global.resourceDetection.enabled }}
+{{- end }}
+{{- else }}
+{{- .Values.global.resourceDetection.enabled }}
+{{- end }}
+{{- end }}

charts/logzio-logs-collector/templates/configmap-agent.yaml

@@ -8,6 +8,7 @@ metadata:
   labels:
     {{- include "logs-collector.labels" . | nindent 4 }}
 data:
-  relay: {{- include "logs-collector.loggingDaemonsetConfig" . | nindent 4 }}
+  relay: |
+    {{- include "logs-collector.loggingDaemonsetConfig" . | nindent 4 }}
 {{- end }}
 {{ end }}

charts/logzio-logs-collector/templates/configmap-standalone.yaml

@@ -8,6 +8,7 @@ metadata:
   labels:
     {{- include "logs-collector.labels" . | nindent 4 }}
 data:
-  relay: {{- include "logs-collector.loggingStandaloneConfig" . | nindent 4 }}
+  relay: |
+    {{- include "logs-collector.loggingStandaloneConfig" . | nindent 4 }}
 {{- end }}
 {{ end }}

charts/logzio-logs-collector/values.yaml

@@ -32,6 +32,11 @@ global:
   logzioRegion: "us"
   # Secret with your custom endpoint, for example:http://endpoint:8080. Overrides secrets.LogzioRegion listener adress
   customLogsEndpoint: ""
+  # Optional - Identifier for the Kubernetes distribution used. One of "eks", "aks" or "gke".
+  distribution: ""
+  # Optional - Control enabling of the OpenTelemetry Collector's resource detection feature. Dependent on `distribution` value.
+  resourceDetection:
+    enabled: false
 
 standaloneCollector:
   # Number of replicas in standalone collector mode