ansible-collection
/
filebeat
1
0
Fork 1
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: ansible-collection:01f4a45153b971ed00c22d36e9e54d38616ec255
Branches Tags
ansible-collection:master
ansible-collection:v0.1.1
..
compare: ansible-collection:26a4760a13e0756d0702883f61377e3d539edcda
Branches Tags
ansible-collection:master
ansible-collection:v0.1.1

2 Commits
01f4a45153 ... 26a4760a13

Author SHA1 Message Date
pengln 26a4760a13 Merge pull request '修订sublog判断不正确导致索引名称含有none的问题' (#70) from pengln/filebeat:master into master 
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/70
 2022-02-18 14:26:58 +08:00
pengln 2a086b7935 修订sublog判断不正确导致索引名称含有none的问题 2022-02-18 14:26:35 +08:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
playbooks/roles/filebeat/templates/filebeat.yml
View File

@ -62,11 +62,11 @@ setup.kibana:
{% if 'output' not in logs[log_type] or logs[log_type]['output'] == 'elastic' %} {% if 'output' not in logs[log_type] or logs[log_type]['output'] == 'elastic' %}
output.elasticsearch: output.elasticsearch:
hosts: {{ logs[log_type]['es_hosts'] }} hosts: {{ logs[log_type]['es_hosts'] }}
{% if 'sublog' in logs[log_type] and logs[log_type]['sublog'] -%}
index: "{{ logs[log_type]['index_prefix'] }}-{{ instance_name }}-{{ logs[log_type]['sublog'] }}-%{+yyyy.MM.dd}"
#[#1002040] 如果sublog字段配置为none则忽略索引名称中的sublog字段 #[#1002040] 如果sublog字段配置为none则忽略索引名称中的sublog字段
{% elif 'sublog' in logs[log_type] and logs[log_type]['sublog'] == 'none' -%} {% if 'sublog' in logs[log_type] and logs[log_type]['sublog'] == 'none' -%}
index: "{{ logs[log_type]['index_prefix'] }}-{{ instance_name }}-%{+yyyy.MM.dd}" index: "{{ logs[log_type]['index_prefix'] }}-{{ instance_name }}-%{+yyyy.MM.dd}"
{% elif 'sublog' in logs[log_type] and logs[log_type]['sublog'] -%}
index: "{{ logs[log_type]['index_prefix'] }}-{{ instance_name }}-{{ logs[log_type]['sublog'] }}-%{+yyyy.MM.dd}"
{% else -%} {% else -%}
index: "{{ logs[log_type]['index_prefix'] }}-{{ instance_name }}-%{[sublog]}-%{+yyyy.MM.dd}" index: "{{ logs[log_type]['index_prefix'] }}-{{ instance_name }}-%{[sublog]}-%{+yyyy.MM.dd}"
{% endif -%} {% endif -%}