Skip to content

Commit

Permalink
Adjusting the parameters of fluentbit
Browse files Browse the repository at this point in the history
Signed-off-by: dehaocheng <[email protected]>
  • Loading branch information
wenchajun committed Aug 18, 2023
1 parent 97630cb commit f9be7c2
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
spec:
service:
parsersFile: parsers.conf
httpServer: true
inputSelector:
matchLabels:
logging.kubesphere.io/enabled: "true"
Expand Down
2 changes: 1 addition & 1 deletion roles/common/templates/custom-fluentbit-fluentBit.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
resources:
limits:
cpu: 500m
memory: 200Mi
memory: 500Mi
requests:
cpu: 10m
memory: 25Mi
Expand Down
2 changes: 1 addition & 1 deletion roles/ks-auditing/templates/custom-input-auditing.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
tail:
db: /fluent-bit/tail/pos-auditing.db
dbSync: Normal
memBufLimit: 5MB
memBufLimit: 100MB
{% if (logging_container_runtime== 'containerd') or (logging_container_runtime== 'crio') %}
parser: cri
{% else %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ metadata:
spec:
match: kube_auditing
es:
bufferSize: 20MB
logstashFormat: true
traceError: true
generateID: true
host: "{% if common.es.externalElasticsearchHost is defined and common.es.externalElasticsearchHost != "" %}{{ common.es.externalElasticsearchHost }}{% else %}elasticsearch-logging-data.kubesphere-logging-system.svc{% endif %}"
logstashPrefix: "ks-{{ common.es.elkPrefix }}-auditing"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ spec:
match: kube_auditing
opensearch:
logstashFormat: true
bufferSize: 20MB
traceError: true
host: "{% if common.opensearch.externalOpensearchHost is defined and common.opensearch.externalOpensearchHost != "" %}{{ common.opensearch.externalOpensearchHost }}{% else %}opensearch-cluster-data.kubesphere-logging-system.svc{% endif %}"
logstashPrefix: "ks-{{ common.opensearch.opensearchPrefix }}-auditing"
port: {% if common.opensearch.externalOpensearchPort is defined and common.opensearch.externalOpensearchPort != "" %}{{ common.opensearch.externalOpensearchPort }}{% else %}9200{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion roles/ks-events/templates/custom-input-events.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
parser: docker
{% endif %}
refreshIntervalSeconds: 10
memBufLimit: 5MB
memBufLimit: 100MB
skipLongLines: true
db: /fluent-bit/tail/pos-events.db
dbSync: Normal
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ metadata:
spec:
match: kube_events
es:
bufferSize: 20MB
traceError: true
logstashFormat: true
generateID: true
host: "{% if common.es.externalElasticsearchHost is defined and common.es.externalElasticsearchHost != "" %}{{ common.es.externalElasticsearchHost }}{% else %}elasticsearch-logging-data.kubesphere-logging-system.svc{% endif %}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ metadata:
spec:
match: kube_events
opensearch:
bufferSize: 20MB
traceError: true
logstashFormat: true
generateID: true
host: "{% if common.opensearch.externalOpensearchHost is defined and common.opensearch.externalOpensearchHost != "" %}{{ common.opensearch.externalOpensearchHost }}{% else %}opensearch-cluster-data.kubesphere-logging-system.svc{% endif %}"
Expand Down
2 changes: 1 addition & 1 deletion roles/ks-logging/templates/custom-input-logging.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
parser: docker
{% endif %}
refreshIntervalSeconds: 10
memBufLimit: 5MB
memBufLimit: 100MB
skipLongLines: true
db: /fluent-bit/tail/pos.db
dbSync: Normal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
name: "elasticsearch-credentials"
{% endif %}
{% endif %}
bufferSize: 20MB
traceError: true
generateID: true
logstashPrefix: "ks-{{ common.es.elkPrefix }}-log"
logstashFormat: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ spec:
name: "opensearch-credentials"
{% endif %}
{% endif %}
bufferSize: 20MB
traceError: true
logstashPrefix: "ks-{{ common.opensearch.opensearchPrefix }}-logging"
logstashFormat: true
timeKey: "@timestamp"
Expand Down

0 comments on commit f9be7c2

Please sign in to comment.