Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/skywalking.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ jobs:
- name: Storage ES 8.18.8
config: test/e2e-v2/cases/storage/es/e2e.yaml
env: ES_VERSION=8.18.8
- name: Storage ES 9.3.0
config: test/e2e-v2/cases/storage/es/e2e.yaml
env: ES_VERSION=9.3.0
- name: Storage OpenSearch 2.4.0
config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
env: OPENSEARCH_VERSION=2.4.0
Expand Down
1 change: 1 addition & 0 deletions docs/en/changes/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@
admin-host only" entry above for the public REST retirement.

#### OAP Server
* Support Elasticsearch 9.x as storage.
* Add Node.js runtime metrics via the Node.js agent **`MeterReportService`** pipeline (`meter_instance_nodejs_*`, 1s collect/report). OAP analyzes raw meters through `nodejs-runtime.yaml`. Node.js E2E asserts six `meter_instance_nodejs_*` metrics (`test/e2e-v2/cases/nodejs/e2e.yaml`).
* Add PHP runtime PHM meter analyzer (`php-runtime.yaml`) for SkyWalking PHP agent process
metrics (CPU, memory, virtual memory, thread count, open file descriptors sampled from
Expand Down
2 changes: 1 addition & 1 deletion docs/en/setup/backend/storages/elasticsearch.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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 7.x, ElasticSearch 8.x, and OpenSearch 1.x, their
For now, SkyWalking supports ElasticSearch 7.x, ElasticSearch 8.x, ElasticSearch 9.x, and OpenSearch 1.x, their
configurations are as follows:

_Notice, ElasticSearch 6 worked and is not promised due to end of life officially._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private ElasticSearchVersion(final String distribution, final int major, final i
}
return;
}
if (major == 8) {
if (major >= 8) { // 8.x, 9.x and later: typeless docs + composable index templates
requestFactory = new V81RequestFactory(this);
codec = V78Codec.INSTANCE;
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ public static Collection<Object[]> es() {
.withTag("8.9.0"))
.withEnv("xpack.security.enabled", "false")
},
{
"ElasticSearch 9.3.0",
new ElasticsearchContainer(
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch")
.withTag("9.3.0"))
.withEnv("xpack.security.enabled", "false")
},
{
"OpenSearch 1.0.0",
new ElasticsearchContainer(
Expand Down
Loading