Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
c5e0c01f
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 大约 1 年
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
c5e0c01f
编写于
5月 09, 2021
作者:
Z
Zhenxu Ke
提交者:
GitHub
5月 09, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add OpenSearch as a storage option (#6916)
上级
26de8388
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
95 addition
and
4 deletion
+95
-4
.github/workflows/e2e.storages.yaml
.github/workflows/e2e.storages.yaml
+6
-1
CHANGES.md
CHANGES.md
+1
-1
docs/en/setup/backend/backend-storage.md
docs/en/setup/backend/backend-storage.md
+14
-2
test/e2e/e2e-test/docker/build-opensearch.sh
test/e2e/e2e-test/docker/build-opensearch.sh
+27
-0
test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
...e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
+47
-0
未找到文件。
.github/workflows/e2e.storages.yaml
浏览文件 @
c5e0c01f
...
...
@@ -31,7 +31,7 @@ jobs:
timeout-minutes
:
90
strategy
:
matrix
:
storage
:
[
'
mysql'
,
'
es6'
,
'
es7.0'
,
'
es7.10'
,
'
influxdb'
,
'
tidb'
,
'
postgresql'
]
storage
:
[
'
mysql'
,
'
es6'
,
'
es7.0'
,
'
es7.10'
,
'
opensearch'
,
'
influxdb'
,
'
tidb'
,
'
postgresql'
]
env
:
SW_STORAGE
:
${{ matrix.storage }}
steps
:
...
...
@@ -48,6 +48,11 @@ jobs:
key
:
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys
:
|
${{ runner.os }}-maven-
-
name
:
Build OpenSearch
if
:
matrix.storage == 'opensearch'
run
:
bash test/e2e/e2e-test/docker/build-opensearch.sh
-
name
:
Run E2E Test
if
:
env.SKIP_CI != 'true'
uses
:
./.github/actions/e2e-test
...
...
CHANGES.md
浏览文件 @
c5e0c01f
...
...
@@ -5,7 +5,7 @@ Release Notes.
8.
6.0
------------------
#### Project
*
Add OpenSearch as storage option.
#### Java Agent
*
Add
`trace_segment_ref_limit_per_span`
configuration mechanism to avoid OOM.
...
...
docs/en/setup/backend/backend-storage.md
浏览文件 @
c5e0c01f
...
...
@@ -9,6 +9,7 @@ storage:
Native supported storage
-
H2
-
OpenSearch
-
ElasticSearch 6, 7
-
MySQL
-
TiDB
...
...
@@ -31,14 +32,25 @@ storage:
user
:
sa
```
## OpenSearch
OpenSearch storage shares the same configurations as ElasticSearch 7.
In order to activate ElasticSearch 7 as storage, set storage provider to
**elasticsearch7**
.
Please download the
`apache-skywalking-bin-es7.tar.gz`
if you want to use OpenSearch as storage.
## ElasticSearch
**NOTICE:**
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.
-
In order to activate ElasticSearch 6 as storage, set storage provider to
**elasticsearch**
-
In order to activate ElasticSearch 7 as storage, set storage provider to
**elasticsearch7**
**Required ElasticSearch 6.3.2 or higher. HTTP RestHighLevelClient is used to connect server.**
-
For ElasticSearch 6.3.2 ~ 7.0.0 (excluded), please download the
`apache-skywalking-bin.tar.gz`
or
`apache-skywalking-bin.zip`
,
-
For ElasticSearch 7.0.0 ~ 8.0.0 (excluded), please download the
`apache-skywalking-bin-es7.tar.gz`
or
`apache-skywalking-bin-es7.zip`
.
-
For ElasticSearch 6.3.2 ~ 7.0.0 (excluded), please download the
`apache-skywalking-bin.tar.gz`
,
-
For ElasticSearch 7.0.0 ~ 8.0.0 (excluded), please download the
`apache-skywalking-bin-es7.tar.gz`
.
For now, ElasticSearch 6 and ElasticSearch 7 share the same configurations, as follows:
...
...
test/e2e/e2e-test/docker/build-opensearch.sh
0 → 100644
浏览文件 @
c5e0c01f
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
set
-ex
wd
=
$(
mktemp
-d
-t
opensearch-XXXXXXXXXX
)
&&
cd
"
$wd
"
curl
-L
https://github.com/opensearch-project/OpenSearch/archive/1.0.0-beta1.tar.gz
-o
opensearch.tgz
tar
-zxf
opensearch.tgz
--strip-components
=
1
-C
.
./gradlew clean distribution:docker:assemble
-x
test
-x
javadoc
test/e2e/e2e-test/docker/storage/docker-compose.opensearch.yml
0 → 100644
浏览文件 @
c5e0c01f
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
version
:
'
2.1'
services
:
es
:
image
:
opensearch:test
expose
:
-
9200
networks
:
-
e2e
environment
:
-
discovery.type=single-node
-
cluster.routing.allocation.disk.threshold_enabled=false
healthcheck
:
test
:
[
"
CMD"
,
"
bash"
,
"
-c"
,
"
cat
<
/dev/null
>
/dev/tcp/127.0.0.1/9200"
]
interval
:
5s
timeout
:
60s
retries
:
120
oap
:
extends
:
file
:
../base-compose.yml
service
:
oap-es7
environment
:
SW_STORAGE
:
elasticsearch7
SW_PROMETHEUS_FETCHER
:
"
default"
SW_TELEMETRY
:
prometheus
depends_on
:
es
:
condition
:
service_healthy
networks
:
e2e
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录