Merge pull request '如果filebaet_ilm_enabled被设置为false则禁止ilm,这是为了兼容华为云的ES' (#64) from pengln/filebeat:master into master

Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/64
This commit is contained in:
pengln 2022-02-15 15:52:21 +08:00
commit b3bfcfb2af
2 changed files with 5 additions and 4 deletions

View File

@ -30,7 +30,7 @@ filebeat_logs:
filebeat_older_dir: "/data/opt/filebeat/{{ instance_name }}" filebeat_older_dir: "/data/opt/filebeat/{{ instance_name }}"
filebeat_older_data_dir: data filebeat_older_data_dir: data
#[1002041] 只给quick日志和gw日志开启elastic_delays检查 #[1002041] 只给quick日志和gw日志开启elastic_delays检查
elastic_delays_metric_enabled: True elastic_delays_metric_enabled: yes
manager: manager:
paths: paths:
- "/data/game/htdocs/center/manager/storage/cp/logs/*.log" - "/data/game/htdocs/center/manager/storage/cp/logs/*.log"
@ -58,4 +58,4 @@ filebeat_logs:
filebeat_older_dir: "/data/opt/filebeat/quick" filebeat_older_dir: "/data/opt/filebeat/quick"
filebeat_older_data_dir: data filebeat_older_data_dir: data
#[1002041] 只给quick日志和gw日志开启elastic_delays检查 #[1002041] 只给quick日志和gw日志开启elastic_delays检查
elastic_delays_metric_enabled: True elastic_delays_metric_enabled: yes

View File

@ -40,8 +40,9 @@ filebeat.config.modules:
reload.enabled: false reload.enabled: false
# ======================= Elasticsearch template setting ======================= # ======================= Elasticsearch template setting =======================
#[#1002043] 通过强制filebeat注册ilm策略方式修订意外丢失的ilm策略 #[#1002043] 通过强制filebeat注册ilm策略方式修订意外丢失的ilm策略。
setup.ilm.enabled: true #如果filebaet_ilm_enabled被设置为false则禁止ilm这是为了兼容华为云的ES
setup.ilm.enabled: {{ logs[log_type]['filebaet_ilm_enabled'] | default true }}
setup.ilm.policy_name: "{{ logs[log_type]['setup_ilm_policy_name'] | default('gw-nginx-ug10') }}" setup.ilm.policy_name: "{{ logs[log_type]['setup_ilm_policy_name'] | default('gw-nginx-ug10') }}"
setup.ilm.check_exists: true setup.ilm.check_exists: true