Add Pod name to logs

Author: ilanRosenbaum

charts/templates/configmap.yaml

@@ -61,28 +61,33 @@ data:
       
       [FILTER]
         Name modify
-        Match kube.marklogic.logs.request
-        Add tag kube.marklogic.logs.request
+        Match *
+        Add pod ${POD_NAME}
       
       [FILTER]
         Name modify
-        Match kube.marklogic.logs.audit
-        Add tag kube.marklogic.logs.audit
+        Match kube.marklogic.logs.error
+        Add tag kube.marklogic.logs.error
 
       [FILTER]
         Name modify
-        Match kube.marklogic.logs.crash
-        Add tag kube.marklogic.logs.crash
+        Match kube.marklogic.logs.access
+        Add tag kube.marklogic.logs.access
 
       [FILTER]
         Name modify
-        Match kube.marklogic.logs.access
-        Add tag kube.marklogic.logs.access
+        Match kube.marklogic.logs.request
+        Add tag kube.marklogic.logs.request
+      
+      [FILTER]
+        Name modify
+        Match kube.marklogic.logs.audit
+        Add tag kube.marklogic.logs.audit
 
       [FILTER]
         Name modify
-        Match kube.marklogic.logs.error
-        Add tag kube.marklogic.logs.error
+        Match kube.marklogic.logs.crash
+        Add tag kube.marklogic.logs.crash
 
       [FILTER]
         Name parser
@@ -104,7 +109,8 @@ data:
         Key_Name log
         Parser json_parser
         Reserve_Data On
-
+      
+      # Configure export to logging backend
       [OUTPUT]
         Name es
         Match *

charts/templates/statefulset.yaml

@@ -112,6 +112,11 @@ spec:
             - name: {{ .Values.logging.configMapName }}
               mountPath: /fluent-bit/etc/parsers.conf
               subPath: parsers.conf
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
         {{- end }}
       dnsConfig:
         searches:

charts/values.yaml

@@ -5,8 +5,8 @@ replicaCount: 1
 
 # Marklogic image parameters
 image:
-  repository: marklogicdb/marklogic-db
-  tag: 10.0-9.1-centos-1.0.0-ea4
+  repository: marklogic-centos/marklogic-server-centos
+  tag: 10-internal
   pullPolicy: IfNotPresent
 
 # Configure the imagePullSecret to pull the image from private repository that requires credential