SumoLogic · andrzej-stencel · Sep 10, 2021 · Apr 9, 2021 · May 17, 2021 · Jul 15, 2021
@@ -0,0 +1 @@
+{{ tpl (toYaml .Values.otelcol.metadata.logs.config | replace ": '{{" ": {{" | replace "}}'" "}}") . | nindent 2 }}
@@ -297,7 +297,11 @@ helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
 {{- end -}}
 
 {{- define "sumologic.metadata.name.logs" -}}
+{{- if eq .Values.sumologic.logs.metadata.provider "fluentd" -}}
 {{ template "sumologic.metadata.name.fluentd" . }}-logs
+{{- else if eq .Values.sumologic.logs.metadata.provider "otelcol" -}}
+{{ template "sumologic.metadata.name.otelcol" . }}-logs
+{{- end -}}
 {{- end -}}
 
 {{- define "sumologic.metadata.name.logs.service" -}}
@@ -1081,9 +1085,63 @@ Example Usage:
 {{ $enabled }}
 {{- end -}}
 
+{{/*
+Check if any logs provider is enabled
+
+Example Usage:
+{{- if eq (include "logs.enabled" .) "true" }}
+
+*/}}
+{{- define "logs.enabled" -}}
+{{- $enabled := false -}}
+{{- if eq (include "logs.otelcol.enabled" .) "true" }}
+{{- $enabled = true -}}
+{{- end -}}
+{{- if eq (include "logs.fluentd.enabled" .) "true" }}
+{{- $enabled = true -}}
+{{- end -}}
+{{ $enabled }}
+{{- end -}}
+
+
+{{/*
+Check if otelcol logs provider is enabled
+
+Example Usage:
+{{- if eq (include "logs.otelcol.enabled" .) "true" }}
+
+*/}}
+{{- define "logs.otelcol.enabled" -}}
+{{- $enabled := false -}}
+{{- if eq .Values.sumologic.logs.enabled true -}}
+{{- if and (eq .Values.sumologic.logs.metadata.provider "otelcol") (eq .Values.otelcol.metadata.logs.enabled true) -}}
+{{- $enabled = true -}}
+{{- end -}}
+{{- end -}}
+{{ $enabled }}
+{{- end -}}
+
+{{/*
+Check if fluentd logs provider is enabled
+
+Example Usage:
+{{- if eq (include "logs.fluentd.enabled" .) "true" }}
+
+*/}}
+{{- define "logs.fluentd.enabled" -}}
+{{- $enabled := false -}}
+{{- if eq .Values.sumologic.logs.enabled true -}}
+{{- if and (eq .Values.sumologic.logs.metadata.provider "fluentd") (eq .Values.fluentd.logs.enabled true) -}}
+{{- $enabled = true -}}
+{{- end -}}
+{{- end -}}
+{{ $enabled }}
+{{- end -}}
+
 
 {{/*
 Add service labels
+
 Example Usage:
 {{- if eq (include "service.labels" dict("Provider" "fluentd" "Values" .Values)) "true" }}
 

@@ -4,7 +4,13 @@
 {{- fail "\nAt least k8s 1.16 is required. Please update your k8s version or set sumologic.setup.force to true" -}}
 {{- end -}}
 {{- end -}}
+
 {{/* Check if metrics provider is set to either fluentd or otelcol */}}
 {{- if not (or (eq .Values.sumologic.metrics.metadata.provider "fluentd") (eq .Values.sumologic.metrics.metadata.provider "otelcol")) -}}
-{{- fail "\nsumologic.metrics.provider should be set to either fluentd or otelcol" -}}
+{{- fail "\nsumologic.metrics.metadata.provider should be set to either fluentd or otelcol" -}}
+{{- end -}}
+
+{{/* Check if logs provider is set to either fluentd or otelcol */}}
+{{- if not (or (eq .Values.sumologic.logs.metadata.provider "fluentd") (eq .Values.sumologic.logs.metadata.provider "otelcol")) -}}
+{{- fail "\nsumologic.logs.metadata.provider should be set to either fluentd or otelcol" -}}
 {{- end -}}
@@ -0,0 +1,31 @@
+{{- if and (eq (include "logs.otelcol.enabled" .) "true") (.Values.logs.metadata.autoscaling.enabled) }}
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ template "sumologic.metadata.name.logs.hpa" . }}
+  labels:
+    app: {{ template "sumologic.labels.app.logs.hpa" . }}
+    {{- include "sumologic.labels.common" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: StatefulSet
+    name: {{ template "sumologic.metadata.name.logs.statefulset" . }}
+  minReplicas: {{ .Values.logs.metadata.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.logs.metadata.autoscaling.maxReplicas }}
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ .Values.logs.metadata.autoscaling.targetCPUUtilizationPercentage }}
+{{- if .Values.logs.metadata.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageUtilization: {{ .Values.logs.metadata.autoscaling.targetMemoryUtilizationPercentage }}
+{{- end -}}
+{{- end -}}
@@ -0,0 +1,13 @@
+{{- if eq (include "logs.otelcol.enabled" .) "true" }}
+{{- if .Values.logs.metadata.podDisruptionBudget -}}
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "sumologic.metadata.name.logs.pdb" . }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "sumologic.labels.app.logs.statefulset" . }}
+{{ toYaml .Values.logs.metadata.podDisruptionBudget | indent 2 }}
+{{- end -}}
+{{- end -}}
@@ -0,0 +1,31 @@
+{{- if eq (include "logs.otelcol.enabled" .) "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "sumologic.metadata.name.logs.service-headless" . }}
+  labels:
+    app: {{ template "sumologic.labels.app.logs.service-headless" . }}
+    {{- include "sumologic.labels.logs" . | nindent 4 }}
+{{- if .Values.otelcol.serviceLabels }}
+{{ toYaml .Values.otelcol.serviceLabels | indent 4 }}
+{{- end }}
+spec:
+  selector:
+    app: {{ template "sumologic.labels.app.logs.pod" . }}
+  clusterIP: None
+  ports:
+  {{- if .Values.sumologic.traces.enabled }}
+  - name: zipkin-write
+    port: 9411
+    targetPort: 9411
+    protocol: TCP
+  {{- end }}
+  - name: fluent-bit
+    port: 24321
+    targetPort: 24321
+    protocol: TCP
+  - name: metrics
+    port: 24231
+    targetPort: 24231
+    protocol: TCP
+{{- end }}
@@ -0,0 +1,31 @@
+{{- if eq (include "logs.otelcol.enabled" .) "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "sumologic.metadata.name.logs.service" . }}
+  labels:
+    app: {{ template "sumologic.labels.app.logs.service" . }}
+    {{- include "sumologic.labels.scrape.logs" . | nindent 4 }}
+    {{- include "sumologic.labels.common" . | nindent 4 }}
+{{- if .Values.otelcol.serviceLabels }}
+{{ toYaml .Values.otelcol.serviceLabels | indent 4 }}
+{{- end }}
+spec:
+  selector:
+    app: {{ template "sumologic.labels.app.logs.pod" . }}
+  ports:
+  {{- if .Values.sumologic.traces.enabled }}
+  - name: zipkin-write
+    port: 9411
+    targetPort: 9411
+    protocol: TCP
+  {{- end }}
+  - name: fluent-bit
+    port: 24321
+    targetPort: 24321
+    protocol: TCP
+  - name: metrics
+    port: 24231
+    targetPort: 24231
+    protocol: TCP
+{{- end }}
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.sumologic.logs.enabled true) (eq .Values.fluentd.logs.enabled true) }}
+{{- if eq (include "logs.fluentd.enabled" .) "true" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

@@ -1,4 +1,4 @@
-{{- if .Values.fluentd.logs.autoscaling.enabled}}
+{{- if and (eq (include "logs.fluentd.enabled" .) "true") (.Values.fluentd.logs.autoscaling.enabled) }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:

@@ -1,4 +1,4 @@
-{{- if and .Values.sumologic.logs.enabled .Values.fluentd.logs.enabled -}}
+{{- if eq (include "logs.fluentd.enabled" .) "true" }}
 {{- if .Values.fluentd.logs.podDisruptionBudget -}}
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget

@@ -1,4 +1,4 @@
-{{- if and (eq .Values.sumologic.logs.enabled true) (eq .Values.fluentd.logs.enabled true) }}
+{{- if eq (include "logs.fluentd.enabled" .) "true" }}
 apiVersion: v1
 kind: Service
 metadata:

@@ -1,4 +1,4 @@
-{{- if and (eq .Values.sumologic.logs.enabled true) (eq .Values.fluentd.logs.enabled true) }}
+{{- if eq (include "logs.fluentd.enabled" .) "true" }}
 apiVersion: v1
 kind: Service
 metadata:

@@ -1,4 +1,4 @@
-{{- if and (eq .Values.sumologic.logs.enabled true) (eq .Values.fluentd.logs.enabled true) }}
+{{- if eq (include "logs.fluentd.enabled" .) "true" }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:

@@ -0,0 +1,11 @@
+{{- if eq (include "logs.otelcol.enabled" .) "true" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "sumologic.metadata.name.logs.configmap" . }}
+  labels:
+    app: {{ template "sumologic.labels.app.logs.configmap" . }}
+    {{- include "sumologic.labels.common" . | nindent 4 }}
+data:
+  {{- (tpl (.Files.Glob "conf/logs/otelcol/config.yaml").AsConfig .) | nindent 2 }}
+{{- end }}
@@ -0,0 +1,144 @@
+{{- if eq (include "logs.otelcol.enabled" .) "true" }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ template "sumologic.metadata.name.logs.statefulset" . }}
+  labels:
+    app: {{ template "sumologic.labels.app.logs.statefulset" . }}
+    {{- include "sumologic.labels.common" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "sumologic.labels.app.logs.pod" . }}
+  serviceName: {{ template "sumologic.metadata.name.logs.service-headless" . }}
+  podManagementPolicy: "Parallel"
+{{- if not .Values.logs.metadata.autoscaling.enabled }}
+  replicas: {{ .Values.logs.metadata.statefulset.replicaCount }}
+{{- end }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/logs/otelcol/configmap.yaml") . | sha256sum }}
+{{- if .Values.sumologic.podAnnotations }}
+{{ toYaml .Values.sumologic.podAnnotations | indent 8 }}
+{{- end }}
+{{- if .Values.otelcol.podAnnotations }}
+{{ toYaml .Values.otelcol.podAnnotations | indent 8 }}
+{{- end }}
+{{- if .Values.logs.metadata.statefulset.podAnnotations }}
+{{ toYaml .Values.logs.metadata.statefulset.podAnnotations | indent 8 }}
+{{- end }}
+      labels:
+        app: {{ template "sumologic.labels.app.logs.pod" . }}
+        {{- include "sumologic.labels.common" . | nindent 8 }}
+{{- if .Values.sumologic.podLabels }}
+{{ toYaml .Values.sumologic.podLabels | indent 8 }}
+{{- end }}
+{{- if .Values.otelcol.podLabels }}
+{{ toYaml .Values.otelcol.podLabels | indent 8 }}
+{{- end }}
+{{- if .Values.logs.metadata.statefulset.podLabels }}
+{{ toYaml .Values.logs.metadata.statefulset.podLabels | indent 8 }}
+{{- end }}
+    spec:
+      serviceAccountName: {{ template "sumologic.metadata.name.roles.serviceaccount" . }}
+{{- if .Values.logs.metadata.statefulset.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.logs.metadata.statefulset.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.logs.metadata.statefulset.tolerations }}
+      tolerations:
+{{ toYaml .Values.logs.metadata.statefulset.tolerations | indent 8 }}
+{{- end }}
+{{- if or .Values.logs.metadata.statefulset.affinity  .Values.fluentd.logs.statefulset.podAntiAffinity }}
+      affinity:
+{{- if .Values.logs.metadata.statefulset.affinity }}
+{{ toYaml .Values.logs.metadata.statefulset.affinity | indent 8 }}
+{{- end }}
+{{- if eq .Values.logs.metadata.statefulset.podAntiAffinity "hard"}}
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - {{ template "sumologic.labels.app.logs" . }}
+                - {{ template "sumologic.labels.app.metrics" . }}
+              - key: app
+                operator: In
+                values:
+                - prometheus-operator-prometheus
+            topologyKey: "kubernetes.io/hostname"
+{{else if eq .Values.logs.metadata.statefulset.podAntiAffinity "soft"}}
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - {{ template "sumologic.labels.app.logs.pod" . }}
+                  - {{ template "sumologic.labels.app.metrics.pod" . }}
+                - key: app
+                  operator: In
+                  values:
+                  - prometheus-operator-prometheus
+              topologyKey: "kubernetes.io/hostname"
+{{- end }}
+{{- end }}
+      volumes:
+      - name: config-volume
+        configMap:
+          name: {{ template "sumologic.metadata.name.logs.configmap" . }}
+{{- if .Values.logs.extraVolumes }}
+{{ toYaml .Values.logs.extraVolumes | indent 6 }}
+{{- end }}
+      securityContext:
+        {{- toYaml .Values.otelcol.securityContext | nindent 8 }}
+      {{- if .Values.logs.metadata.statefulset.priorityClassName }}
+      priorityClassName: {{ .Values.logs.metadata.statefulset.priorityClassName | quote }}
+      {{- end }}
+      containers:
+      - name: otelcol
+        image: {{ .Values.otelcol.statefulset.image.repository }}:{{ .Values.otelcol.statefulset.image.tag }}
+        imagePullPolicy: {{ .Values.otelcol.statefulset.image.pullPolicy }}
+        resources:
+          {{- toYaml .Values.logs.metadata.statefulset.resources | nindent 10 }}
+        {{- if .Values.logs.metadata.statefulset.containers.otelcol.securityContext }}
+        securityContext:
+          {{- toYaml .Values.logs.metadata.statefulset.containers.otelcol.securityContext | nindent 10 }}
+        {{- end }}
+        ports:
+        {{- if .Values.sumologic.traces.enabled }}
+        - name: zipkin-write
+          containerPort: 9411
+          protocol: TCP
+        {{- end }}
+        - name: fluent-bit
+          containerPort: 24321
+          protocol: TCP
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 13133 # Health Check extension default port.
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 13133 # Health Check extension default port.
+        volumeMounts:
+        - name: config-volume
+          mountPath: /etc/otel/config.yaml
+          subPath: config.yaml
+{{- if .Values.logs.extraVolumeMounts }}
+{{ toYaml .Values.logs.extraVolumeMounts | indent 8 }}
+{{- end }}
+        env:
+{{- $ctx := .Values -}}
+{{ include "kubernetes.sources.envs" (dict "Context" $ctx "Type" "logs")}}
+        {{- if .Values.logs.extraEnvVars }}
+{{ toYaml .Values.logs.extraEnvVars | nindent 8 }}
+        {{- end }}
+{{- end }}