Commit Graph

118 Commits

Author SHA1 Message Date
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 156f4012e3 修复 filebeat 多行日志推送Grok失败的问题 2021-12-29 18:09:04 +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 f0fefd5cad 更新 filebeat monitor 到版本 v0.3 dff5318323 2021-12-24 10:40:49 +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 2a77de9455 更新 filebeat monitor 到版本 v0.3 7456f46579 2021-12-23 16:11:00 +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 900540df86 更新 filebeat_monitor 版本到 v0.3 8415ecc662 2021-12-23 15:03:29 +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 7697daa4c4 更新 filebeat 版本到 v0.3 afe5de7e20 2021-12-23 13:30:44 +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 d8f60f18c0 修复 queue.mem 和 flush.min_events 冲突的bug 2021-12-23 10:24:13 +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 d75cf5f4a6 调整默认资源限制 2021-12-23 10:17:18 +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 3851a1d532 更新 filebeat monitor 2021-12-23 08:38:43 +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 e87ca97eef 修订 logging.json 为 false 2021-12-22 17:18:53 +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 9724240311 修订template_pattern默认值 2021-12-22 16:25:01 +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 f957954d68 修订配置参数不生效的bug 2021-12-22 15:51:16 +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 d8cff95097 更新 filebeat_monitor 版本到 v0.3 86b04c0c52 2021-12-22 15:27:41 +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 360c5087af 增加instanceName为主机名 2021-12-22 15:11:49 +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 69e671eaab 增加 elastic_delays_metric_enabled 配置开关 2021-12-22 14:51:34 +08:00
pengln d5149bba48 更新 filebeat monitor 到 v0.3 49005da52d 2021-12-22 09:43:59 +08:00
pengln 5b18d66375 增加同步渲染monitor脚本的逻辑 2021-12-22 09:13:01 +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 2b00681464 更新filebeat monitor到版本 v0.3 b1212a1e2a 2021-12-21 16:46:59 +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 5e884c9e31 修订sublog默认值的bug 2021-12-21 16:33:25 +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 2f068f2081 修订filebeat_monitor的启动参数 2021-12-21 16:27:28 +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 446b05748f 更新 filebeat monitor 到 v0.3 740a7fbe5f 2021-12-21 15:09:13 +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 e7f5d23739 更新 curl 版本为 7.80.0
安装目标改为curl-7.80.0 避免和旧版本冲突
2021-12-10 17:24:18 +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 9364d4a119 修复manager采集默认索引前缀的错误 2021-12-09 09:21:20 +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 d7db5cc45c 修复排除项判断错误导致无法启动filebeat的问题 2021-12-07 17:33:47 +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 8a9799148c 增加排除文件的配置项
增加默认排除gateway日志的*_81.log日志
2021-12-07 17:31:02 +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 9a3ea92cb6 从本地部署新版CURL工具 2021-12-07 16:48:34 +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 aa22795f04 将日志调整为json格式,便于针对日志进行监控 2021-12-07 16:42:57 +08:00