[WIP] Add Optional Filebeat Configuration To Server Helm Chart

deployment/armada/templates/_helpers.tpl

@@ -11,6 +11,14 @@
 {{- printf "%s%s" ( include "armada.config.name" .) ".yaml" -}}
 {{- end }}
 
+{{- define "armada.logging.config.name" -}}
+{{- printf "%s-%s" ( include "armada.name" .) "logging-config" -}}
+{{- end }}
+
+{{- define "armada.logging.config.filename" -}}
+{{- printf "%s%s" ( include "armada.logging.config.name" .) ".yaml" -}}
+{{- end }}
+
 {{- define "armada.users.name" -}}
 {{- printf "%s-%s" ( include "armada.name" .) "users" -}}
 {{- end }}
@@ -63,3 +71,8 @@ release: {{ .Release.Name }}
 {{ toYaml .Values.additionalLabels }}
 {{- end }}
 {{- end -}}
+
+
+{{- define "armada.filebeat.config.name" -}}
+{{- printf "%s-%s" ( include "armada.name" .) "filebeat-config" -}}
+{{- end }}

deployment/armada/templates/configmap.yaml

@@ -10,3 +10,38 @@ data:
 {{- if .Values.applicationConfig }}
 {{ toYaml .Values.applicationConfig | indent 4 }}
 {{- end }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "armada.logging.config.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "armada.labels.all" . | nindent 4 }}
+data:
+  {{ include "armada.logging.config.filename" . }}: |
+{{- if .Values.logging }}
+{{ toYaml .Values.logging | indent 4 }}
+{{- end }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "armada.filebeat.config.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "armada.labels.all" . | nindent 4 }}
+data:
+  filebeat.yml: |-
+    filebeat.inputs:
+      - type: log
+        enabled: true
+        paths:
+          - /log/*.json
+    processors:
+      - add_fields:
+          target: ""
+          fields:
+            app: "armada-server"
+    output.logstash:
+      hosts: ["${LOGSTASH_HOST}:${LOGSTASH_PORT}"]

deployment/armada/templates/deployment.yaml

@@ -45,6 +45,8 @@ spec:
             - name: GOMEMLIMIT
               value: {{ quote . }}
             {{- end }}
+            - name: "ARMADA_LOG_CONFIG"
+              value: /config/{{ include "armada.logging.config.filename" . }}
             - name: SERVICE_ACCOUNT
               valueFrom:
                 fieldRef:
@@ -79,6 +81,12 @@ spec:
               mountPath: /config/application_config.yaml
               subPath: {{ include "armada.config.filename" . }}
               readOnly: true
+            - name: logging-config
+              mountPath: /config/logging_config.yaml
+              subPath: {{ include "armada.logging.config.filename" . }}
+              readOnly: true
+            - name: logs
+              mountPath: /log
             {{- if .Values.applicationConfig.pulsar.authenticationEnabled }}
             - name: pulsar-token
               mountPath: "/pulsar/tokens"
@@ -117,6 +125,24 @@ spec:
             initialDelaySeconds: 10
             timeoutSeconds: 10
             failureThreshold: 3
+        - name: filebeat
+          image: {{ .Values.filebeat.image.registry }}{{ .Values.filebeat.image.tag }}
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: LOGSTASH_HOST
+              value: {{ .Values.filebeat.logstash.host }}
+            - name: LOGSTASH_PORT
+              value: {{ .Values.filebeat.logstash.port }}
+          args:
+            - "-e"
+            - "-c"
+            - "/etc/filebeat/filebeat.yaml"
+          volumeMounts:
+            - name: filebeat-config
+              mountPath: /etc/filebeat/filebeat.yaml
+              subPath: filebeat.yml
+            - name: log
+              mountPath: /log
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -133,6 +159,11 @@ spec:
         - name: user-config
           configMap:
             name: {{ include "armada.config.name" . }}
+        - name: logging-config
+          configMap:
+            name: {{ include "armada.logging.config.name" . }}
+        - name: logs
+          emptyDir: { }
         {{- if .Values.applicationConfig.pulsar.authenticationEnabled }}
         - name: pulsar-token
           secret:

deployment/armada/values.yaml

@@ -112,3 +112,26 @@ applicationConfig:
     tlsEnabled: false
     # -- Name of the secret which contains the Pulsar CA certificate
     cacert: armada-pulsar-ca-tls
+
+logging:
+  console:
+    level: info
+    format: text
+  file:
+    enabled: false
+    level: info
+    format: json
+    rotation:
+      maxSizeMb: 5
+      maxBackups: 3
+      maxAgeDays: 7
+      compress: false
+
+filebeat:
+  enabled: false
+  image:
+    repository: docker.elastic.co/beats/filebeat
+    tag: 7.17.0
+  logstash:
+    host: "localhost"
+    port: 5044