Skip to content

Commit

Permalink
Revert #867 (#883)
Browse files Browse the repository at this point in the history 
* Revert "Decrease fluent-bit buffer_max_size to 2M for smaller outgoing requests. (#867)"

This reverts commit f30948b.

* Update newer goldens after reverting #867
  • Loading branch information
@jefferbrecht
jefferbrecht authored Oct 3, 2022
1 parent f575836 commit 37e434e
Show file tree
Hide file tree
Showing 162 changed files with 391 additions and 391 deletions.
2 changes: 1 addition & 1 deletion confgenerator/logging_receivers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (r LoggingReceiverFilesMixin) Components(tag string) []fluentbit.Component
// Set the chunk limit conservatively to avoid exceeding the recommended chunk size of 5MB per write request.
"Buffer_Chunk_Size": "512k",
// Set the max size a bit larger to accommodate for long log lines.
"Buffer_Max_Size": "2M",
"Buffer_Max_Size": "5M",
// When a message is unstructured (no parser applied), append it under a key named "message".
"Key": "message",
// Increase this to 30 seconds so log rotations are handled more gracefully.
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/builtin/linux/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
2 changes: 1 addition & 1 deletion confgenerator/testdata/builtin/windows/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
4 changes: 2 additions & 2 deletions ...a/valid/linux/all-backward_compatible_with_explicit_exporters/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/valid/linux/all-built_in_config/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
4 changes: 2 additions & 2 deletions confgenerator/testdata/valid/linux/logging-custom_log_level/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
2 changes: 1 addition & 1 deletion ...or/testdata/valid/linux/logging-default_overrides_disable_all/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
6 changes: 3 additions & 3 deletions ...ator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/pipeline1_log_source_id1
Exclude_Path /path/to/log/1/a/exclude_a,/path/to/log/1/b/exclude_b
Key message
Expand All @@ -34,7 +34,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/pipeline2_log_source_id2
Exclude_Path /path/to/log/2/a/exclude_a,/path/to/log/2/b/exclude_b
Key message
Expand Down Expand Up @@ -69,7 +69,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
6 changes: 3 additions & 3 deletions ...generator/testdata/valid/linux/logging-processor_exclude_logs/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p1_sample_logs
Key message
Mem_Buf_Limit 10M
Expand All @@ -47,7 +47,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
6 changes: 3 additions & 3 deletions ...enerator/testdata/valid/linux/logging-processor_modify_fields/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p1_sample_logs
Key message
Mem_Buf_Limit 10M
Expand All @@ -47,7 +47,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
8 changes: 4 additions & 4 deletions confgenerator/testdata/valid/linux/logging-processor_order/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/pipeline1_sample_logs
Key message
Mem_Buf_Limit 10M
Expand All @@ -47,7 +47,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/pipeline2_sample_logs
Key message
Mem_Buf_Limit 10M
Expand All @@ -61,7 +61,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
6 changes: 3 additions & 3 deletions ...alid/linux/logging-processor_parse_json_and_parse_regex_types/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/pipeline1_log_source_id1
Exclude_Path /path/to/log/1/a/exclude_a,/path/to/log/1/b/exclude_b
Key message
Expand All @@ -34,7 +34,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/pipeline2_log_source_id2
Exclude_Path /path/to/log/2/a/exclude_a,/path/to/log/2/b/exclude_b
Key message
Expand Down Expand Up @@ -69,7 +69,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
6 changes: 3 additions & 3 deletions ...erator/testdata/valid/linux/logging-processor_parse_multiline/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p1_files_1
Key message
Mem_Buf_Limit 10M
Expand All @@ -49,7 +49,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
6 changes: 3 additions & 3 deletions .../linux/logging-processor_parse_multiline_processor_not_in_use/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p1_files_1
Key message
Mem_Buf_Limit 10M
Expand All @@ -48,7 +48,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
6 changes: 3 additions & 3 deletions ...valid/linux/logging-processor_parse_multiline_three_languages/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p1_files_1
Key message
Mem_Buf_Limit 10M
Expand All @@ -49,7 +49,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
10 changes: 5 additions & 5 deletions ...ging-processor_parse_multiline_three_processors_same_language/golden_fluent_bit_main.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/default_pipeline_syslog
Key message
Mem_Buf_Limit 10M
Expand All @@ -33,7 +33,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p1_files_1
Key message
Mem_Buf_Limit 10M
Expand All @@ -49,7 +49,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p2_files_2
Key message
Mem_Buf_Limit 10M
Expand All @@ -65,7 +65,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/p3_files_3
Key message
Mem_Buf_Limit 10M
Expand All @@ -81,7 +81,7 @@

[INPUT]
Buffer_Chunk_Size 512k
Buffer_Max_Size 2M
Buffer_Max_Size 5M
DB ${buffers_dir}/ops-agent-fluent-bit
Key message
Mem_Buf_Limit 10M
Expand Down
Loading

0 comments on commit 37e434e

Please sign in to comment.