Skip to content

Skip certificate management if none given #14

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

Merged
gravyboat merged 1 commit into from
Sep 2, 2016
Merged

Skip certificate management if none given #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions filebeat/config.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{% from "filebeat/map.jinja" import conf with context %}

{% if salt['pillar.get']('filebeat:logstash:tls:enabled', False) %}
{{ salt['pillar.get']('filebeat:logstash:tls:ssl_cert_path', '/etc/pki/tls/certs/logstash-forwarder.crt') }}:
{% set ssl_cert = salt['pillar.get']('filebeat:logstash:tls:ssl_cert', 'salt://filebeat/files/ca.pem') %}
{% set ssl_cert_path = salt['pillar.get']('filebeat:logstash:tls:ssl_cert_path') %}
{% if salt['pillar.get']('filebeat:logstash:tls:enabled', False) and ssl_cert and ssl_cert_path %}
{{ ssl_cert_path }}:
file.managed:
- source: {{ salt['pillar.get']('filebeat:logstash:tls:ssl_cert', 'salt://filebeat/files/ca.pem') }}
- source: {{ ssl_cert }}
- template: jinja
- makedirs: True
- user: root
Expand Down
2 changes: 2 additions & 0 deletions filebeat/files/filebeat.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ output:
{%- if 'tls' in logstash %}
{%- if logstash.tls.get('enabled', False) %}
tls:
{%- if logstash.tls.get('ssl_cert_path') %}
certificate_authorities: ["{{ logstash.tls.ssl_cert_path }}"]
{%- endif %}
{%- endif %}
{%- endif %}
{%- endif %}

shipper:

Expand Down
9 changes: 6 additions & 3 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ filebeat:

tls:
enabled: True
# this is the public key from your ELK server
# default path is salt://filebeat/files/ca.pem
ssl_cert: salt://mycustom/filebeat/logstash-forwarder.crt
# path to the certificate of your ELK server
# set to empty to use system certificates
ssl_cert_path: /etc/pki/tls/certs/logstash-forwarder.crt
# path to the certificate of your ELK server to be installed
# default is salt://filebeat/files/ca.pem
# set to empty to disable
ssl_cert: salt://mycustom/filebeat/logstash-forwarder.crt