Compare commits

..

71 Commits

Author SHA1 Message Date
pengln 250958670c Merge pull request '增加uc01vn项目的filebeat采集处理器' (#71) from pengln/filebeat:master into master
Reviewed-on: https://app-jms.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/71
2022-06-01 09:19:18 +08:00
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 01f4a45153 Merge pull request '修订模板名称和模板模式不一致的问题' (#69) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/69
2022-02-18 14:19:58 +08:00
pengln a4abffb2ea Merge pull request '修复elastic_delays_metric_enabled属性始终渲染为False的问题' (#68) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/68
2022-02-15 17:52:19 +08:00
pengln c565b687ff Merge pull request '修复elastic_delays_metric_enabled属性始终渲染为False的问题' (#67) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/67
2022-02-15 17:31:22 +08:00
pengln a224f93817 Merge pull request '默认filebaet_ilm_enabled=yes' (#66) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/66
2022-02-15 16:06:22 +08:00
pengln d876fd6a9b Merge pull request '紧急修复配置模板文件语法错误' (#65) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/65
2022-02-15 15:55:20 +08:00
pengln b3bfcfb2af 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
2022-02-15 15:52:21 +08:00
pengln 478a76ad2d Merge pull request '# 关闭掉Filebeat本身的metrics日志输出' (#63) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/63
2022-02-15 14:09:26 +08:00
pengln 465bf8f349 Merge pull request '[#1002039] Nginx日志采集过滤Countly日志文件' (#62) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/62
2022-02-15 11:22:24 +08:00
pengln 3cc0f5f74d Merge pull request '#[1002041] 只给quick日志和gw日志开启elastic_delays检查' (#61) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/61
2022-02-15 11:13:56 +08:00
pengln ca65eed0d1 Merge pull request '[#1002043] 通过强制filebeat注册ilm策略方式,修订意外丢失的ilm策略' (#60) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/60
2022-02-15 10:19:21 +08:00
pengln 061963154a Merge pull request '[#1002040] 合并Nginx日志的索引以项目和日期命名' (#59) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/59
2022-02-15 09:37:53 +08:00
pengln b9eb52ca82 Merge pull request '更新filebeat_monitor版本1636654cf7' (#58) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/58
2022-01-04 13:39:03 +08:00
pengln 6133934b31 Merge pull request '修复 multiline 属性不存在的bug' (#57) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/57
2021-12-29 18:12:58 +08:00
pengln e1071bc98f Merge pull request '修复 filebeat 多行日志推送Grok失败的问题' (#56) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/56
2021-12-29 18:09:59 +08:00
pengln 5c6ad53062 Merge pull request '更新 filebeat monitor 到版本 v0.3 dff5318323' (#55) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/55
2021-12-24 10:42:26 +08:00
pengln 085cfe0e51 Merge pull request '更新 filebeat monitor 到版本 v0.3 7456f46579' (#54) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/54
2021-12-23 16:11:34 +08:00
pengln 444b9f2430 Merge pull request '更新 filebeat_monitor 版本到 v0.3 8415ecc662' (#53) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/53
2021-12-23 15:04:02 +08:00
pengln 055aafb961 Merge pull request '更新 filebeat 版本到 v0.3 afe5de7e20' (#52) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/52
2021-12-23 13:31:21 +08:00
pengln 2175d33631 Merge pull request '修复 queue.mem 和 flush.min_events 冲突的bug' (#51) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/51
2021-12-23 10:24:44 +08:00
pengln 417012b35a Merge pull request '调整默认资源限制' (#50) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/50
2021-12-23 10:17:58 +08:00
pengln 2ad4d4d270 Merge pull request '更新 filebeat monitor' (#49) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/49
2021-12-23 08:39:45 +08:00
pengln 7f666b82c7 Merge pull request '修订 logging.json 为 false' (#48) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/48
2021-12-22 17:19:48 +08:00
pengln b423ae6efa Merge pull request '修订template_pattern默认值' (#47) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/47
2021-12-22 16:25:36 +08:00
pengln 5427c0fdef Merge pull request '修订配置参数不生效的bug' (#46) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/46
2021-12-22 15:52:27 +08:00
pengln 9613b9eb3a Merge pull request '更新 filebeat_monitor 版本到 v0.3 86b04c0c52' (#45) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/45
2021-12-22 15:28:19 +08:00
pengln f8b8f01d3b Merge pull request '增加instanceName为主机名' (#44) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/44
2021-12-22 15:12:43 +08:00
pengln 877e7b2a3f Merge pull request '增加 elastic_delays_metric_enabled 开关' (#43) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/43
2021-12-22 14:53:21 +08:00
pengln cf5d120d36 Merge pull request '更新filebeat monitor到版本 v0.3 b1212a1e2a' (#42) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/42
2021-12-21 16:47:34 +08:00
pengln 8de9b81bee Merge pull request '修订sublog默认值的bug' (#41) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/41
2021-12-21 16:33:55 +08:00
pengln 8361cc7450 Merge pull request '修订filebeat_monitor的启动参数' (#40) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/40
2021-12-21 16:28:13 +08:00
pengln ecde47fd8e Merge pull request '更新 filebeat monitor 到 v0.3 740a7fbe5f' (#39) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/39
2021-12-21 15:10:35 +08:00
pengln 0311229869 Merge pull request '更新 curl 版本为 7.80.0' (#38) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/38
2021-12-10 17:25:20 +08:00
pengln 1a43040553 Merge pull request '修复manager采集默认索引前缀的错误' (#37) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/37
2021-12-09 09:22:02 +08:00
pengln 9ca41764bf Merge pull request '修复排除项判断错误导致无法启动filebeat的问题' (#36) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/36
2021-12-07 17:34:19 +08:00
pengln 3aa63c5768 Merge pull request '增加排除文件的配置项' (#35) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/35
2021-12-07 17:31:38 +08:00
pengln a82bbe7f5a Merge pull request '从本地部署新版CURL工具' (#34) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/34
2021-12-07 16:49:03 +08:00
pengln 172db31fd1 Merge pull request '将日志调整为json格式,便于针对日志进行监控' (#33) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/33
2021-12-07 16:43:29 +08:00
pengln b25af69671 Merge pull request '增加最新版本的curl工具' (#32) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/32
2021-12-07 11:46:26 +08:00
pengln 3d3084dcbe Merge pull request '修复 pipeline 变量引用错误的bug' (#31) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/31
2021-12-07 10:14:52 +08:00
pengln 3d967ead59 Merge pull request '更新 filebeat_monitor 版本到 0.2 [e22401bdad18c513]' (#30) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/30
2021-12-06 18:23:08 +08:00
pengln e987937ee0 Merge pull request '更新 filebeat_monitor 版本到 0.2 [1f1d2fc6127f3df4]' (#29) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/29
2021-12-06 18:15:30 +08:00
pengln 89be8e1a0f Merge pull request '更新 filebeat_monitor 版本到 0.2 [d2f0ae164986967a]' (#28) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/28
2021-12-06 18:07:58 +08:00
pengln f776ffc3a2 Merge pull request '修复Check Filebeat Service Running Status命令找不到的问题' (#27) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/27
2021-12-06 17:46:35 +08:00
pengln 492f3c0066 Merge pull request '修复配置文件Jinja2格式错误的问题' (#26) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/26
2021-12-06 16:50:04 +08:00
pengln 767d454c72 Merge pull request '修复monitor丢失用户名和密码配置的问题' (#25) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/25
2021-12-06 16:41:46 +08:00
pengln bcd35eb339 Merge pull request '将filebeat_monitor版本更新到 0.2 [9453d07c82]' (#24) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/24
2021-12-06 15:50:54 +08:00
pengln 3f7cad82fc Merge pull request '#1001742 Filebeat Ansible脚本优化' (#23) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/23
2021-12-06 11:16:53 +08:00
pengln 30ac005569 Merge pull request 'master' (#22) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/22
2021-12-06 09:33:01 +08:00
pengln 47aa29e097 Merge pull request '#1001686 role变量改为defaults' (#21) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/21
2021-11-18 15:30:17 +08:00
pengln 5ad8b391e3 Merge pull request '#1001686 quick日志的特殊性必须从文件头采集日志' (#20) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/20
2021-11-18 14:51:10 +08:00
pengln 81b7afea63 Merge pull request 'master' (#19) from pengln/filebeat:master into master
Reviewed-on: https://app.huanyuantech.com:10301/gitea/ansible-collection/filebeat/pulls/19
2021-11-18 14:29:58 +08:00
pengln 44757720a6 Merge pull request '增加推送ES时的压缩级别设置,默认0不压缩' (#18) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/18
2021-11-16 11:26:09 +08:00
pengln 4cd81cd33d Merge pull request '修复日志路径错误的问题' (#17) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/17
2021-11-16 10:43:46 +08:00
pengln 0ee0082008 Merge pull request '修复路径名导致索引名失败的问题' (#16) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/16
2021-11-16 10:23:35 +08:00
pengln 4bc683c26c Merge pull request 'master' (#15) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/15
2021-11-15 19:21:06 +08:00
pengln cf78b2034b Merge pull request '#1001590 增加针对业务应用日志的采集' (#14) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/14
2021-11-09 16:06:12 +08:00
pengln 254874af51 Merge pull request '#1001590 增加针对业务应用日志的采集' (#13) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/13
2021-11-09 15:17:36 +08:00
pengln 6c0ead6c5a Merge pull request '#1001590 增加针对业务应用日志的采集' (#12) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/12
2021-11-09 14:50:13 +08:00
pengln 313315f4ef Merge pull request '#1001590 增加针对业务应用日志的采集' (#11) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/11
2021-11-09 14:35:19 +08:00
pengln 9e723cbef6 Merge pull request '#1001590 增加针对业务应用日志的采集' (#10) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/10
2021-11-09 14:32:09 +08:00
pengln 62997175e6 Merge pull request '#1001590 增加针对业务应用日志的采集' (#9) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/9
2021-11-09 12:42:39 +08:00
pengln 913e2dd9d0 Merge pull request '#1001590 增加针对业务应用日志的采集' (#8) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/8
2021-11-09 11:45:21 +08:00
pengln 541ee16b5e Merge pull request '#1001590 增加针对业务应用日志的采集' (#7) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/7
2021-11-09 11:30:15 +08:00
pengln 90cc4a5722 Merge pull request '#1001590 增加针对业务应用日志的采集' (#6) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/6
2021-11-09 11:25:42 +08:00
pengln 8c9da16cca Merge pull request '#1001590 增加针对业务应用日志的采集' (#5) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/5
2021-11-09 11:15:01 +08:00
pengln 0decac47c9 Merge pull request '#1001590 增加针对业务应用日志的采集' (#4) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/4
2021-11-09 11:12:26 +08:00
pengln 80ce44f981 Merge pull request '#1001565 针对nginx日志采集' (#3) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/3
2021-11-08 19:31:46 +08:00
pengln e6c0cc02a3 Merge pull request '#1001565 针对nginx日志采集' (#2) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/2
2021-11-08 18:13:26 +08:00
pengln a1bab06126 Merge pull request '#1001565 针对nginx日志采集' (#1) from pengln/filebeat:master into master
Reviewed-on: https://app.amonstack.com:10301/gitea/ansible-collection/filebeat/pulls/1
2021-11-08 18:09:13 +08:00

Diff Content Not Available