-
Notifications
You must be signed in to change notification settings - Fork 56
ncm-metaconfig: updated filebeat 7.x schema to fix #1728 #1810
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
Open
DonaldChung-HK
wants to merge
1
commit into
quattor:main
Choose a base branch
from
DonaldChung-HK:1728_update_filebeat_schema_70
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -150,6 +150,14 @@ type beats_logging = { | |||
| 'level' ? choice('critical', 'error', 'warning', 'info', 'debug') | ||||
| }; | ||||
|
|
||||
|
|
||||
| @documentation{ | ||||
| Secomp settings for RHEL with Linux >3.16 | ||||
| (see https://www.elastic.co/guide/en/beats/filebeat/7.10/linux-seccomp.html) | ||||
| } | ||||
| type beats_seccomp = { | ||||
| 'default_action' : choice('errno', 'trace', 'trap', 'kill_thread', 'kill_process', 'log', 'allow') | ||||
| }; | ||||
| @documenation{ | ||||
| Shared components for each beats service | ||||
| } | ||||
|
|
@@ -163,24 +171,96 @@ type beats_service = { | |||
| 'topology_expire' ? long(0..) | ||||
| 'geoip' ? beats_shipper_geoip | ||||
| 'seccomp.enabled' ? boolean | ||||
| 'seccomp' ? beats_seccomp | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Handle logmessages spread over multiple lines | ||||
| } | ||||
| type beats_filebeat_input_multiline = { | ||||
| 'pattern' ? string_trimmed | ||||
| 'pattern' ? string #string type to consider for potential whitespaced pattern | ||||
| 'negate' ? boolean | ||||
| 'match' ? choice('after', 'before') | ||||
| 'max_lines' ? long(0..) | ||||
| 'timeout' ? long(0..) | ||||
| 'max_lines' ? long(0..) | ||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is now a duplicated property (see two lines above)
Suggested change
|
||||
| 'close_inactive' ? string_trimmed | ||||
| 'close_eof' ? boolean | ||||
| }; | ||||
| @documentation{ | ||||
| Handle logs from Docker containers | ||||
| } | ||||
| type beats_filebeat_input_docker_containers = { | ||||
| 'ids' ? string | ||||
| 'path' ? string | ||||
| 'stream' ? string with match(SELF, '^(all|stdout|stderr)$') | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Handle logs processors pipeline for dissect processors | ||||
| } | ||||
| type beats_filebeat_input_processors_dissect = { | ||||
| 'tokenizer' ? string | ||||
| 'field' ? string | ||||
| 'target_prefix' ? string | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Handle logs processors pipeline for decode_json_fields processors | ||||
| } | ||||
| type beats_filebeat_input_processors_decode_json_fields = { | ||||
| 'fields' ? string[] | ||||
| 'process_array' ? boolean | ||||
| 'max_depth' ? long(0..) | ||||
| 'target' ? string | ||||
| 'overwrite_keys' ? boolean | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Handle target fields for logs processors pipeline of convert processors | ||||
| } | ||||
| type beats_filebeat_input_processors_convert_fields = { | ||||
| 'from' ? string | ||||
| 'to' ? string | ||||
| 'type' ? choice( | ||||
| 'integer', | ||||
| 'long', | ||||
| 'float', | ||||
| 'double', | ||||
| 'string', | ||||
| 'boolean', | ||||
| 'ip' | ||||
| ) | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Handle logs processors pipeline for convert processors | ||||
| } | ||||
| type beats_filebeat_input_processors_convert = { | ||||
| 'fields' ? beats_filebeat_input_processors_convert_fields[] | ||||
| 'ignore_missing' ? boolean | ||||
| 'fail_on_error' ? boolean | ||||
| 'tag' ? string | ||||
| 'mode' ? choice( | ||||
| 'copy', | ||||
| 'rename' | ||||
| ) | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Handle logs processors pipeline | ||||
| } | ||||
| type beats_filebeat_input_processors = { | ||||
| 'dissect' ? beats_filebeat_input_processors_dissect | ||||
| 'decode_json_fields' ? beats_filebeat_input_processors_decode_json_fields | ||||
| 'convert' ? beats_filebeat_input_processors_convert | ||||
| }; | ||||
| @documentation{ | ||||
| Configure a input (source of certain class of data, can come multiple paths) | ||||
| } | ||||
| type beats_filebeat_input = { | ||||
| 'paths' ? absolute_file_path[] | ||||
| 'containers' ? beats_filebeat_input_docker_containers | ||||
| 'encoding' ? choice( | ||||
| 'big5', | ||||
| 'euc-jp', | ||||
|
|
@@ -196,7 +276,7 @@ type beats_filebeat_input = { | |||
| 'utf-16le', | ||||
| 'utf-8' | ||||
| ) | ||||
| 'type' ? choice('log', 'stdin') | ||||
| 'type' ? choice('log', 'stdin', 'docker') | ||||
| 'exclude_lines' ? string_trimmed[] | ||||
| 'include_lines' ? string_trimmed[] | ||||
| 'exclude_files' ? absolute_file_path[] | ||||
|
|
@@ -212,16 +292,23 @@ type beats_filebeat_input = { | |||
| 'max_backoff' ? long(0..) | ||||
| 'backoff_factor' ? long(0..) | ||||
| 'enabled' ? boolean | ||||
| 'processors' ? beats_filebeat_input_processors[] | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Filebeat registry path configuration | ||||
| } | ||||
| type beats_filebeat_filebeat_registry = { | ||||
| 'path' : absolute_file_path | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
| Filebeat configuration | ||||
| } | ||||
| type beats_filebeat_filebeat = { | ||||
| 'inputs' : beats_filebeat_input[] | ||||
| 'prospectors' : beats_filebeat_input[] | ||||
| 'registry_file' ? absolute_file_path | ||||
| 'config_dir' ? absolute_file_path | ||||
| 'registry' ? beats_filebeat_filebeat_registry | ||||
| }; | ||||
|
|
||||
| @documentation{ | ||||
|
|
||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.