Commit f7a0a96d authored by keshavprasadms's avatar keshavprasadms
Browse files

fix: updating fluentbit

Showing with 31 additions and 29 deletions
+31 -29
apiVersion: v1
name: fluent-bit
version: 2.7.1
appVersion: 1.2.2
version: 2.8.2
appVersion: 1.3.2
description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX
keywords:
- logging
......
File mode changed from 100755 to 100644
......@@ -43,6 +43,7 @@ The following table lists the configurable parameters of the Fluent-Bit chart an
| `backend.es.port` | TCP port of the target Elasticsearch instance. | `9200` |
| `backend.es.index` | Elastic Index name | `kubernetes_cluster` |
| `backend.es.type` | Elastic Type name | `flb_type` |
| `backend.es.retry_limit` | Max number of retries to attempt (False == no limit) | `False` |
| `backend.es.time_key` | Elastic Time Key | `@timestamp` |
| `backend.es.logstash_format` | Enable Logstash format compatibility. | `On` |
| `backend.es.logstash_prefix` | Index Prefix. If Logstash_Prefix is equals to 'mydata' your index will become 'mydata-YYYY.MM.DD'. | `kubernetes_cluster` |
......@@ -77,6 +78,10 @@ The following table lists the configurable parameters of the Fluent-Bit chart an
| `backend.splunk.tls_verify` | Force TLS certificate validation | `off` |
| `backend.splunk.tls_debug` | Set TLS debug verbosity level. It accept the following values: 0-4 | `1` |
| `backend.splunk.message_key` | Tag applied to all incoming logs | `kubernetes` |
| **Stackdriver Backend** |
| `backend.stackdriver.google_service_credentials` | Contents of a Google Cloud credentials JSON file. | `` |
| `backend.stackdriver.service_account_email` | Account email associated to the service. Only available if no credentials file has been provided. | `` |
| `backend.stackdriver.service_account_secret` | Private key content associated with the service account. Only available if no credentials file has been provided. | `` |
| **Parsers** |
| `parsers.enabled` | Enable custom parsers | `false` |
| `parsers.regex` | List of regex parsers | `NULL` |
......@@ -106,7 +111,7 @@ The following table lists the configurable parameters of the Fluent-Bit chart an
| `filter.mergeJSONLog` | If the log field content is a JSON string map, append the map fields as part of the log structure | `true` |
| `filter.mergeLogKey` | If set, append the processed log keys under a new root key specified by this variable. | `nil` |
| `image.fluent_bit.repository` | Image | `fluent/fluent-bit` |
| `image.fluent_bit.tag` | Image tag | `1.2.2` |
| `image.fluent_bit.tag` | Image tag | `1.3.2` |
| `image.pullPolicy` | Image pull policy | `Always` |
| `nameOverride` | Override name of app | `nil` |
| `fullnameOverride` | Override full name of app | `nil` |
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -76,6 +76,7 @@ data:
K8S-Logging.Exclude On
{{- end }}
{{ .Values.extraEntries.filter | indent 8 }}
[FILTER]
Name envoyparser
Match kube.istio-proxy.*
Key_Name log
......@@ -246,10 +247,9 @@ data:
{{- end }}
{{ end }}
{{- end }}
{{- end -}}
[PARSER]
Name envoy
Format regex
Regex ^(?<host>[^ ]*) - \[(?<real_ip>[^ ]*)\] - (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*) "(?<referer>[^\"]*)" "(?<agent>[^\"]*)" (?<request_length>[^ ]*) (?<request_time>[^ ]*) \[(?<proxy_upstream_name>[^ ]*)\] (?<upstream_addr>[^ ]*) (?<upstream_response_length>[^ ]*) (?<upstream_response_time>[^ ]*) (?<upstream_status>[^ ]*) (?<last>[^$]*)
Preserve_Key true
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -3,7 +3,6 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "fluent-bit.fullname" . }}
namespace: {{ .Values.namespace }}
{{- if .Values.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- end }}
......@@ -27,7 +26,7 @@ spec:
{{- end }}
namespaceSelector:
matchNames:
- {{ .Values.namespace }}
- {{ .Release.Namespace }}
selector:
matchLabels:
app: {{ include "fluent-bit.name" . }}
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -16,6 +16,7 @@ testFramework:
nameOverride: ""
fullnameOverride: ""
# When enabled, exposes json and prometheus metrics on {{ .Release.Name }}-metrics service
metrics:
enabled: false
service:
......@@ -46,22 +47,22 @@ backend:
type: es
forward:
host: fluentd
port: 24220
port: 24284
tls: "off"
tls_verify: "off"
tls_verify: "on"
tls_debug: 1
shared_key:
es:
host: {{ log_es_host }}
host: {{ log_es_host }}
port: 9200
# Elastic Index Name
index: fluent-bit
# index: flb_type
type: doc
# logstash_prefix: fluent-bit
# logstash_prefix: kubernetes_cluster
replace_dots: "On"
logstash_format: "On"
time_key: "@timestamp-fb"
retry_limit: "False"
time_key: "@timestamp"
# Optional username credential for Elastic X-Pack access
http_user:
# Password for user defined in HTTP_User
......@@ -102,18 +103,18 @@ backend:
headers: []
parsers:
enabled: true
enabled: false
## List the respective parsers in key: value format per entry
## Regex required fields are name and regex. JSON and Logfmt required field
## is name.
regex: []
logfmt: []
logfmt: []
## json parser config can be defined by providing an extraEntries field.
## The following entry:
## json:
## - extraEntries: |
## Decode_Field_As escaped log do_next
## Decode_Field_As json log
## json:
## - extraEntries: |
## Decode_Field_As escaped log do_next
## Decode_Field_As json log
##
## translates into
##
......@@ -122,9 +123,8 @@ parsers:
## Decode_Field_As escaped log do_next
## Decode_Field_As json log
##
json:
- name: dockerJson
extraEntries: |-
json:
- extraEntries: |
Time_Key time
Time_Format %Y-%m-%dT%H:%M:%S.%L
Time_Keep On
......@@ -146,8 +146,7 @@ podAnnotations: {}
## used
fullConfigMap: false
## ConfigMap override where fullname is .Release.Name-.Values.existingConfigMap
## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.existingConfigMap}}
## Defining existingConfigMap will cause templates/config.yaml
## to NOT generate a ConfigMap resource
##
......@@ -157,7 +156,6 @@ existingConfigMap: ""
# NOTE If you want to add extra sections, add them here, inbetween the includes,
# wherever they need to go. Sections order matters.
rawConfig: |-
@INCLUDE fluent-bit-service.conf
@INCLUDE fluent-bit-input.conf
......@@ -194,10 +192,10 @@ extraVolumes: []
##
extraVolumeMounts: []
resources:
resources: {}
limits:
cpu: 100m
memory: 128Mi
cpu: 500m
memory: 512Mi
requests:
cpu: 10m
memory: 8Mi
......@@ -283,7 +281,7 @@ serviceAccount:
create: true
# The name of the ServiceAccount to use.
# If not set and create is true, a name is generated using the fullname template
name: fluent-bit
name:
## Specifies security settings for a container
## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment