Browse Source

ci: support for Logstash / Filebeat 9.3

Related PR https://github.com/manticoresoftware/manticoresearch/pull/4224
Sergey Nikolaev 2 weeks ago
parent
commit
3fa892d36c

File diff suppressed because it is too large
+ 0 - 0
.translation-cache/Integration/Filebeat.md.json


File diff suppressed because it is too large
+ 0 - 0
.translation-cache/Integration/Logstash.md.json


+ 1 - 1
manual/chinese/Integration/Filebeat.md

@@ -4,7 +4,7 @@
 
 [Filebeat](https://www.elastic.co/beats/filebeat) 是一个轻量级的转发器,用于转发和集中日志数据。安装并作为代理运行后,它会监控您指定的日志文件或位置,收集日志事件,并将它们转发进行索引,通常到Elasticsearch或Logstash。
 
-现在,Manticore 也支持使用Filebeat作为处理管道。这使得收集和转换的数据可以像发送到Elasticsearch一样发送到Manticore。目前支持的版本为7.17-9.2
+现在,Manticore 也支持使用 Filebeat 作为处理管道。这允许收集和转换后的数据像发送到 Elasticsearch 一样发送到 Manticore。目前支持的版本为 7.17-9.3
 
 ## Filebeat配置
 

+ 1 - 1
manual/chinese/Integration/Logstash.md

@@ -4,7 +4,7 @@
 
 [Logstash](https://www.elastic.co/logstash) 是一个日志管理工具,可以收集来自多种来源的数据,实时转换并发送到您期望的目标。它通常用作 Elasticsearch 的数据管道,Elasticsearch 是一个开源的分析和搜索引擎。
 
-现在,Manticore 支持将 Logstash 用作处理管道。这允许收集和转换后的数据像发送到 Elasticsearch 一样发送到 Manticore。目前支持的版本为 7.6-9.2
+现在,Manticore 支持使用 Logstash 作为处理管道。这允许收集和转换后的数据像发送到 Elasticsearch 一样发送到 Manticore。目前支持的版本为 7.6-9.3
 
 让我们查看一个用于索引 `dpkg.log` 的简单 Logstash 配置文件示例,`dpkg.log` 是 Debian 包管理器的标准日志文件。该日志本身结构简单,如下所示:
 

+ 1 - 1
manual/english/Integration/Filebeat.md

@@ -4,7 +4,7 @@
 
 [Filebeat](https://www.elastic.co/beats/filebeat) is a lightweight shipper for forwarding and centralizing log data. Once installed as an agent, it monitors the log files or locations you specify, collects log events, and forwards them for indexing, usually to Elasticsearch or Logstash.
 
-Now, Manticore also supports the use of Filebeat as processing pipelines. This allows the collected and transformed data to be sent to Manticore just like to Elasticsearch. Currently, versions 7.17-9.2 are supported.
+Now, Manticore also supports the use of Filebeat as processing pipelines. This allows the collected and transformed data to be sent to Manticore just like to Elasticsearch. Currently, versions 7.17-9.3 are supported.
 
 ## Filebeat configuration
 

+ 1 - 1
manual/english/Integration/Logstash.md

@@ -4,7 +4,7 @@
 
 [Logstash](https://www.elastic.co/logstash) is a log management tool that collects data from a variety of sources, transforms it on the fly, and sends it to your desired destination. It is often used as a data pipeline for Elasticsearch, an open-source analytics and search engine.
 
-Now, Manticore supports the use of Logstash as a processing pipeline. This allows the collected and transformed data to be sent to Manticore just like to Elasticsearch. Currently, versions 7.6-9.2 are supported.
+Now, Manticore supports the use of Logstash as a processing pipeline. This allows the collected and transformed data to be sent to Manticore just like to Elasticsearch. Currently, versions 7.6-9.3 are supported.
 
 Let’s examine a simple example of a Logstash config file used for indexing `dpkg.log`, a standard log file of the Debian package manager. The log itself has a simple structure, as shown below:
 

+ 1 - 1
manual/russian/Integration/Filebeat.md

@@ -4,7 +4,7 @@
 
 [Filebeat](https://www.elastic.co/beats/filebeat) — это легковесный сборщик для пересылки и централизации данных логов. Будучи установленным как агент, он отслеживает указанные вами файлы или каталоги логов, собирает события логов и пересылает их для индексации, обычно в Elasticsearch или Logstash.
 
-Теперь Manticore также поддерживает использование Filebeat в качестве конвейеров обработки. Это позволяет отправлять собранные и преобразованные данные в Manticore так же, как и в Elasticsearch. В настоящее время поддерживаются версии 7.17-9.2.
+Теперь Manticore также поддерживает использование Filebeat в качестве конвейеров обработки. Это позволяет отправлять собранные и преобразованные данные в Manticore так же, как и в Elasticsearch. В настоящее время поддерживаются версии 7.17–9.3.
 
 ## Конфигурация Filebeat
 

+ 1 - 1
manual/russian/Integration/Logstash.md

@@ -4,7 +4,7 @@
 
 [Logstash](https://www.elastic.co/logstash) — это инструмент управления журналами, который собирает данные из различных источников, преобразует их на лету и отправляет в нужное место назначения. Он часто используется как конвейер данных для Elasticsearch, открытого аналитического и поискового движка.
 
-Теперь Manticore поддерживает использование Logstash в качестве конвейера обработки. Это позволяет отправлять собранные и преобразованные данные в Manticore так же, как и в Elasticsearch. В настоящее время поддерживаются версии с 7.6 по 9.2.
+Теперь Manticore поддерживает использование Logstash в качестве конвейера обработки. Это позволяет отправлять собранные и преобразованные данные в Manticore так же, как и в Elasticsearch. В настоящее время поддерживаются версии 7.6–9.3.
 
 Рассмотрим простой пример файла конфигурации Logstash, используемого для индексирования `dpkg.log`, стандартного файла журнала менеджера пакетов Debian. Сам журнал имеет простую структуру, как показано ниже:
 

+ 8 - 6
test/clt-tests/integrations/filebeat/test-integrations-check-filebeat-versions.rec

@@ -31,11 +31,12 @@ TESTED_VERSIONS="7.17
 8.19
 9.0
 9.1
-9.2"
+9.2
+9.3"
 
 # Check for NEW versions (after latest tested)
 # WARNING: Also update FILEBEAT_LATEST below when changing this!
-LATEST_TESTED_VERSION="9.2"
+LATEST_TESTED_VERSION="9.3"
 NEW_VERSIONS=$(curl -s "https://hub.docker.com/v2/repositories/elastic/filebeat/tags/?page_size=100" \
 | jq -r ".results[].name" \
 | grep "^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$" \
@@ -70,7 +71,7 @@ echo "Using tested versions:"
 echo "$TESTED_VERSIONS"
 SCRIPT
 ––– output –––
-✅ No new versions found after 9.2
+✅ No new versions found after 9.3
 Using tested versions:
 7.17
 8.0
@@ -96,6 +97,7 @@ Using tested versions:
 9.0
 9.1
 9.2
+9.3
 ––– input –––
 bash << 'SCRIPT'
 # Check documentation for Filebeat version
@@ -103,7 +105,7 @@ echo "Checking Filebeat version in documentation..."
 echo ""
 
 # Must match LATEST_TESTED_VERSION above
-FILEBEAT_LATEST="9.2"
+FILEBEAT_LATEST="9.3"
 
 # 1. Check manual documentation (local file mounted via workflow)
 echo "=== Checking manual documentation ==="
@@ -148,7 +150,7 @@ SCRIPT
 Checking Filebeat version in documentation...
 === Checking manual documentation ===
 ✓ Checking /manual/english/Integration/Filebeat.md
-✅ Manual: versions 7.17-9.2 are supported
+✅ Manual: versions 7.17-9.3 are supported
 === Checking website blog post ===
 ✓ Fetching https://manticoresearch.com/blog/integration-of-manticore-with-logstash-filebeat/
-✅ Blog: Filebeat versions 7.17-9.2
+✅ Blog: Filebeat versions 7.17-9.3

+ 17 - 0
test/clt-tests/integrations/filebeat/test-integrations-support-filebeat-versions.rec

@@ -36,6 +36,7 @@ timeout 420 bash -c 'echo "[]" > /tmp/filebeat_tags.json; page=1; attempts=0; ma
 9.0
 9.1
 9.2
+9.3
 Preparation done
 >>> Checking Filebeat 7.17 ...
 >>> Downloading Filebeat 7.17 ...
@@ -109,6 +110,9 @@ Preparation done
 >>> Checking Filebeat 9.2 ...
 >>> Downloading Filebeat 9.2 ...
 ✓ Archive for 9.2 is OK
+>>> Checking Filebeat 9.3 ...
+>>> Downloading Filebeat 9.3 ...
+✓ Archive for 9.3 is OK
 ––– input –––
 set +H && mkdir -p /tmp/filebeat_cache && echo "Preparation done"
 ––– output –––
@@ -655,5 +659,18 @@ timeout 60 bash /tmp/filebeat-single-test.sh 9.2
 ✓ Structure check for 9.2: passed
 ✓ Filebeat version 9.2 tested successfully
 ––– input –––
+timeout 60 bash /tmp/filebeat-single-test.sh 9.3
+––– output –––
+>>> Testing Filebeat version: 9.3
+✓ Log file has 5 lines
+✓ Manticore Search available
+>>> Testing Filebeat 9.3 with filestream input and fingerprint disabled...
+>>> Starting Filebeat...
+>>> Waiting for Filebeat to publish events...
+✓ Filebeat 9.3 processed logs
+✓ Row count check for 9.3: 5 rows
+✓ Structure check for 9.3: passed
+✓ Filebeat version 9.3 tested successfully
+––– input –––
 rm -rf /tmp/fb-data-* /tmp/fb-log-*.txt /tmp/page.json /tmp/filebeat_tags.json
 ––– output –––

+ 8 - 6
test/clt-tests/integrations/logstash/test-integrations-check-logstash-versions.rec

@@ -31,11 +31,12 @@ TESTED_VERSIONS="7.17
 8.19
 9.0
 9.1
-9.2"
+9.2
+9.3"
 
 # Check for NEW versions (after latest tested)
 # WARNING: Also update LOGSTASH_LATEST below when changing this!
-LATEST_TESTED_VERSION="9.2"
+LATEST_TESTED_VERSION="9.3"
 NEW_VERSIONS=$(curl -s "https://hub.docker.com/v2/repositories/library/logstash/tags/?page_size=100" \
 | jq -r ".results[].name" \
 | grep "^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$" \
@@ -70,7 +71,7 @@ echo "Using tested versions:"
 echo "$TESTED_VERSIONS"
 SCRIPT
 ––– output –––
-✅ No new versions found after 9.2
+✅ No new versions found after 9.3
 Using tested versions:
 7.17
 8.0
@@ -96,6 +97,7 @@ Using tested versions:
 9.0
 9.1
 9.2
+9.3
 ––– input –––
 bash << 'SCRIPT'
 # Check documentation versions for Logstash
@@ -103,7 +105,7 @@ echo "Checking Logstash version references in documentation..."
 echo ""
 
 # Must match LATEST_TESTED_VERSION above
-LOGSTASH_LATEST="9.2"
+LOGSTASH_LATEST="9.3"
 
 # 1. Check manual documentation (local file mounted via workflow)
 echo "=== Checking manual documentation ==="
@@ -158,8 +160,8 @@ SCRIPT
 Checking Logstash version references in documentation...
 === Checking manual documentation ===
 ✓ Checking /manual/english/Integration/Logstash.md
-✅ Manual: versions 7.6-9.2 are supported
+✅ Manual: versions 7.6-9.3 are supported
 === Checking website blog post ===
 ✓ Fetching https://manticoresearch.com/blog/integration-of-manticore-with-logstash-filebeat/
-✅ Blog: contains 9.2
+✅ Blog: contains 9.3
 ✅ Documentation validation complete

+ 14 - 0
test/clt-tests/integrations/logstash/test-integrations-test-logstash-versions.rec

@@ -626,5 +626,19 @@ timeout 300 bash /tmp/logstash-single-test.sh 9.2
 ✓ Structure check for 9.2: passed
 ✓ Logstash version 9.2 tested successfully
 ––– input –––
+for i in {1..3}; do wget -q --timeout=60 --tries=1 "https://artifacts.elastic.co/downloads/logstash/logstash-9.3.0-linux-x86_64.tar.gz" -O logstash-9.3.0.tar.gz && gzip -t logstash-9.3.0.tar.gz 2>/dev/null && tar -tzf logstash-9.3.0.tar.gz | grep -q "bin/logstash" && { echo "✓ Logstash 9.3.0 downloaded successfully"; break; } || { [ $i -eq 3 ] && echo "✗ Failed to download Logstash 9.3.0 after 3 attempts" >&2 || rm -f logstash-9.3.0.tar.gz >/dev/null 2>&1; sleep 2; }; done
+––– output –––
+✓ Logstash 9.3.0 downloaded successfully
+––– input –––
+timeout 300 bash /tmp/logstash-single-test.sh 9.3
+––– output –––
+>>> Testing Logstash version: 9.3
+✓ Log file has 5 lines
+✓ Manticore Search available
+✓ Logstash 9.3 started and processed logs
+✓ Row count check for 9.3: 5 rows
+✓ Structure check for 9.3: passed
+✓ Logstash version 9.3 tested successfully
+––– input –––
 rm -f logstash-*.tar.gz
 ––– output –––

Some files were not shown because too many files changed in this diff