openstack/openstack-ansible-ops
Code Issues Proposed changes

Merge "Exposed beat logging levels"

Browse Source
This commit is contained in:
Zuul 2020-02-21 17:18:41 +00:00 committed by Gerrit Code Review
commit 58857f1ce6
13 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elk_metrics_7x/roles/elastic_auditbeat/defaults/main.yml
View File

@ -28,3 +28,7 @@ ilm_policy_file_location: "{{ (auditbeat_ilm_policy_file_location | default(defa
# beat processors. Empty dictionary sets `add_host_metadata: ~`
processors: {}
# Logging level
# Available log levels are error, warning, info, debug
auditbeat_log_level: "{{ elastic_beat_log_level | default('info') }}"

2
elk_metrics_7x/roles/elastic_auditbeat/templates/auditbeat.yml.j2
View File

@ -842,7 +842,7 @@ setup.ilm.policy_file: "{{ ilm_policy_file_location }}/{{ ilm_policy_filename }}
{% endif %}
#================================ Logging ======================================
{{ elk_macros.beat_logging('auditbeat') }}
{{ elk_macros.beat_logging('auditbeat', auditbeat_log_level) }}
#============================== Xpack Monitoring =====================================
{{ elk_macros.xpack_monitoring_elasticsearch(inventory_hostname, elasticsearch_data_hosts, ansible_processor_count) }}

4
elk_metrics_7x/roles/elastic_filebeat/defaults/main.yml
View File

@ -296,3 +296,7 @@ ilm_policy_file_location: "{{ (filebeat_ilm_policy_file_location | default(defau
# beat processors. Empty dictionary sets `add_host_metadata: ~`
processors: {}
# Logging level
# Available log levels are error, warning, info, debug
filebeat_log_level: "{{ elastic_beat_log_level | default('info') }}"

2
elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2
View File

@ -1381,7 +1381,7 @@ setup.ilm.policy_file: "{{ ilm_policy_file_location }}/{{ ilm_policy_filename }}
{{ elk_macros.setup_kibana(hostvars[groups['kibana'][0]]['ansible_host'] ~ ':' ~ kibana_port) }}
{% endif %}
#================================ Logging ======================================
{{ elk_macros.beat_logging('filebeat') }}
{{ elk_macros.beat_logging('filebeat', filebeat_log_level) }}
#============================== Xpack Monitoring =====================================
{{ elk_macros.xpack_monitoring_elasticsearch(inventory_hostname, elasticsearch_data_hosts, ansible_processor_count) }}

4
elk_metrics_7x/roles/elastic_heartbeat/defaults/main.yml
View File

@ -28,3 +28,7 @@ ilm_policy_file_location: "{{ (heartbeat_ilm_policy_file_location | default(defa
# beat processors. Empty dictionary sets `add_host_metadata: ~`
processors: {}
# Logging level
# Available log levels are error, warning, info, debug
heartbeat_log_level: "{{ elastic_beat_log_level | default('info') }}"

2
elk_metrics_7x/roles/elastic_heartbeat/templates/heartbeat.yml.j2
View File

@ -1024,7 +1024,7 @@ setup.ilm.policy_file: "{{ ilm_policy_file_location }}/{{ ilm_policy_filename }}
{% endif %}
#================================ Logging ======================================
{{ elk_macros.beat_logging('heartbeat') }}
{{ elk_macros.beat_logging('heartbeat', heartbeat_log_level) }}
#============================== Xpack Monitoring =====================================
{{ elk_macros.xpack_monitoring_elasticsearch(inventory_hostname, elasticsearch_data_hosts, ansible_processor_count) }}

4
elk_metrics_7x/roles/elastic_journalbeat/defaults/main.yml
View File

@ -28,3 +28,7 @@ ilm_policy_file_location: "{{ (journalbeat_ilm_policy_file_location | default(de
# beat processors. Empty dictionary sets `add_host_metadata: ~`
processors: {}
# Logging level
# Available log levels are error, warning, info, debug
journalbeat_log_level: "{{ elastic_beat_log_level | default('info') }}"

2
elk_metrics_7x/roles/elastic_journalbeat/templates/journalbeat.yml.j2
View File

@ -780,7 +780,7 @@ setup.ilm.policy_file: "{{ ilm_policy_file_location }}/{{ ilm_policy_filename }}
{% endif %}
#================================ Logging ======================================
{{ elk_macros.beat_logging('journalbeat') }}
{{ elk_macros.beat_logging('journalbeat', journalbeat_log_level) }}
#============================== Xpack Monitoring =====================================
{{ elk_macros.xpack_monitoring_elasticsearch(inventory_hostname, elasticsearch_data_hosts, ansible_processor_count) }}

4
elk_metrics_7x/roles/elastic_metricbeat/defaults/main.yml
View File

@ -39,3 +39,7 @@ ilm_policy_file_location: "{{ (metricbeat_ilm_policy_file_location | default(def
# beat processors. Empty dictionary sets `add_host_metadata: ~`
processors: {}
# Logging level
# Available log levels are error, warning, info, debug
metricbeat_log_level: "{{ elastic_beat_log_level | default('info') }}"

2
elk_metrics_7x/roles/elastic_metricbeat/templates/metricbeat.yml.j2
View File

@ -1504,7 +1504,7 @@ setup.ilm.policy_file: "{{ ilm_policy_file_location }}/{{ ilm_policy_filename }}
{% endif %}
#================================ Logging ======================================
{{ elk_macros.beat_logging('metricbeat') }}
{{ elk_macros.beat_logging('metricbeat', metricbeat_log_level) }}
#============================== Xpack Monitoring =====================================
{{ elk_macros.xpack_monitoring_elasticsearch(inventory_hostname, elasticsearch_data_hosts, ansible_processor_count) }}

5
elk_metrics_7x/roles/elastic_packetbeat/defaults/main.yml
View File

@ -29,5 +29,10 @@ ilm_policy_file_location: "{{ (packetbeat_ilm_policy_file_location | default(def
# beat processors. Empty dictionary sets `add_host_metadata: ~`
processors: {}
# optional list of ports to ignore
packetbeat_ignored_ports: []
# Logging level
# Available log levels are error, warning, info, debug
packetbeat_log_level: "{{ elastic_beat_log_level | default('info') }}"

2
elk_metrics_7x/roles/elastic_packetbeat/templates/packetbeat.yml.j2
View File

@ -1216,7 +1216,7 @@ setup.ilm.policy_file: "{{ ilm_policy_file_location }}/{{ ilm_policy_filename }}
{% endif %}
#================================ Logging ======================================
{{ elk_macros.beat_logging('packetbeat') }}
{{ elk_macros.beat_logging('packetbeat', packetbeat_log_level) }}
#============================== Xpack Monitoring =====================================
{{ elk_macros.xpack_monitoring_elasticsearch(inventory_hostname, elasticsearch_data_hosts, ansible_processor_count) }}

4
elk_metrics_7x/templates/_macros.j2
View File

@ -360,13 +360,13 @@ setup.kibana:
#ssl.curve_types: []
{%- endmacro %}
{% macro beat_logging(beat_name) -%}
{% macro beat_logging(beat_name, log_level='info') -%}
# There are four options for the log output: file, stderr, syslog, eventlog
# The file output is the default.
# Sets log level. The default log level is info.
# Available log levels are: error, warning, info, debug
#logging.level: info
logging.level: {{ log_level }}
# Enable debug output for selected components. To enable all selectors use ["*"]
# Other available selectors are "beat", "publish", "service"