collect service log

Signed-off-by: wenchajun <[email protected]>
fluent · Sep 13, 2021 · caf404f · caf404f
1 parent 8cb6c0c
commit caf404f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -106,7 +106,7 @@ helm install fluentbit-operator --create-namespace -n kubesphere-logging-system
 If your container runtime is `cri-o`
 
 ```shell
-helm install fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluentbit-operator/  --set containerRuntime=cri-o
+helm install fluentbit-operator --create-namespace -n kubesphere-logging-system charts/fluentbit-operator/  --set containerRuntime=crio
 ```
 
 ### Quick Start

diff --git a/charts/fluentbit-operator/templates/fluentbit-operator-deployment.yaml b/charts/fluentbit-operator/templates/fluentbit-operator-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         - /bin/sh
         - '-c'
         - set -ex;
-          echo CONTAINER_ROOT_DIR=$(docker info -f '{{`{{ .DockerRootDir }}`}}') > /fluentbit-operator/fluent-bit.env
+          echo CONTAINER_ROOT_DIR=$(docker info -f '{{`{{.DockerRootDir}}`}}') > /fluentbit-operator/fluent-bit.env
         volumeMounts:
         - name: env
           mountPath: /fluentbit-operator
@@ -54,7 +54,7 @@ spec:
         - /bin/sh
         - '-c'
         - set -ex;
-          echo CONTAINER_ROOT_DIR=$(crictl info --output go-template --template '{{`{{ .config.containerdRootDir }}`}}') > /fluentbit-operator/fluent-bit.env
+          echo CONTAINER_ROOT_DIR=$(crictl info --output go-template --template '{{`{{.config.containerdRootDir}}`}}') > /fluentbit-operator/fluent-bit.env
         volumeMounts:
         - name: env
           mountPath: /fluentbit-operator
@@ -64,7 +64,7 @@ spec:
         - name: crictl
           readOnly: true
           mountPath: /usr/local/bin/crictl
-      {{- else if eq .Values.containerRuntime "cri-o" }}
+      {{- else if eq .Values.containerRuntime "crio" }}
       volumes:
         - name: env
           emptyDir: {}

diff --git a/...rator/templates/input-systemd-docker.yaml → ...or/templates/input-systemd-container.yaml b/...rator/templates/input-systemd-docker.yaml → ...or/templates/input-systemd-container.yaml
@@ -2,16 +2,16 @@
 apiVersion: logging.kubesphere.io/v1alpha2
 kind: Input
 metadata:
-  name: docker
+  name: {{ .Values.containerRuntime }}
   labels:
     logging.kubesphere.io/enabled: "true"
     logging.kubesphere.io/component: logging
 spec:
   systemd:
-    tag: service.docker
+    tag: service.{{ .Values.containerRuntime }}
     path: /var/log/journal
     db: /fluent-bit/tail/docker.db
     dbSync: Normal
     systemdFilter:
-      - _SYSTEMD_UNIT=docker.service
+      - _SYSTEMD_UNIT={{ .Values.containerRuntime }}.service
   {{- end }}
diff --git a/charts/fluentbit-operator/templates/input-tail.yaml b/charts/fluentbit-operator/templates/input-tail.yaml
@@ -14,7 +14,7 @@ spec:
     parser: docker
     {{- else if eq .Values.containerRuntime "containerd" }}
     parser: cri
-    {{- else if eq .Values.containerRuntime "cri-o" }}
+    {{- else if eq .Values.containerRuntime "crio" }}
     parser: cri
     {{- end }}
     refreshIntervalSeconds: 10

diff --git a/charts/fluentbit-operator/templates/output-elasticsearch.yaml b/charts/fluentbit-operator/templates/output-elasticsearch.yaml
@@ -12,6 +12,7 @@ spec:
   es:
     host: {{ .Values.output.es.host }}
     port: {{ .Values.output.es.port }}
+    generateID: true
     logstashPrefix: ks-logstash-log
     logstashFormat: true
     timeKey: "@timestamp"

diff --git a/charts/fluentbit-operator/values.yaml b/charts/fluentbit-operator/values.yaml
@@ -54,7 +54,7 @@ Kubernetes: false
 input:
   tail:
     memBufLimit: 5MB
-#Set this to containerd or cri-o if you want to collect CRI format logs
+#Set this to containerd or crio if you want to collect CRI format logs
 containerRuntime: docker
 logPath:
   crio: /var/log

diff --git a/manifests/logging-stack/output-elasticsearch.yaml b/manifests/logging-stack/output-elasticsearch.yaml
@@ -11,6 +11,7 @@ spec:
   es:
     host: elasticsearch-logging-data.kubesphere-logging-system.svc
     port: 9200
+    generateID: true
     logstashPrefix: ks-logstash-log
     logstashFormat: true
     timeKey: "@timestamp"