Polish ElasticSearch relative docs and bump up tested versions. (#11179)

.github/workflows/skywalking.yaml

@@ -367,9 +367,9 @@ jobs:
           - 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.8.1
+          - name: Storage ES 8.9.0
             config: test/e2e-v2/cases/storage/es/e2e.yaml
-            env: ES_VERSION=8.8.1
+            env: ES_VERSION=8.9.0
           - name: Storage OpenSearch 1.1.0
             config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
             env: OPENSEARCH_VERSION=1.1.0

docs/en/changes/changes.md

@@ -61,6 +61,9 @@
 * Fix BooleanMatch and BooleanNotEqualMatch doing Boolean comparison.
 * Support LogQL HTTP query APIs.
 * Add Mux Server component ID(5017) language: Golang.
+* Remove ElasticSearch 6.3.2 from our client lib tests.
+* Bump up ElasticSearch server 8.8.1 to 8.9.0 for latest e2e testing. 8.1.0, 7.16.3 and 7.17.10 are still tested.
+* Add OpenSearch 2.8.0 to our client lib tests.
 
 #### UI
 

docs/en/setup/backend/backend-storage.md

@@ -10,7 +10,7 @@ storage:
 Natively supported storage:
 - H2
 - OpenSearch
-- ElasticSearch 7, 8, ElasticSearch 6 might also work but is end of life and not supported.
+- ElasticSearch 7 and 8. 
 - MySQL
 - PostgreSQL
 - BanyanDB
@@ -41,15 +41,17 @@ In order to activate OpenSearch as storage, set the storage provider to **elasti
 
 We support and tested the following versions of OpenSearch:
 
-- 1.1.0, 1.3.6
-- 2.4.0
+- 1.1.0, 1.3.10
+- 2.4.0, 2.8.0
 
 ## ElasticSearch
 
 **NOTE:** Elastic announced through their blog that Elasticsearch will be moving over to a Server Side Public
-License (SSPL), which is incompatible with Apache License 2.0. This license change is effective from Elasticsearch
-version 7.11. So please choose the suitable ElasticSearch version according to your usage.
-If you have concerns about SSPL, choose the versions before 7.11 or switch to OpenSearch.
+License (SSPL) and/or Elastic License 2.0(ELv2), since Feb. 2021, which is **incompatible with Apache License 2.0**.
+Both of these licenses are not OSS licenses approved by the Open Source Initiative (OSI).
+This license change is effective from Elasticsearch version 7.11. 
+So please choose the suitable ElasticSearch version according to your usage.
+If you have concerns about SSPL/ELv2, choose the versions before 7.11 or switch to OpenSearch.
 
 By default, SkyWalking uses following indices for various telemetry data.
 
@@ -65,9 +67,11 @@ SkyWalking rebuilds the ElasticSearch client on top of ElasticSearch REST API an
 correct request formats according to the server-side version, hence you don't need to download different binaries
 and don't need to configure different storage selectors for different ElasticSearch server-side versions anymore.
 
-For now, SkyWalking supports ElasticSearch 6.x, ElasticSearch 7.x, ElasticSearch 8.x, and OpenSearch 1.x, their
+For now, SkyWalking supports ElasticSearch 7.x, ElasticSearch 8.x, and OpenSearch 1.x, their
 configurations are as follows:
 
+_Notice, ElasticSearch 6 worked and is not promised due to end of life officially._
+
 ```yaml
 storage:
   selector: ${SW_STORAGE:elasticsearch}

oap-server/server-library/library-elasticsearch-client/src/test/java/org/apache/skywalking/library/elasticsearch/ElasticSearchIT.java

@@ -56,12 +56,6 @@ public class ElasticSearchIT {
     public static Collection<Object[]> es() {
         // noinspection resource
         return Arrays.asList(new Object[][] {
-            {
-                "ElasticSearch 6.3.2",
-                new ElasticsearchContainer(
-                    DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
-                                   .withTag("6.3.2"))
-            },
             {
                 "ElasticSearch 7.4.2",
                 new ElasticsearchContainer(
@@ -89,6 +83,13 @@ public class ElasticSearchIT {
                         .withTag("8.1.0"))
                                 .withEnv("xpack.security.enabled", "false")
             },
+            {
+                "ElasticSearch 8.9.0",
+                new ElasticsearchContainer(
+                    DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch")
+                                   .withTag("8.9.0"))
+                    .withEnv("xpack.security.enabled", "false")
+            },
             {
                 "OpenSearch 1.0.0",
                 new ElasticsearchContainer(
@@ -108,6 +109,16 @@ public class ElasticSearchIT {
                                        "docker.elastic.co/elasticsearch/elasticsearch-oss"))
                     .withEnv("plugins.security.disabled", "true")
                     .withStartupTimeout(java.time.Duration.ofMinutes(5))
+            },
+            {
+                "OpenSearch 2.8.0",
+                new ElasticsearchContainer(
+                    DockerImageName.parse("opensearchproject/opensearch")
+                                   .withTag("2.8.0")
+                                   .asCompatibleSubstituteFor(
+                                       "docker.elastic.co/elasticsearch/elasticsearch-oss"))
+                    .withEnv("plugins.security.disabled", "true")
+                    .withStartupTimeout(java.time.Duration.ofMinutes(5))
             }
         });
     }