Skip to content

Commit c222668

Browse files
blinkovblinkov
authored
Merge pull request #18066 from anton-bobkov/docs-fix-stable-25-1
Fix diplodoc build errors (git conflict marks)
2 parents 1523d35 + 72aeac3 commit c222668

File tree

20 files changed

+172
-194
lines changed

20 files changed

+172
-194
lines changed

‎ydb/docs/en/core/devops/manual/monitoring.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ To visualize data, use any system that supports Prometheus, such as [Zabbix](htt
3838

3939
To set up monitoring for a local single-node {{ ydb-short-name }} cluster using [Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/):
4040

41-
<<<<<<< HEAD
42-
1. [Install and run](https://prometheus.io/docs/prometheus/latest/getting_started/#downloading-and-running-prometheus) Prometheus via a [configuration file](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/local_ydb_prometheus.yml).
43-
1. [Install and start](https://grafana.com/docs/grafana/latest/getting-started/getting-started/) the Grafana.
44-
1. [Create](https://prometheus.io/docs/visualization/grafana/#creating-a-prometheus-data-source) a data source of the `prometheus` type in Grafana and attach it to a running Prometheus instance.
45-
1. Upload [{{ ydb-short-name }} dashboards](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/) to Grafana.
46-
=======
4741
1. [Install](https://prometheus.io/docs/prometheus/latest/getting_started) Prometheus.
4842

4943
1. Edit the Prometheus [configuration file](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/local_ydb_prometheus.yml):
@@ -86,7 +80,6 @@ To set up monitoring for a local single-node {{ ydb-short-name }} cluster using
8680
4. [Create](https://prometheus.io/docs/visualization/grafana/#creating-a-prometheus-data-source) a data source of the `prometheus` type in Grafana, and attach it to the running Prometheus instance.
8781

8882
5. Upload [{{ ydb-short-name }} dashboards](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/helm/ydb-prometheus/dashboards) to Grafana.
89-
>>>>>>> bb54688b369 ([docs] configuration v2 release candidate (#17647))
9083

9184
To upload dashboards, use the Grafana UI [Import](https://grafana.com/docs/grafana/latest/dashboards/export-import/#import-dashboard) tool or run a [script](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/local_upload_dashboards.sh). Please note that the script uses [basic authentication](https://grafana.com/docs/grafana/latest/http_api/create-api-tokens-for-org/#authentication) in Grafana. For other cases, modify the script.
9285

‎ydb/docs/en/core/downloads/yandex-enterprise-database.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,50 @@ Yandex Enterprise Database distributions are available for download via the link
3131
|| **Version** | **Release date** | **Download** | **Checksums** | **Changelog** ||
3232
|| **v24.3** | | | | ||
3333
|| v.24.3.13.11 | 06.03.2024 |
34+
3435
- [Distribution](https://binaries.ясубд.рф/release/24.3.13.11/yasubd-24.3.13.11-linux-amd64.tar.xz)
3536
- [Debug symbols](https://binaries.ясубд.рф/release/24.3.13.11/yasubd-24.3.13.11-linux-amd64-debug.tar.xz)
37+
3638
|
39+
3740
- [For distribution](https://binaries.ясубд.рф/release/24.3.13.11/checksums.txt)
3841
- [For debug symbols](https://binaries.ясубд.рф/release/24.3.13.11/checksums.debug.txt)
42+
3943
| - ||
4044
|| v.24.3.13.10 | 24.12.2024 |
45+
4146
- [Distribution](https://binaries.ясубд.рф/release/24.3.13.10/yasubd-24.3.13.10-linux-amd64.tar.xz)
4247
- [Debug symbols](https://binaries.ясубд.рф/release/24.3.13.10/yasubd-24.3.13.10-linux-amd64-debug.tar.xz)
48+
4349
|
50+
4451
- [For distribution](https://binaries.ясубд.рф/release/24.3.13.10/checksums.txt)
4552
- [For debug symbols](https://binaries.ясубд.рф/release/24.3.13.10/checksums.debug.txt)
53+
4654
| [See list](../changelog-server.md#24-3) ||
4755
|| **v24.2** | | | | ||
4856
|| v.24.2.7.1 | 20.08.2024 |
57+
4958
- [Distribution](https://binaries.ясубд.рф/release/24.2.7.1/yasubd-24.2.7.1-linux-amd64.tar.xz)
5059
- [Debug symbols](https://binaries.ясубд.рф/release/24.2.7.1/yasubd-24.2.7.1-linux-amd64-debug.tar.xz)
60+
5161
|
62+
5263
- [For distribution](https://binaries.ясубд.рф/release/24.2.7.1/checksums.txt)
5364
- [For debug symbols](https://binaries.ясубд.рф/release/24.2.7.1/checksums.debug.txt)
65+
5466
| [See list](../changelog-server.md#24-2) ||
5567
|| **v24.1** | | | | ||
5668
|| v.24.1.18.1 | 28.06.2024 |
69+
5770
- [Distribution](https://binaries.ясубд.рф/release/24.1.18.1/yasubd-24.1.18.1-linux-amd64.tar.xz)
5871
- [Debug symbols](https://binaries.ясубд.рф/release/24.1.18.1/yasubd-24.1.18.1-linux-amd64-debug.tar.xz)
72+
5973
|
74+
6075
- [For distribution](https://binaries.ясубд.рф/release/24.1.18.1/checksums.txt)
6176
- [For debug symbols](https://binaries.ясубд.рф/release/24.1.18.1/checksums.debug.txt)
77+
6278
| [See list](../changelog-server.md#24-1) ||
6379
|| **v23.4** | | | | ||
6480
|| v.23.4.11.1 | 15.05.2024 | [Distribution](https://binaries.ясубд.рф/release/23.4.11.1/yasubd-23.4.11.1-linux-amd64.tar.gz) | [Checksums](https://binaries.ясубд.рф/release/23.4.11.1/checksums.txt) | [See list](../changelog-server.md#23-4) ||

‎ydb/docs/en/core/downloads/ydb-cli.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66

77
Version | Release date | Download | Changelog
88
:--- | :--- | :--- | :---
9-
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/linux/amd64/ydb) | [See list](../../../changelog-cli.md#2-20-0)
10-
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/linux/amd64/ydb) | [See list](../../../changelog-cli.md#2-19-0)
11-
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/linux/amd64/ydb) | [See list](../../../changelog-cli.md#2-18-0)
12-
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/linux/amd64/ydb) | [See list](../../../changelog-cli.md#2-17-0)
13-
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/linux/amd64/ydb) | [See list](../../../changelog-cli.md#2-16-0)
9+
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/linux/amd64/ydb) | [See list](../changelog-cli.md#2-20-0)
10+
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/linux/amd64/ydb) | [See list](../changelog-cli.md#2-19-0)
11+
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/linux/amd64/ydb) | [See list](../changelog-cli.md#2-18-0)
12+
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/linux/amd64/ydb) | [See list](../changelog-cli.md#2-17-0)
13+
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/linux/amd64/ydb) | [See list](../changelog-cli.md#2-16-0)
1414
v.2.15.0 | 17.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.15.0/linux/amd64/ydb)
1515
v.2.14.0 | 03.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.14.0/linux/amd64/ydb)
1616
v.2.13.0 | 23.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.13.0/linux/amd64/ydb)
1717
v.2.12.0 | 19.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.12.0/linux/amd64/ydb)
1818
v.2.11.0 | 15.07.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.11.0/linux/amd64/ydb)
19-
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/linux/amd64/ydb) | [See list](../../../changelog-cli.md#2-10-0)
19+
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/linux/amd64/ydb) | [See list](../changelog-cli.md#2-10-0)
2020

2121
## Linux (arm64)
2222

2323
Version | Release date | Download | Changelog
2424
:--- | :--- | :--- | :---
25-
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/linux/arm64/ydb) | [See list](../../../changelog-cli.md#2-20-0)
26-
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/linux/arm64/ydb) | [See list](../../../changelog-cli.md#2-19-0)
27-
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/linux/arm64/ydb) | [See list](../../../changelog-cli.md#2-18-0)
28-
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/linux/arm64/ydb) | [See list](../../../changelog-cli.md#2-17-0)
29-
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/linux/arm64/ydb) | [See list](../../../changelog-cli.md#2-16-0)
25+
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/linux/arm64/ydb) | [See list](../changelog-cli.md#2-20-0)
26+
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/linux/arm64/ydb) | [See list](../changelog-cli.md#2-19-0)
27+
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/linux/arm64/ydb) | [See list](../changelog-cli.md#2-18-0)
28+
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/linux/arm64/ydb) | [See list](../changelog-cli.md#2-17-0)
29+
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/linux/arm64/ydb) | [See list](../changelog-cli.md#2-16-0)
3030
v.2.15.0 | 17.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.15.0/linux/arm64/ydb)
3131
v.2.14.0 | 03.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.14.0/linux/arm64/ydb)
3232

@@ -36,48 +36,48 @@ Use the amd64 binary file if your Mac is based on an Intel processor.
3636

3737
Version | Release date | Download | Changelog
3838
:--- | :--- | :--- | :---
39-
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/darwin/amd64/ydb) | [See list](../../../changelog-cli.md#2-20-0)
40-
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/darwin/amd64/ydb) | [See list](../../../changelog-cli.md#2-19-0)
41-
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/darwin/amd64/ydb) | [See list](../../../changelog-cli.md#2-18-0)
42-
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/darwin/amd64/ydb) | [See list](../../../changelog-cli.md#2-17-0)
43-
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/darwin/amd64/ydb) | [See list](../../../changelog-cli.md#2-16-0)
39+
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/darwin/amd64/ydb) | [See list](../changelog-cli.md#2-20-0)
40+
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/darwin/amd64/ydb) | [See list](../changelog-cli.md#2-19-0)
41+
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/darwin/amd64/ydb) | [See list](../changelog-cli.md#2-18-0)
42+
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/darwin/amd64/ydb) | [See list](../changelog-cli.md#2-17-0)
43+
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/darwin/amd64/ydb) | [See list](../changelog-cli.md#2-16-0)
4444
v.2.15.0 | 17.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.15.0/darwin/amd64/ydb)
4545
v.2.14.0 | 03.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.14.0/darwin/amd64/ydb)
4646
v.2.13.0 | 23.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.13.0/darwin/amd64/ydb)
4747
v.2.12.0 | 19.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.12.0/darwin/amd64/ydb)
4848
v.2.11.0 | 15.07.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.11.0/darwin/amd64/ydb)
49-
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/darwin/amd64/ydb) | [See list](../../../changelog-cli.md#2-10-0)
49+
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/darwin/amd64/ydb) | [See list](../changelog-cli.md#2-10-0)
5050

5151
## macOS (Apple Silicon)
5252

5353
Use the arm64 binary file if your Mac is based on an Apple Silicon processor (M1, M2, or later).
5454

5555
Version | Release date | Download | Changelog
5656
:--- | :--- | :--- | :---
57-
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/darwin/arm64/ydb) | [See list](../../../changelog-cli.md#2-20-0)
58-
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/darwin/arm64/ydb) | [See list](../../../changelog-cli.md#2-19-0)
59-
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/darwin/arm64/ydb) | [See list](../../../changelog-cli.md#2-18-0)
60-
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/darwin/arm64/ydb) | [See list](../../../changelog-cli.md#2-17-0)
61-
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/darwin/arm64/ydb) | [See list](../../../changelog-cli.md#2-16-0)
57+
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/darwin/arm64/ydb) | [See list](../changelog-cli.md#2-20-0)
58+
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/darwin/arm64/ydb) | [See list](../changelog-cli.md#2-19-0)
59+
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/darwin/arm64/ydb) | [See list](../changelog-cli.md#2-18-0)
60+
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/darwin/arm64/ydb) | [See list](../changelog-cli.md#2-17-0)
61+
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/darwin/arm64/ydb) | [See list](../changelog-cli.md#2-16-0)
6262
v.2.15.0 | 17.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.15.0/darwin/arm64/ydb)
6363
v.2.14.0 | 03.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.14.0/darwin/arm64/ydb)
6464
v.2.13.0 | 23.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.13.0/darwin/arm64/ydb)
6565
v.2.12.0 | 19.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.12.0/darwin/arm64/ydb)
6666
v.2.11.0 | 15.07.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.11.0/darwin/arm64/ydb)
67-
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/darwin/arm64/ydb) | [See list](../../../changelog-cli.md#2-10-0)
67+
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/darwin/arm64/ydb) | [See list](../changelog-cli.md#2-10-0)
6868

6969
## Windows
7070

7171
Version | Release date | Download | Changelog
7272
:--- | :--- | :--- | :---
73-
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/windows/amd64/ydb.exe) | [See list](../../../changelog-cli.md#2-20-0)
74-
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/windows/amd64/ydb.exe) | [See list](../../../changelog-cli.md#2-19-0)
75-
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/windows/amd64/ydb.exe) | [See list](../../../changelog-cli.md#2-18-0)
76-
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/windows/amd64/ydb.exe) | [See list](../../../changelog-cli.md#2-17-0)
77-
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/windows/amd64/ydb.exe) | [See list](../../../changelog-cli.md#2-16-0)
73+
v.2.20.0 | 05.03.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.20.0/windows/amd64/ydb.exe) | [See list](../changelog-cli.md#2-20-0)
74+
v.2.19.0 | 05.02.2025 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.19.0/windows/amd64/ydb.exe) | [See list](../changelog-cli.md#2-19-0)
75+
v.2.18.0 | 24.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.18.0/windows/amd64/ydb.exe) | [See list](../changelog-cli.md#2-18-0)
76+
v.2.17.0 | 04.12.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.17.0/windows/amd64/ydb.exe) | [See list](../changelog-cli.md#2-17-0)
77+
v.2.16.0 | 26.11.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.16.0/windows/amd64/ydb.exe) | [See list](../changelog-cli.md#2-16-0)
7878
v.2.15.0 | 17.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.15.0/windows/amd64/ydb.exe)
7979
v.2.14.0 | 03.10.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.14.0/windows/amd64/ydb.exe)
8080
v.2.13.0 | 23.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.13.0/windows/amd64/ydb.exe)
8181
v.2.12.0 | 19.09.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.12.0/windows/amd64/ydb.exe)
8282
v.2.11.0 | 15.07.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.11.0/windows/amd64/ydb.exe)
83-
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/windows/amd64/ydb.exe) | [See list](../../../changelog-cli.md#2-10-0)
83+
v.2.10.0 | 24.06.24 | [Binary file](https://storage.yandexcloud.net/yandexcloud-ydb/release/2.10.0/windows/amd64/ydb.exe) | [See list](../changelog-cli.md#2-10-0)

0 commit comments

Comments
 (0)