From 75fc70353c538e88a85063283929220f540e8abd Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 8 Apr 2022 16:21:37 +0200 Subject: [PATCH] feat(logging): remove systemd machine-id nonsense from fluent-bit --- charts/kubezero-logging/Chart.yaml | 6 +++--- charts/kubezero-logging/charts/fluent-bit/Chart.yaml | 8 ++++---- charts/kubezero-logging/charts/fluent-bit/values.yaml | 6 ++++-- charts/kubezero-logging/charts/fluentd/Chart.yaml | 2 +- .../charts/fluentd/templates/podsecuritypolicy.yaml | 3 +++ .../charts/fluentd/templates/service.yaml | 6 ++++++ charts/kubezero-logging/charts/fluentd/values.yaml | 2 ++ charts/kubezero-logging/templates/eck/kibana.yaml | 3 +++ charts/kubezero-logging/values.yaml | 7 ------- 9 files changed, 26 insertions(+), 17 deletions(-) diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index 4f7d0269..85ebe89a 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.7.17 +version: 0.7.19 appVersion: 1.6.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png @@ -23,9 +23,9 @@ dependencies: # repository: https://helm.elastic.co condition: eck-operator.enabled - name: fluentd - version: 0.3.5 + version: 0.3.7 condition: fluentd.enabled - name: fluent-bit - version: 0.19.18 + version: 0.19.23 condition: fluent-bit.enabled kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml index ac3d6a51..b743b80e 100644 --- a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml @@ -1,9 +1,9 @@ annotations: artifacthub.io/changes: | - kind: changed - description: "Update fluent-bit image to 1.8.12." + description: "Update fluent-bit image to 1.8.15." apiVersion: v1 -appVersion: 1.8.12 +appVersion: 1.8.15 description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems. home: https://fluentbit.io/ @@ -13,7 +13,7 @@ keywords: - fluent-bit - fluentd maintainers: -- email: eduardo@treasure-data.com +- email: eduardo@calyptia.com name: edsiper - email: naseem@transit.app name: naseemkullah @@ -24,4 +24,4 @@ maintainers: name: fluent-bit sources: - https://github.com/fluent/fluent-bit/ -version: 0.19.18 +version: 0.19.23 diff --git a/charts/kubezero-logging/charts/fluent-bit/values.yaml b/charts/kubezero-logging/charts/fluent-bit/values.yaml index d0e2b77d..72f2027e 100644 --- a/charts/kubezero-logging/charts/fluent-bit/values.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/values.yaml @@ -7,7 +7,7 @@ kind: DaemonSet replicaCount: 1 image: - repository: fluent/fluent-bit + repository: cr.fluentbit.io/fluent/fluent-bit # Overrides the image tag whose default is {{ .Chart.AppVersion }} tag: "" pullPolicy: Always @@ -235,6 +235,8 @@ extraContainers: [] # image: busybox # command: ['do', 'something'] +flush: 1 + metricsPort: 2020 extraPorts: [] @@ -268,7 +270,7 @@ config: service: | [SERVICE] Daemon Off - Flush 1 + Flush {{ .Values.flush }} Log_Level {{ .Values.logLevel }} Parsers_File parsers.conf Parsers_File custom_parsers.conf diff --git a/charts/kubezero-logging/charts/fluentd/Chart.yaml b/charts/kubezero-logging/charts/fluentd/Chart.yaml index 58956e3d..edc21e78 100644 --- a/charts/kubezero-logging/charts/fluentd/Chart.yaml +++ b/charts/kubezero-logging/charts/fluentd/Chart.yaml @@ -12,4 +12,4 @@ name: fluentd sources: - https://github.com/fluent/fluentd/ - https://github.com/fluent/fluentd-kubernetes-daemonset -version: 0.3.5 +version: 0.3.7 diff --git a/charts/kubezero-logging/charts/fluentd/templates/podsecuritypolicy.yaml b/charts/kubezero-logging/charts/fluentd/templates/podsecuritypolicy.yaml index 2341f637..5b3f4e9a 100644 --- a/charts/kubezero-logging/charts/fluentd/templates/podsecuritypolicy.yaml +++ b/charts/kubezero-logging/charts/fluentd/templates/podsecuritypolicy.yaml @@ -21,6 +21,9 @@ spec: - 'configMap' - 'secret' - 'hostPath' + {{- if .Values.persistence.enabled }} + - 'persistentVolumeClaim' + {{- end }} runAsUser: rule: 'RunAsAny' seLinux: diff --git a/charts/kubezero-logging/charts/fluentd/templates/service.yaml b/charts/kubezero-logging/charts/fluentd/templates/service.yaml index dec930ca..357a85ca 100644 --- a/charts/kubezero-logging/charts/fluentd/templates/service.yaml +++ b/charts/kubezero-logging/charts/fluentd/templates/service.yaml @@ -11,6 +11,12 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} + {{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }} + {{- end }} ports: - port: 24231 targetPort: metrics diff --git a/charts/kubezero-logging/charts/fluentd/values.yaml b/charts/kubezero-logging/charts/fluentd/values.yaml index 15875804..ce705e33 100644 --- a/charts/kubezero-logging/charts/fluentd/values.yaml +++ b/charts/kubezero-logging/charts/fluentd/values.yaml @@ -214,6 +214,8 @@ persistence: service: type: "ClusterIP" annotations: {} + # loadBalancerIP: + # externalTrafficPolicy: Local ports: [] # - name: "forwarder" # protocol: TCP diff --git a/charts/kubezero-logging/templates/eck/kibana.yaml b/charts/kubezero-logging/templates/eck/kibana.yaml index 6411082e..7d31745d 100644 --- a/charts/kubezero-logging/templates/eck/kibana.yaml +++ b/charts/kubezero-logging/templates/eck/kibana.yaml @@ -16,6 +16,9 @@ spec: config: elasticsearch.requestTimeout: 180000 elasticsearch.shardTimeout: 180000 + {{- with .Values.kibana.istio.url }} + server.publicBaseUrl: https://{{ . }} + {{- end }} #xpack.monitoring.enabled: false #xpack.monitoring.ui.enabled: false #xpack.ml.enabled: false diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 4c183f4a..5f490149 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -396,14 +396,7 @@ fluent-bit: - name: varlog hostPath: path: /var/log - - name: etcmachineid - hostPath: - path: /etc/machine-id - type: File daemonSetVolumeMounts: - name: varlog mountPath: /var/log - - name: etcmachineid - mountPath: /etc/machine-id - readOnly: true