From 41d2f374fd858ab1d6f83f5f644e558f9edf7ced Mon Sep 17 00:00:00 2001 From: Ivo Gosemann Date: Fri, 6 Sep 2024 16:12:55 +0200 Subject: [PATCH] fix(logshipper): default output did not match --- logshipper/chart/Chart.yaml | 2 +- logshipper/chart/templates/fluent-bit-configmap.yaml | 6 +++--- logshipper/plugindefinition.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/logshipper/chart/Chart.yaml b/logshipper/chart/Chart.yaml index 9fb3639b..a3f6907c 100644 --- a/logshipper/chart/Chart.yaml +++ b/logshipper/chart/Chart.yaml @@ -6,7 +6,7 @@ name: logshipper description: A Helm chart for deploying fluent-bit with custom config type: application -version: 0.2.1 +version: 0.2.2 appVersion: 3.0.4 dependencies: diff --git a/logshipper/chart/templates/fluent-bit-configmap.yaml b/logshipper/chart/templates/fluent-bit-configmap.yaml index 41bd8193..7c59723f 100644 --- a/logshipper/chart/templates/fluent-bit-configmap.yaml +++ b/logshipper/chart/templates/fluent-bit-configmap.yaml @@ -27,7 +27,7 @@ data: Name tail Path /var/log/containers/*.log Parser {{ default "cri" ( index .Values "fluent-bit" "parser" ) }} - Tag default_kube.* + Tag default_kube Refresh_Interval 5 Mem_Buf_Limit 50MB Skip_Long_Lines Off @@ -37,7 +37,7 @@ data: [INPUT] Name systemd Path /var/log/journal - Tag default_systemd.* + Tag default_systemd Mem_Buf_Limit 5MB Read_From_Tail On DB /var/log/fluent-bit-journal.pos.db @@ -105,7 +105,7 @@ data: {{ if index .Values "fluent-bit" "backend" "opensearch" "enabled" }} [OUTPUT] Name opensearch - Match default.* + Match default_* Host {{ index .Values "fluent-bit" "backend" "opensearch" "host" }} Port {{ index .Values "fluent-bit" "backend" "opensearch" "port" }} Logstash_Format On diff --git a/logshipper/plugindefinition.yaml b/logshipper/plugindefinition.yaml index 8016049e..92991794 100644 --- a/logshipper/plugindefinition.yaml +++ b/logshipper/plugindefinition.yaml @@ -6,14 +6,14 @@ kind: PluginDefinition metadata: name: logshipper spec: - version: 0.2.1 + version: 0.2.2 displayName: Fluent-bit Logshipper description: Logshipping of container logs and systemd with fluent-bit icon: https://raw.githubusercontent.com/fluent/fluent-bit/master/fluentbit_logo.png helmChart: name: logshipper repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts - version: 0.2.1 + version: 0.2.2 options: - name: fluent-bit.parser description: Parser used for container logs. [docker|cri]