Skip to content

Commit a9b0021

Browse files
Merge pull request #3880 from manticoresoftware/docs/test-pavels-changes
Testing the automatic translation of documentation after fixing
2 parents e5b6433 + d324e08 commit a9b0021

File tree

7 files changed

+3086
-3059
lines changed

7 files changed

+3086
-3059
lines changed

manual/chinese/Changelog.md

Lines changed: 1659 additions & 1663 deletions
Large diffs are not rendered by default.

manual/chinese/Integration/Filebeat.md

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
# 与 Filebeat 的集成
22

3-
> 注意:与 Filebeat 的集成需要 [Manticore Buddy](../Installation/Manticore_Buddy.md)如果无法正常工作,请确保已安装 Buddy。
3+
> 注意:与 Filebeat 的集成需要 [Manticore Buddy](../Installation/Manticore_Buddy.md)如果集成无法正常工作,请确保已安装 Buddy。
44
55
[Filebeat](https://www.elastic.co/beats/filebeat) 是一个轻量级的日志数据转发和集中器。安装为代理后,它会监控您指定的日志文件或位置,收集日志事件,并将其转发以进行索引,通常是发送到 Elasticsearch 或 Logstash。
66

7-
现在,Manticore 也支持将 Filebeat 用作处理管道。这允许收集和转换后的数据像发送到 Elasticsearch 一样发送到 Manticore。目前,所有版本到 9.0 都完全支持
7+
现在,Manticore 也支持将 Filebeat 用作处理管道。这允许将收集和转换后的数据发送到 Manticore,就像发送到 Elasticsearch 一样。目前,所有版本直到 9.0 均完全支持
88

99
## Filebeat 配置
1010

11-
配置因您使用的 Filebeat 版本而异。
11+
配置根据您使用的 Filebeat 版本而异。
1212

13-
### Filebeat 7.17 - 8.0 的配置
13+
### Filebeat 7.178.0、8.1 的配置
1414

15-
```
15+
> **重要提示**:Filebeat 版本 7.17.0、8.0.0 和 8.1.0 在使用 glibc 2.35+(如 Ubuntu 22.04 及更新发行版)时存在已知问题。这些版本可能会崩溃并显示“Fatal glibc error: rseq registration failed”。为解决此问题,请添加如下的 `seccomp` 配置。
16+
17+
```yaml
1618
filebeat.inputs:
1719
- type: log
1820
enabled: true
@@ -25,13 +27,24 @@ output.elasticsearch:
2527
hosts: ["http://localhost:9308"]
2628
index: "dpkg_log"
2729
compression_level: 0
30+
allow_older_versions: true # Required for 8.1
31+
32+
# Fix for glibc 2.35+ compatibility (Ubuntu 22.04+)
33+
seccomp:
34+
default_action: allow
35+
syscalls:
36+
- action: allow
37+
names:
38+
- rseq
2839

2940
setup.ilm.enabled: false
3041
setup.template.enabled: false
3142
setup.template.name: "dpkg_log"
3243
setup.template.pattern: "dpkg_log"
3344
```
3445
46+
**参考**:[Issue #30576](https://github.com/elastic/beats/issues/30576), [PR #30620](https://github.com/elastic/beats/pull/30620)
47+
3548
3649
### Filebeat 8.1 - 8.10 的配置
3750
@@ -60,7 +73,7 @@ setup.template.pattern: "dpkg_log"
6073
6174
### Filebeat 8.11 - 8.19 的配置
6275
63-
从 8.11 版本开始,默认启用了输出压缩,因此必须显式设置 `compression_level: 0` 以兼容 Manticore:
76+
从 8.11 版本起,输出压缩默认启用,因此必须显式设置 `compression_level: 0` 以保证与 Manticore 的兼容性
6477
6578
```
6679
filebeat.inputs:
@@ -85,9 +98,9 @@ setup.template.pattern: "dpkg_log"
8598
8699
### Filebeat 9.0+ 的配置
87100
88-
Filebeat 9.0 引入了重大架构变更,用 `filestream` 替代了 `log` 输入类型。从 9.0 版本开始,默认的文件识别方法也改为指纹识别,这要求文件至少为 1024 字节([参见 issue #44780](https://github.com/elastic/beats/issues/44780))。为了使 Manticore 兼容任意大小的文件,必须禁用指纹识别。
101+
Filebeat 9.0 引入了架构重大变更,使用 `filestream` 代替原先的 `log` 输入类型。从 9.0 版本开始,默认的文件识别方法也改为指纹识别,这要求文件大小至少为 1024 字节([参见 issue #44780](https://github.com/elastic/beats/issues/44780))。为了使 Manticore 能兼容任意大小的文件,必须禁用指纹识别。
89102
90-
以下是 Filebeat 9.0 及以后版本所需的配置
103+
以下是 Filebeat 9.0 及以后版本的必需配置
91104
92105
```
93106
filebeat.inputs:
@@ -112,13 +125,13 @@ setup.template.pattern: "dpkg_log"
112125
```
113126
114127
**Filebeat 9.0+ 的重要注意事项:**
115-
- `type: filestream` 输入替代了旧的 `type: log`
116-
- 必须设置 `prospector.scanner.fingerprint.enabled: false` 来禁用基于指纹的文件识别,确保可靠处理小于 1024 字节的文件
117-
- filestream 输入需要 `id` 字段,且必须唯一
128+
- `type: filestream` 输入取代了旧的 `type: log`
129+
- 必须设置 `prospector.scanner.fingerprint.enabled: false` 来禁用基于指纹的文件识别,确保能可靠处理小于 1024 字节的文件
130+
- filestream 输入需要 `id` 字段,且该字段必须唯一
118131
119132
## Filebeat 结果
120133
121-
一旦使用此配置运行 Filebeat,日志数据将发送到 Manticore 并正确索引。以下是 Manticore 创建的表的结果模式和插入文档的示例
134+
配置完成并运行 Filebeat 后,日志数据将被发送到 Manticore 并正确索引。下面是 Manticore 创建的表的结果 schema 以及插入文档的示例
122135
123136
```
124137
mysql> DESCRIBE dpkg_log;

manual/english/Changelog.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ No need for external services or complex pipelines: just insert text and search
5252

5353
If you follow the [official installation guide](https://manticoresearch.com/install/), you don't need to worry about this.
5454

55-
Recommended [MCL](https://github.com/manticoresoftware/columnar) version: 8.0.1
56-
Recommended [Buddy](Installation/Manticore_Buddy.md#Manticore-Buddy) version: 3.34.2
57-
5855
### New Features and Improvements
5956
* 🆕 [v13.11.0](https://github.com/manticoresoftware/manticoresearch/releases/tag/13.11.0) [ PR #3746](https://github.com/manticoresoftware/manticoresearch/pull/3746) Added "query" support in JSON queries for embeddings generation.
6057
* 🆕 [v13.10.0](https://github.com/manticoresoftware/manticoresearch/releases/tag/13.10.0) [ Issue #3709](https://github.com/manticoresoftware/manticoresearch/issues/3709) The manticore-server RPM package no longer owns `/run`.
@@ -2495,4 +2492,3 @@ Manticore Search is built using cmake and the minimum gcc version required for c
24952492
24962493
## Version 2.3.3, 06 July 2017
24972494
* Manticore branding
2498-

manual/english/Integration/Filebeat.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ Now, Manticore also supports the use of Filebeat as processing pipelines. This a
1010

1111
Configuration varies depending on which version of Filebeat you're using.
1212

13-
### Configuration for Filebeat 7.17 - 8.0
13+
### Configuration for Filebeat 7.17, 8.0, 8.1
1414

15-
```
15+
> **Important**: Filebeat versions 7.17.0, 8.0.0, and 8.1.0 have a known issue with glibc 2.35+ (used in Ubuntu 22.04 and newer distributions). These versions may crash with "Fatal glibc error: rseq registration failed". To fix this, add the `seccomp` configuration as shown below.
16+
17+
```yaml
1618
filebeat.inputs:
1719
- type: log
1820
enabled: true
@@ -25,13 +27,24 @@ output.elasticsearch:
2527
hosts: ["http://localhost:9308"]
2628
index: "dpkg_log"
2729
compression_level: 0
30+
allow_older_versions: true # Required for 8.1
31+
32+
# Fix for glibc 2.35+ compatibility (Ubuntu 22.04+)
33+
seccomp:
34+
default_action: allow
35+
syscalls:
36+
- action: allow
37+
names:
38+
- rseq
2839

2940
setup.ilm.enabled: false
3041
setup.template.enabled: false
3142
setup.template.name: "dpkg_log"
3243
setup.template.pattern: "dpkg_log"
3344
```
3445
46+
**References**: [Issue #30576](https://github.com/elastic/beats/issues/30576), [PR #30620](https://github.com/elastic/beats/pull/30620)
47+
3548
3649
### Configuration for Filebeat 8.1 - 8.10
3750

0 commit comments

Comments
 (0)