Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(logshipper): default output did not match #381

Merged
merged 1 commit into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion logshipper/chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions logshipper/chart/templates/fluent-bit-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions logshipper/plugindefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading