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

add missing configuration options to fluentbit chart #758

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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 stable/aws-for-fluent-bit/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: aws-for-fluent-bit
description: A Helm chart to deploy aws-for-fluent-bit project
version: 0.1.16
version: 0.1.17
appVersion: 2.21.5
home: https://github.com/aws/eks-charts
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
Expand Down
3 changes: 3 additions & 0 deletions stable/aws-for-fluent-bit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ helm delete aws-for-fluent-bit --namespace kube-system
| `cloudWatch.autoCreateGroup` | Automatically create the log group. Valid values are "true" or "false" (case insensitive). | true |
| `cloudWatch.endpoint` | Specify a custom endpoint for the CloudWatch Logs API. | |
| `cloudWatch.credentialsEndpoint` | Specify a custom HTTP endpoint to pull credentials from. [more info](https://github.com/aws/amazon-cloudwatch-logs-for-fluent-bit) | |
| `cloudWatch.defaultLogGroupName` | Fallback in case any variables in logGroupName fail to parse. | |
| `cloudWatch.defaultLogStreamName` | Fallback in case any variables in logStreamName fail to parse. | |
| `cloudWatch.newLogGroupTags` | Comma/equal delimited string of tags to include with auto created log groups. Example: `--set cloudWatch.newLogGroupTags="tag1=test\,tag2=test"` | |
| `cloudWatch.extraOutputs` | Append extra outputs with value | `""` |
| `firehose.enabled` | Whether this plugin should be enabled or not, [details](https://github.com/aws/amazon-kinesis-firehose-for-fluent-bit) | `true` | ✔
| `firehose.match` | The log filter | `"*"` | ✔
Expand Down
35 changes: 22 additions & 13 deletions stable/aws-for-fluent-bit/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,36 +57,45 @@ data:

{{- if .Values.cloudWatch.enabled }}
[OUTPUT]
Name cloudwatch
Match {{ .Values.cloudWatch.match }}
region {{ .Values.cloudWatch.region }}
log_group_name {{ .Values.cloudWatch.logGroupName }}
Name cloudwatch
Match {{ .Values.cloudWatch.match }}
region {{ .Values.cloudWatch.region }}
log_group_name {{ .Values.cloudWatch.logGroupName }}
{{- if .Values.cloudWatch.logStreamName }}
log_stream_name {{ .Values.cloudWatch.logStreamName }}
log_stream_name {{ .Values.cloudWatch.logStreamName }}
{{- end }}
{{- if .Values.cloudWatch.logStreamPrefix }}
log_stream_prefix {{ .Values.cloudWatch.logStreamPrefix }}
log_stream_prefix {{ .Values.cloudWatch.logStreamPrefix }}
{{- end }}
{{- if .Values.cloudWatch.logKey }}
log_key {{ .Values.cloudWatch.logKey }}
log_key {{ .Values.cloudWatch.logKey }}
{{- end }}
{{- if .Values.cloudWatch.logFormat }}
log_format {{ .Values.cloudWatch.logFormat }}
log_format {{ .Values.cloudWatch.logFormat }}
{{- end }}
{{- if .Values.cloudWatch.logRetentionDays }}
log_retention_days {{ .Values.cloudWatch.logRetentionDays }}
log_retention_days {{ .Values.cloudWatch.logRetentionDays }}
{{- end }}
{{- if .Values.cloudWatch.roleArn }}
role_arn {{ .Values.cloudWatch.roleArn }}
role_arn {{ .Values.cloudWatch.roleArn }}
{{- end }}
{{- if .Values.cloudWatch.autoCreateGroup }}
auto_create_group {{ .Values.cloudWatch.autoCreateGroup }}
auto_create_group {{ .Values.cloudWatch.autoCreateGroup }}
{{- end }}
{{- if .Values.cloudWatch.endpoint }}
endpoint {{ .Values.cloudWatch.endpoint }}
endpoint {{ .Values.cloudWatch.endpoint }}
{{- end }}
{{- if .Values.cloudWatch.credentialsEndpoint }}
credentials_endpoint {{ toJson .Values.cloudWatch.credentialsEndpoint }}
credentials_endpoint {{ toJson .Values.cloudWatch.credentialsEndpoint }}
{{- end }}
{{- if .Values.cloudWatch.defaultLogGroupName }}
default_log_group_name {{ .Values.cloudWatch.defaultLogGroupName }}
{{- end }}
{{- if .Values.cloudWatch.defaultLogStreamName }}
default_log_stream_name {{ .Values.cloudWatch.defaultLogStreamName }}
{{- end }}
{{- if .Values.cloudWatch.newLogGroupTags }}
new_log_group_tags {{ .Values.cloudWatch.newLogGroupTags }}
{{- end -}}
{{- if .Values.cloudWatch.extraOutputs }}
{{ .Values.cloudWatch.extraOutputs | indent 8 }}
Expand Down
3 changes: 3 additions & 0 deletions stable/aws-for-fluent-bit/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ cloudWatch:
autoCreateGroup: true
endpoint:
credentialsEndpoint: {}
defaultLogGroupName:
defaultLogStreamName:
newLogGroupTags:
# extraOutputs: |
# ...

Expand Down