feat(logging): remove systemd machine-id nonsense from fluent-bit

This commit is contained in:
Stefan Reimer 2022-04-08 16:21:37 +02:00
parent 9d9c66e387
commit 75fc70353c
9 changed files with 26 additions and 17 deletions

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-logging name: kubezero-logging
description: KubeZero Umbrella Chart for complete EFK stack description: KubeZero Umbrella Chart for complete EFK stack
type: application type: application
version: 0.7.17 version: 0.7.19
appVersion: 1.6.0 appVersion: 1.6.0
home: https://kubezero.com home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
@ -23,9 +23,9 @@ dependencies:
# repository: https://helm.elastic.co # repository: https://helm.elastic.co
condition: eck-operator.enabled condition: eck-operator.enabled
- name: fluentd - name: fluentd
version: 0.3.5 version: 0.3.7
condition: fluentd.enabled condition: fluentd.enabled
- name: fluent-bit - name: fluent-bit
version: 0.19.18 version: 0.19.23
condition: fluent-bit.enabled condition: fluent-bit.enabled
kubeVersion: ">= 1.18.0" kubeVersion: ">= 1.18.0"

View File

@ -1,9 +1,9 @@
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: changed - kind: changed
description: "Update fluent-bit image to 1.8.12." description: "Update fluent-bit image to 1.8.15."
apiVersion: v1 apiVersion: v1
appVersion: 1.8.12 appVersion: 1.8.15
description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD
family operating systems. family operating systems.
home: https://fluentbit.io/ home: https://fluentbit.io/
@ -13,7 +13,7 @@ keywords:
- fluent-bit - fluent-bit
- fluentd - fluentd
maintainers: maintainers:
- email: eduardo@treasure-data.com - email: eduardo@calyptia.com
name: edsiper name: edsiper
- email: naseem@transit.app - email: naseem@transit.app
name: naseemkullah name: naseemkullah
@ -24,4 +24,4 @@ maintainers:
name: fluent-bit name: fluent-bit
sources: sources:
- https://github.com/fluent/fluent-bit/ - https://github.com/fluent/fluent-bit/
version: 0.19.18 version: 0.19.23

View File

@ -7,7 +7,7 @@ kind: DaemonSet
replicaCount: 1 replicaCount: 1
image: image:
repository: fluent/fluent-bit repository: cr.fluentbit.io/fluent/fluent-bit
# Overrides the image tag whose default is {{ .Chart.AppVersion }} # Overrides the image tag whose default is {{ .Chart.AppVersion }}
tag: "" tag: ""
pullPolicy: Always pullPolicy: Always
@ -235,6 +235,8 @@ extraContainers: []
# image: busybox # image: busybox
# command: ['do', 'something'] # command: ['do', 'something']
flush: 1
metricsPort: 2020 metricsPort: 2020
extraPorts: [] extraPorts: []
@ -268,7 +270,7 @@ config:
service: | service: |
[SERVICE] [SERVICE]
Daemon Off Daemon Off
Flush 1 Flush {{ .Values.flush }}
Log_Level {{ .Values.logLevel }} Log_Level {{ .Values.logLevel }}
Parsers_File parsers.conf Parsers_File parsers.conf
Parsers_File custom_parsers.conf Parsers_File custom_parsers.conf

View File

@ -12,4 +12,4 @@ name: fluentd
sources: sources:
- https://github.com/fluent/fluentd/ - https://github.com/fluent/fluentd/
- https://github.com/fluent/fluentd-kubernetes-daemonset - https://github.com/fluent/fluentd-kubernetes-daemonset
version: 0.3.5 version: 0.3.7

View File

@ -21,6 +21,9 @@ spec:
- 'configMap' - 'configMap'
- 'secret' - 'secret'
- 'hostPath' - 'hostPath'
{{- if .Values.persistence.enabled }}
- 'persistentVolumeClaim'
{{- end }}
runAsUser: runAsUser:
rule: 'RunAsAny' rule: 'RunAsAny'
seLinux: seLinux:

View File

@ -11,6 +11,12 @@ metadata:
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}
{{- if .Values.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
{{- end }}
{{- if .Values.service.externalTrafficPolicy }}
externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
{{- end }}
ports: ports:
- port: 24231 - port: 24231
targetPort: metrics targetPort: metrics

View File

@ -214,6 +214,8 @@ persistence:
service: service:
type: "ClusterIP" type: "ClusterIP"
annotations: {} annotations: {}
# loadBalancerIP:
# externalTrafficPolicy: Local
ports: [] ports: []
# - name: "forwarder" # - name: "forwarder"
# protocol: TCP # protocol: TCP

View File

@ -16,6 +16,9 @@ spec:
config: config:
elasticsearch.requestTimeout: 180000 elasticsearch.requestTimeout: 180000
elasticsearch.shardTimeout: 180000 elasticsearch.shardTimeout: 180000
{{- with .Values.kibana.istio.url }}
server.publicBaseUrl: https://{{ . }}
{{- end }}
#xpack.monitoring.enabled: false #xpack.monitoring.enabled: false
#xpack.monitoring.ui.enabled: false #xpack.monitoring.ui.enabled: false
#xpack.ml.enabled: false #xpack.ml.enabled: false

View File

@ -396,14 +396,7 @@ fluent-bit:
- name: varlog - name: varlog
hostPath: hostPath:
path: /var/log path: /var/log
- name: etcmachineid
hostPath:
path: /etc/machine-id
type: File
daemonSetVolumeMounts: daemonSetVolumeMounts:
- name: varlog - name: varlog
mountPath: /var/log mountPath: /var/log
- name: etcmachineid
mountPath: /etc/machine-id
readOnly: true