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

Fix SSLconfig in input.yml for Filebeat httpjson input in the MISP module #14767

Merged
merged 6 commits into from
Dec 10, 2019
Merged

Fix SSLconfig in input.yml for Filebeat httpjson input in the MISP module #14767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0405a92
Add ssl config to input.yml for Filebeat httpjson input in the MISP m…
Nov 25, 2019
08eb0f0
Update CHANGELOG.next.asciidoc
Nov 25, 2019
a1edff1
Merge branch 'master' into misp_ssl_input_yaml
Nov 26, 2019
a97e5b5
Add default ssl config in manifest.yml
Dec 5, 2019
049249e
Merge branch 'master' of github.com:elastic/beats into misp_ssl_input…
Dec 5, 2019
a61f1a4
Merge branch 'misp_ssl_input_yaml' of github.com:alakahakai/beats int…
Dec 5, 2019
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.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix filebeat azure dashboards, event category should be `Alert`. {pull}14668[14668]
- Update Logstash module's Grok patterns to support Logstash 7.4 logs. {pull}14743[14743]
- Fix a problem in Filebeat input httpjson where interval is not used as time.Duration. {issue}14752[14752] {pull}14753[14753]
- Fix SSL config in input.yml for Filebeat httpjson input in the MISP module. {pull}14767[14767]

*Heartbeat*

Expand Down
1 change: 1 addition & 0 deletions x-pack/filebeat/module/misp/threat/config/input.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interval: {{ .interval }}
json_objects_array: {{ .json_objects_array }}
pagination: {{ .pagination }}
url: {{ .url }}
ssl: {{ .ssl }}

{{ else if eq .input "file" }}

Expand Down
3 changes: 3 additions & 0 deletions x-pack/filebeat/module/misp/threat/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ var:
}
- name: url
default: ""
- name: ssl
default: |-
{}

input: config/input.yml
ingest_pipeline: ingest/pipeline.json
Expand Down