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.

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

filebeat: add SSL options to checkpoint module #19560

Merged
merged 15 commits into from
Oct 19, 2020
Merged
16 changes: 16 additions & 0 deletions x-pack/filebeat/module/checkpoint/firewall/config/firewall.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
type: syslog
protocol.udp:
host: "{{.syslog_host}}:{{.syslog_port}}"
{{ if ne .pipeline "" }}
hazcod marked this conversation as resolved.
Show resolved Hide resolved
pipeline: "{{.pipeline}}"
{{ end }}

{{ else if eq .input "tls" }}
type: tcp
host: "{{.syslog_host}}:{{.syslog_port}}"
ssl:
enabled: true
certificate_authorities: ["{{.cafile}}"]
certificate: "{{.certfile}}"
key: "{{.keyfile}}"
client_authentication: "required"
{{ if ne .pipeline "" }}
pipeline: "{{.pipeline}}"
{{ end }}

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

Expand Down
10 changes: 10 additions & 0 deletions x-pack/filebeat/module/checkpoint/firewall/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ var:
default: 9001
- name: input
default: syslog
- name: log_level
hazcod marked this conversation as resolved.
Show resolved Hide resolved
default: 7
- name: certfile
hazcod marked this conversation as resolved.
Show resolved Hide resolved
default: ""
- name: keyfile
default: ""
- name: cafile
default: ""
- name: pipeline
default: ""

ingest_pipeline:
- ingest/pipeline.yml
Expand Down
3 changes: 1 addition & 2 deletions x-pack/filebeat/tests/system/test_http_endpoint.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from filebeat import BaseTest
hazcod marked this conversation as resolved.
Show resolved Hide resolved
import jinja2
import requests
import sys
Expand All @@ -7,8 +8,6 @@

sys.path.append(os.path.join(os.path.dirname(__file__), '../../../../filebeat/tests/system'))

from filebeat import BaseTest


class Test(BaseTest):
"""
Expand Down
3 changes: 1 addition & 2 deletions x-pack/filebeat/tests/system/test_xpack_modules.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import test_modules
import os
import sys

sys.path.append(os.path.join(os.path.dirname(__file__), '../../../../filebeat/tests/system'))

import test_modules


class XPackTest(test_modules.Test):

Expand Down