Skip to content

Fix YAML/Jinja2 syntax #243

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
merged 7 commits into from
Aug 23, 2023
Merged

Fix YAML/Jinja2 syntax #243

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62b68b1
Fix YAML/Jinja2 syntax. Simple as that
widhalmt Aug 23, 2023
e18849d
Try with more elasticsearch heap
widhalmt Aug 23, 2023
a5c88d4
Fixed syntax for syntax check
widhalmt Aug 23, 2023
0819935
Quick workaround for jvm.options
widhalmt Aug 23, 2023
b5f67fa
Disable warnings in linter
widhalmt Aug 23, 2023
c197e22
Apply Jinja suggestions from linter
widhalmt Aug 23, 2023
7a865de
Disable change for apt refresh
widhalmt Aug 23, 2023
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
2 changes: 1 addition & 1 deletion molecule/elasticstack_default/converge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
elasticsearch_jna_workaround: true
elasticsearch_disable_systemcallfilterchecks: true
elasticstack_release: "{{ lookup('env', 'ELASTIC_RELEASE') | int}}"
elasticsearch_heap: "1"
elasticsearch_heap: "2"
elasticstack_full_stack: true
logstash_pipeline_unsafe_shutdown: true
beats_filebeat_syslog_udp: true
Expand Down
24 changes: 12 additions & 12 deletions roles/logstash/templates/pipelines.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
# Default beat input #
# Autoconfigured Redis outputs: input

- pipeline
- pipeline:
id: ansible-input
unsafe_shutdown: {{ ansible_input_unsafe_shutdown | default({{ logstash_pipeline_unsafe_shutdown }}) }}
path
unsafe_shutdown: {{ ansible_input_unsafe_shutdown | default( logstash_pipeline_unsafe_shutdown ) }}
path:
config: "/etc/logstash/conf.d/ansible-input/*.conf"
queue
queue:
type: {{ logstash_input_queue_type }}
max_bytes: {{ logstash_input_queue_max_bytes }}

Expand All @@ -34,12 +34,12 @@
# Default elasticsearch output #
# Autoconfigured Redis input: forwarder

- pipeline
- pipeline:
id: ansible-forwarder
unsafe_shutdown: {{ ansible_forwarder_unsafe_shutdown | default({{ logstash_pipeline_unsafe_shutdown }}) }}
path
unsafe_shutdown: {{ ansible_forwarder_unsafe_shutdown | default( logstash_pipeline_unsafe_shutdown ) }}
path:
config: "/etc/logstash/conf.d/ansible-forwarder/*.conf"
queue
queue:
type: {{ logstash_forwarder_queue_type }}
max_bytes: {{ logstash_forwarder_queue_max_bytes }}

Expand Down Expand Up @@ -72,12 +72,12 @@

{% endif %}

- pipeline
- pipeline:
id: {{ item.name }}
unsafe_shutdown: {{ item.unsafe_shutdown | default({{ logstash_pipeline_unsafe_shutdown }}) }}
path
unsafe_shutdown: {{ item.unsafe_shutdown | default( logstash_pipeline_unsafe_shutdown ) }}
path:
config: "/etc/logstash/conf.d/{{ item.name }}/*.conf"
queue
queue:
type: {{ item.queue_type | default('memory') }}
max_bytes: {{ item.queue_max_bytes | default('1gb') }}

Expand Down