This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch fix/upgrade-es-eck in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 34bdb88ddc8462d5f3899d529397e65b2d163776 Author: Wu Sheng <[email protected]> AuthorDate: Fri Feb 27 09:27:58 2026 +0800 Drop ES 7 (EOL) and upgrade all Elasticsearch E2E tests to 8.18.8 Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .github/workflows/skywalking.yaml | 53 ++++------------------ docs/en/changes/changes.md | 1 + test/e2e-v2/cases/alarm/es/docker-compose.yml | 2 +- .../cases/alarm/es/es-sharding/docker-compose.yml | 2 +- test/e2e-v2/cases/baseline/es/docker-compose.yml | 2 +- .../baseline/es/es-sharding/docker-compose.yml | 2 +- test/e2e-v2/cases/browser/es/docker-compose.yml | 2 +- .../browser/es/es-sharding/docker-compose.yml | 2 +- test/e2e-v2/cases/cluster/zk/es/docker-compose.yml | 2 +- test/e2e-v2/cases/elasticsearch/docker-compose.yml | 2 +- test/e2e-v2/cases/event/es/docker-compose.yml | 2 +- test/e2e-v2/cases/logql/docker-compose.yml | 2 +- test/e2e-v2/cases/menu/es/docker-compose.yml | 2 +- .../cases/menu/es/es-sharding/docker-compose.yml | 2 +- .../profiling/async-profiler/es/docker-compose.yml | 2 +- .../cases/profiling/pprof/es/docker-compose.yml | 2 +- .../cases/profiling/trace/es/docker-compose.yml | 2 +- .../trace/es/es-sharding/docker-compose.yml | 2 +- .../storage/es/es-sharding/docker-compose.yml | 2 +- test/e2e-v2/cases/zipkin/es/docker-compose.yml | 2 +- .../cases/zipkin/es/es-sharding/docker-compose.yml | 2 +- test/e2e-v2/script/env | 2 +- 22 files changed, 31 insertions(+), 63 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 1b49f2fae8..791e20a222 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -376,21 +376,9 @@ jobs: config: test/e2e-v2/cases/storage/mysql/e2e.yaml - name: Storage PostgreSQL config: test/e2e-v2/cases/storage/postgres/e2e.yaml - - name: Storage ES 7.16.3 + - name: Storage ES 8.18.8 config: test/e2e-v2/cases/storage/es/e2e.yaml - env: ES_VERSION=7.16.3 - - name: Storage ES 7.17.10 - config: test/e2e-v2/cases/storage/es/e2e.yaml - env: ES_VERSION=7.17.10 - - name: Storage ES 8.1.0 - config: test/e2e-v2/cases/storage/es/e2e.yaml - env: ES_VERSION=8.1.0 - - name: Storage ES 8.9.0 - config: test/e2e-v2/cases/storage/es/e2e.yaml - env: ES_VERSION=8.9.0 - - name: Storage ES 8.9.0 - config: test/e2e-v2/cases/storage/es/e2e.yaml - env: ES_VERSION=8.18.1 + env: ES_VERSION=8.18.8 - name: Storage OpenSearch 1.3.10 config: test/e2e-v2/cases/storage/opensearch/e2e.yaml env: OPENSEARCH_VERSION=1.3.10 @@ -424,15 +412,9 @@ jobs: - name: Baseline-driven Alarm BanyanDB config: test/e2e-v2/cases/baseline/banyandb/e2e.yaml - - name: TTL ES 7.16.3 - config: test/e2e-v2/cases/ttl/es/e2e.yaml - env: ES_VERSION=7.16.3 - - name: TTL ES 8.8.1 - config: test/e2e-v2/cases/ttl/es/e2e.yaml - env: ES_VERSION=8.8.1 - - name: TTL ES 8.18.1 + - name: TTL ES 8.18.8 config: test/e2e-v2/cases/ttl/es/e2e.yaml - env: ES_VERSION=8.18.1 + env: ES_VERSION=8.18.8 - name: Event BanyanDB config: test/e2e-v2/cases/event/banyandb/e2e.yaml @@ -445,33 +427,18 @@ jobs: config: test/e2e-v2/cases/log/mysql/e2e.yaml - name: Log PostgreSQL config: test/e2e-v2/cases/log/postgres/e2e.yaml - - name: Log ES 7.16.3 + - name: Log ES 8.18.8 config: test/e2e-v2/cases/log/es/e2e.yaml - env: ES_VERSION=7.16.3 - - name: Log ES 7.17.10 - config: test/e2e-v2/cases/log/es/e2e.yaml - env: ES_VERSION=7.17.10 - - name: Log ES 8.8.1 Sharding - config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml - env: ES_VERSION=8.8.1 - - name: Log ES 8.18.1 Sharding + env: ES_VERSION=8.18.8 + - name: Log ES 8.18.8 Sharding config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml - env: ES_VERSION=8.18.1 + env: ES_VERSION=8.18.8 - name: Log BanyanDB config: test/e2e-v2/cases/log/banyandb/e2e.yaml - - name: Log FluentBit ES 7.16.3 - config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml - env: ES_VERSION=7.16.3 - - name: Log FluentBit ES 7.17.10 - config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml - env: ES_VERSION=7.17.10 - - name: Log FluentBit ES 8.8.1 - config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml - env: ES_VERSION=8.8.1 - - name: Log FluentBit ES 8.18.1 + - name: Log FluentBit ES 8.18.8 config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml - env: ES_VERSION=8.18.1 + env: ES_VERSION=8.18.8 - name: Trace Profiling BanyanDB config: test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 024e752630..6b1ab8174c 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -12,6 +12,7 @@ * Add `CLAUDE.md` as AI assistant guide for the project. * Upgrade Groovy to 5.0.3 in OAP backend. * Bump up nodejs to v24.13.0 for the latest UI(booster-ui) compiling. +* Drop Elasticsearch 7.x (EOL) from E2E tests, upgrade all ES tests to 8.18.8, and update skywalking-helm to use ECK 8.18.8. * Add `library-batch-queue` module — a partitioned, self-draining queue with type-based dispatch, adaptive partitioning, idle backoff, and throughput-weighted drain rebalancing (`DrainBalancer`). Designed to replace DataCarrier in high-fan-out scenarios. diff --git a/test/e2e-v2/cases/alarm/es/docker-compose.yml b/test/e2e-v2/cases/alarm/es/docker-compose.yml index 4e5862e90d..2993cc2da8 100644 --- a/test/e2e-v2/cases/alarm/es/docker-compose.yml +++ b/test/e2e-v2/cases/alarm/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml index c009c55292..a29e538ba2 100644 --- a/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/alarm/es/es-sharding/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/baseline/es/docker-compose.yml b/test/e2e-v2/cases/baseline/es/docker-compose.yml index 444c43e2c2..11fe63dc2f 100644 --- a/test/e2e-v2/cases/baseline/es/docker-compose.yml +++ b/test/e2e-v2/cases/baseline/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml index 553bd81479..cc165d4add 100644 --- a/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/baseline/es/es-sharding/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/browser/es/docker-compose.yml b/test/e2e-v2/cases/browser/es/docker-compose.yml index f52b49b809..0c009a2e83 100644 --- a/test/e2e-v2/cases/browser/es/docker-compose.yml +++ b/test/e2e-v2/cases/browser/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml index 59c9830f0e..45198e2c42 100644 --- a/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/browser/es/es-sharding/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml index 5d8e4e9f03..8a85e3e0a0 100644 --- a/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml +++ b/test/e2e-v2/cases/cluster/zk/es/docker-compose.yml @@ -29,7 +29,7 @@ services: retries: 120 es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/elasticsearch/docker-compose.yml b/test/e2e-v2/cases/elasticsearch/docker-compose.yml index a698f17ed7..8204988592 100644 --- a/test/e2e-v2/cases/elasticsearch/docker-compose.yml +++ b/test/e2e-v2/cases/elasticsearch/docker-compose.yml @@ -31,7 +31,7 @@ services: ports: - 17912 es: - image: elastic/elasticsearch:8.3.2 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/event/es/docker-compose.yml b/test/e2e-v2/cases/event/es/docker-compose.yml index 8413ec3fc1..fcccbb7c25 100644 --- a/test/e2e-v2/cases/event/es/docker-compose.yml +++ b/test/e2e-v2/cases/event/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '3.8' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/logql/docker-compose.yml b/test/e2e-v2/cases/logql/docker-compose.yml index c078942b91..8c586fc30c 100644 --- a/test/e2e-v2/cases/logql/docker-compose.yml +++ b/test/e2e-v2/cases/logql/docker-compose.yml @@ -70,7 +70,7 @@ services: condition: service_healthy es: - image: elastic/elasticsearch:7.10.2 + image: elastic/elasticsearch:8.18.8 ports: - 9200 networks: diff --git a/test/e2e-v2/cases/menu/es/docker-compose.yml b/test/e2e-v2/cases/menu/es/docker-compose.yml index 99ae297c3c..85ba87667c 100644 --- a/test/e2e-v2/cases/menu/es/docker-compose.yml +++ b/test/e2e-v2/cases/menu/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml index 28a583874a..3acee903a6 100644 --- a/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/menu/es/es-sharding/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml b/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml index 916ad2903f..053a81dac2 100644 --- a/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/async-profiler/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '3.8' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml b/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml index c7d2e9519d..711f234e3f 100644 --- a/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/pprof/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '3.8' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml index cb777c2f35..e28bdea851 100644 --- a/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '3.8' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 ports: diff --git a/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml index af65a69631..06599ac371 100644 --- a/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/profiling/trace/es/es-sharding/docker-compose.yml @@ -17,7 +17,7 @@ version: '3.8' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml index f96e6ae06b..f4b8141dce 100644 --- a/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/storage/es/es-sharding/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/zipkin/es/docker-compose.yml b/test/e2e-v2/cases/zipkin/es/docker-compose.yml index fb11bf4647..07d77506be 100644 --- a/test/e2e-v2/cases/zipkin/es/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/es/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml b/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml index 358dc43abe..85e7217305 100644 --- a/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml +++ b/test/e2e-v2/cases/zipkin/es/es-sharding/docker-compose.yml @@ -17,7 +17,7 @@ version: '2.1' services: es: - image: elastic/elasticsearch:7.15.0 + image: elastic/elasticsearch:8.18.8 expose: - 9200 networks: diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index 0850fba48e..9f5a95fdaf 100644 --- a/test/e2e-v2/script/env +++ b/test/e2e-v2/script/env @@ -21,7 +21,7 @@ SW_AGENT_GO_COMMIT=afa75a3cc8c31f142102443af6164b825d63d8fc SW_AGENT_PYTHON_COMMIT=b91ebc46010ba6a46b251d4df54190c3b64f2db8 SW_AGENT_CLIENT_JS_COMMIT=f08776d909eb1d9bc79c600e493030651b97e491 SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016 -SW_KUBERNETES_COMMIT_SHA=6fe5e6f0d3b7686c6be0457733e825ee68cb9b35 +SW_KUBERNETES_COMMIT_SHA=2850db1502283a2d8516146c57cc2b49f1da934b SW_ROVER_COMMIT=79292fe07f17f98f486e0c4471213e1961fb2d1d SW_BANYANDB_COMMIT=208982aaa11092bc38018a9e1b24eda67e829312 SW_AGENT_PHP_COMMIT=d1114e7be5d89881eec76e5b56e69ff844691e35
