Skip to content

Commit 5ab39ac

Browse files
authored
Add bydb.dependencies.properties config file (#12922)
1 parent 1a1454e commit 5ab39ac

File tree

5 files changed

+49
-6
lines changed

5 files changed

+49
-6
lines changed

docs/en/changes/changes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
* Alarm: Support store and query the metrics snapshot when the alarm is triggered.
5050
* Alarm: Remove unused `Alarm Trend` query.
5151
* Fix missing remote endpoint IP address in span query of zipkin query module.
52+
* Fix `hierarchy-definition.yml` config file packaged into start.jar wrongly.
53+
* Add `bydb.dependencies.properties` config file to define server dependency versions.
5254

5355
#### UI
5456

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,18 @@ Requirement: **Java 11/17/21**.
1919
You should set up the database ready before starting the backend. We recommend to use BanyanDB.
2020
If you want to use other databases, please read the [storage document](backend-storage.md).
2121

22-
Use the docker mode to run BanyanDB containerized.
22+
Use the docker mode to run BanyanDB containerized.
2323
```shell
24-
docker pull apache/skywalking-banyandb:latest
24+
# The compatible version number could be found in /config/bydb.dependencies.properties
25+
export BYDB_VERSION=xxx
26+
27+
docker pull apache/skywalking-banyandb:{BYDB_VERSION}
2528

2629
docker run -d \
2730
-p 17912:17912 \
2831
-p 17913:17913 \
2932
--name banyandb \
30-
apache/skywalking-banyandb:latest \
33+
apache/skywalking-banyandb:{BYDB_VERSION} \
3134
standalone
3235
```
3336

docs/en/setup/backend/storages/banyandb.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@
22

33
[BanyanDB](https://github.com/apache/skywalking-banyandb) is a dedicated storage implementation developed by the SkyWalking Team and the community. Activate BanyanDB as the storage by setting the storage provider to **banyandb**.
44

5-
The OAP requires BanyanDB version **0.8** or later. From this version onwards, BanyanDB provides general compatibility.
5+
The BanyanDB server compatibility relies on API and release versions, which are defined in `bydb.dependencies.properties`
6+
```shell
7+
# BanyanDB version is the version number of BanyanDB Server release.
8+
# This is the bundled and tested BanyanDB release version
9+
bydb.version=x.y
10+
# BanyanDB API version is the version number of the BanyanDB query APIs
11+
# OAP server has bundled implementation of BanyanDB Java client.
12+
# Please check BanyanDB documentation for the API version compatibility.
13+
# Each `bydb.api.version` could have multiple compatible release version(`bydb.version`).
14+
bydb.api.version=x.y
15+
```
616

717
### Configuration
818

@@ -87,13 +97,16 @@ BanyanDB Server supports two installation modes:
8797

8898
Use the docker mode to run BanyanDB containerized.
8999
```shell
90-
docker pull apache/skywalking-banyandb:latest
100+
# The compatible version number could be found in /config/bydb.dependencies.properties
101+
export BYDB_VERSION=xxx
102+
103+
docker pull apache/skywalking-banyandb:{BYDB_VERSION}
91104

92105
docker run -d \
93106
-p 17912:17912 \
94107
-p 17913:17913 \
95108
--name banyandb \
96-
apache/skywalking-banyandb:latest \
109+
apache/skywalking-banyandb:{BYDB_VERSION} \
97110
standalone
98111
```
99112

oap-server/server-starter/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@
314314
<exclude>endpoint-name-grouping.yml</exclude>
315315
<exclude>metadata-service-mapping.yaml</exclude>
316316
<exclude>trace-sampling-policy-settings.yml</exclude>
317+
<exclude>hierarchy-definition.yml</exclude>
318+
<exclude>bydb.dependencies.properties</exclude>
317319
<exclude>oal/</exclude>
318320
<exclude>fetcher-prom-rules/</exclude>
319321
<exclude>envoy-metrics-rules/</exclude>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# BanyanDB version is the version number of BanyanDB Server release.
17+
# This is the bundled and tested BanyanDB release version
18+
bydb.version=0.8
19+
# BanyanDB API version is the version number of the BanyanDB query APIs
20+
# OAP server has bundled implementation of BanyanDB Java client.
21+
# Please check BanyanDB documentation for the API version compatibility.
22+
# Each `bydb.api.version` could have multiple compatible release version(`bydb.version`).
23+
bydb.api.version=0.8

0 commit comments

Comments
 (0)