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.

Sign up for GitHub

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

Update queue.mem defaults #5150

Merged
merged 4 commits into from
Sep 13, 2017
Merged

Update queue.mem defaults #5150

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1402b32
Update queue.mem defaults
Sep 11, 2017
a45a17f
set queue flush parameters in system tests
Sep 12, 2017
2afc149
Fix typo in CHANGELOG
andrewkroh Sep 12, 2017
ce6338c
Merge branch 'master' into pipeline/queue-defaults
andrewkroh Sep 12, 2017
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
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Changed the hashbang used in the beat helper script from `/bin/bash` to `/usr/bin/env bash`. {pull}5051[5051]
- Changed beat helper script to use `exec` when running the beat. {pull}5051[5051]
- Fix reloader error message to only print on actual error {pull}5066[5066]
- Enable flush timeout by defauly. {pull}5150[5150]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/defauly/default


*Auditbeat*

Expand Down
4 changes: 2 additions & 2 deletions auditbeat/auditbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ auditbeat.modules:
# before providing a batch of events to the outputs.
# A value of 0 (the default) ensures events are immediately available
# to be sent to the outputs.
#flush.min_events: 0
#flush.min_events: 2048

# Maximum duration after which events are available to the outputs,
# if the number of events stored in the queue is < min_flush_events.
#flush.timeout: 0s
#flush.timeout: 1s

# Sets the maximum number of CPUs that can be executing simultaneously. The
# default is the number of logical CPUs available in the system.
Expand Down
5 changes: 5 additions & 0 deletions auditbeat/tests/system/config/auditbeat.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ auditbeat.modules:
{% endif -%}
{%- endfor %}

queue.mem:
events: 4096
flush.min_events: 8
flush.timeout: 0.1s

output.file:
path: '{{ output_file_path|default(beat.working_dir + "/output") }}'
filename: {{ output_file_filename|default("auditbeat") }}
4 changes: 2 additions & 2 deletions filebeat/filebeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,11 +521,11 @@ filebeat.prospectors:
# before providing a batch of events to the outputs.
# A value of 0 (the default) ensures events are immediately available
# to be sent to the outputs.
#flush.min_events: 0
#flush.min_events: 2048

# Maximum duration after which events are available to the outputs,
# if the number of events stored in the queue is < min_flush_events.
#flush.timeout: 0s
#flush.timeout: 1s

# Sets the maximum number of CPUs that can be executing simultaneously. The
# default is the number of logical CPUs available in the system.
Expand Down
7 changes: 7 additions & 0 deletions filebeat/tests/system/config/filebeat.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ processors:

{%- endif %}

#================================ Queue =====================================

queue.mem:
events: 4096
flush.min_events: 8
flush.timeout: 0.1s

#================================ Outputs =====================================

# Configure what outputs to use when sending the data collected by the beat.
Expand Down
4 changes: 2 additions & 2 deletions heartbeat/heartbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ heartbeat.scheduler:
# before providing a batch of events to the outputs.
# A value of 0 (the default) ensures events are immediately available
# to be sent to the outputs.
#flush.min_events: 0
#flush.min_events: 2048

# Maximum duration after which events are available to the outputs,
# if the number of events stored in the queue is < min_flush_events.
#flush.timeout: 0s
#flush.timeout: 1s

# Sets the maximum number of CPUs that can be executing simultaneously. The
# default is the number of logical CPUs available in the system.
Expand Down
9 changes: 9 additions & 0 deletions heartbeat/tests/system/config/heartbeat.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ fields:
{% endfor -%}
{% endif %}

#================================ Queue =====================================

queue.mem:
events: 4096
flush.min_events: 8
flush.timeout: 0.1s

#================================ Outputs =====================================

output.file:
path: {{ output_file_path|default(beat.working_dir + "/output") }}
filename: "{{ output_file_filename|default("heartbeat") }}"
4 changes: 2 additions & 2 deletions libbeat/_meta/config.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
# before providing a batch of events to the outputs.
# A value of 0 (the default) ensures events are immediately available
# to be sent to the outputs.
#flush.min_events: 0
#flush.min_events: 2048

# Maximum duration after which events are available to the outputs,
# if the number of events stored in the queue is < min_flush_events.
#flush.timeout: 0s
#flush.timeout: 1s

# Sets the maximum number of CPUs that can be executing simultaneously. The
# default is the number of logical CPUs available in the system.
Expand Down
4 changes: 2 additions & 2 deletions libbeat/publisher/queue/memqueue/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ type config struct {

var defaultConfig = config{
Events: 4 * 1024,
FlushMinEvents: 0,
FlushTimeout: 0,
FlushMinEvents: 2 * 1024,
FlushTimeout: 1 * time.Second,
}

func (c *config) Validate() error {
Expand Down
6 changes: 6 additions & 0 deletions libbeat/tests/system/config/mockbeat.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ tags: [
{%- endfor -%}
{%- endif -%}]

#================================ Queue =====================================

queue.mem:
events: 4096
flush.min_events: 8
flush.timeout: 0.1s

############################# Output ############################################

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/metricbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,11 +480,11 @@ metricbeat.modules:
# before providing a batch of events to the outputs.
# A value of 0 (the default) ensures events are immediately available
# to be sent to the outputs.
#flush.min_events: 0
#flush.min_events: 2048

# Maximum duration after which events are available to the outputs,
# if the number of events stored in the queue is < min_flush_events.
#flush.timeout: 0s
#flush.timeout: 1s

# Sets the maximum number of CPUs that can be executing simultaneously. The
# default is the number of logical CPUs available in the system.
Expand Down
7 changes: 7 additions & 0 deletions metricbeat/tests/system/config/metricbeat.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ processors:

{%- endif %}

#================================ Queue =====================================

queue.mem:
events: 4096
flush.min_events: 8
flush.timeout: 0.1s

#================================ Outputs =====================================

# Configure what outputs to use when sending the data collected by the beat.
Expand Down
4 changes: 2 additions & 2 deletions packetbeat/packetbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,11 @@ packetbeat.protocols:
# before providing a batch of events to the outputs.
# A value of 0 (the default) ensures events are immediately available
# to be sent to the outputs.
#flush.min_events: 0
#flush.min_events: 2048

# Maximum duration after which events are available to the outputs,
# if the number of events stored in the queue is < min_flush_events.
#flush.timeout: 0s
#flush.timeout: 1s

# Sets the maximum number of CPUs that can be executing simultaneously. The
# default is the number of logical CPUs available in the system.
Expand Down
7 changes: 7 additions & 0 deletions packetbeat/tests/system/config/packetbeat.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@ processors:

{%- endif %}

#================================ Queue =====================================

queue.mem:
events: 4096
flush.min_events: 8
flush.timeout: 0.1s

#================================ Outputs =====================================

# Configure what outputs to use when sending the data collected by the beat.
Expand Down
7 changes: 7 additions & 0 deletions winlogbeat/tests/system/config/winlogbeat.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ fields:
{% endfor -%}
{% endif %}

#================================ Queue =====================================

queue.mem:
events: 4096
flush.min_events: 8
flush.timeout: 0.1s

#================================ Outputs =====================================

# Configure what outputs to use when sending the data collected by the beat.
Expand Down
4 changes: 2 additions & 2 deletions winlogbeat/winlogbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ winlogbeat.event_logs:
# before providing a batch of events to the outputs.
# A value of 0 (the default) ensures events are immediately available
# to be sent to the outputs.
#flush.min_events: 0
#flush.min_events: 2048

# Maximum duration after which events are available to the outputs,
# if the number of events stored in the queue is < min_flush_events.
#flush.timeout: 0s
#flush.timeout: 1s

# Sets the maximum number of CPUs that can be executing simultaneously. The
# default is the number of logical CPUs available in the system.
Expand Down