summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralextarazanov <[email protected]>2022-07-22 19:06:28 +0300
committeralextarazanov <[email protected]>2022-07-22 19:06:28 +0300
commit53cae097d98bccd95048505fbc65d07f0437b735 (patch)
tree34a6ca681ccc0b835cfe11ad3901030b7ee90566
parent87c6f45c83789bf0e399b6b64ca7ac7324c2abed (diff)
[YDB] Move monitoring translate check
-rw-r--r--ydb/docs/en/core/_assets/grafana-actors.pngbin0 -> 69318 bytes
-rw-r--r--ydb/docs/en/core/administration/grafana-dashboards.md68
-rw-r--r--ydb/docs/en/core/administration/monitoring.md48
-rw-r--r--ydb/docs/en/core/cluster/_includes/addition_overlay.md0
-rw-r--r--ydb/docs/en/core/cluster/index.md17
-rw-r--r--ydb/docs/en/core/cluster/toc_i.yaml10
-rw-r--r--ydb/docs/en/core/db/toc_i.yaml3
-rw-r--r--ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md60
-rw-r--r--ydb/docs/en/core/maintenance/embedded_monitoring/index.md3
-rw-r--r--ydb/docs/en/core/troubleshooting/_includes/grafana_dashboards.md67
-rw-r--r--ydb/docs/en/core/troubleshooting/_includes/index.md8
-rw-r--r--ydb/docs/en/core/troubleshooting/_includes/system_views/intro_cluster.md7
-rw-r--r--ydb/docs/en/core/troubleshooting/index.md8
-rw-r--r--ydb/docs/en/core/troubleshooting/system_views_cluster.md2
-rw-r--r--ydb/docs/en/core/troubleshooting/toc_i.yaml2
-rw-r--r--ydb/docs/ru/core/administration/monitoring.md2
-rw-r--r--ydb/docs/ru/core/cluster/index.md2
17 files changed, 172 insertions, 135 deletions
diff --git a/ydb/docs/en/core/_assets/grafana-actors.png b/ydb/docs/en/core/_assets/grafana-actors.png
new file mode 100644
index 00000000000..90b6f21e04b
--- /dev/null
+++ b/ydb/docs/en/core/_assets/grafana-actors.png
Binary files differ
diff --git a/ydb/docs/en/core/administration/grafana-dashboards.md b/ydb/docs/en/core/administration/grafana-dashboards.md
new file mode 100644
index 00000000000..a2552187d1f
--- /dev/null
+++ b/ydb/docs/en/core/administration/grafana-dashboards.md
@@ -0,0 +1,68 @@
+# Grafana dashboards
+
+This page describes Grafana dashboards for {{ ydb-short-name }}. For information about how to install dashboards, see [{#T}](monitoring.md#prometheus-grafana).
+
+## DB status {#dbstatus}
+
+General database dashboard.
+
+## Actors {#actors}
+
+CPU utilization in an actor system.
+
+| Name | Description |
+|---|---|
+| CPU by execution pool (us) | CPU utilization in different execution pools across all nodes, microseconds per second (one million indicates utilization of a single core) |
+| Actor count | Number of actors (by actor type) |
+| CPU | CPU utilization in different execution pools (by actor type) |
+| Events | Actor system event handling metrics |
+
+## gRPC {#grpc}
+
+gRPC layer metrics.
+
+| Name | Description |
+|---|---|
+| Requests | Number of requests received by a database per second (by gRPC method type) |
+| Request bytes | Size of database requests, bytes per second (by gRPC method type) |
+| Response bytes | Size of database responses, bytes per second (by gRPC method type) |
+| Dropped requests | Number of requests per second with processing terminated at the transport layer due to an error (by gRPC method type) |
+| Dropped responses | Number of responses per second with sending terminated at the transport layer due to an error (by gRPC method type) |
+| Requests in flight | Number of requests that a database is simultaneously handling (by gRPC method type) |
+| Request bytes in flight | Size of requests that a database is simultaneously handling (by gRPC method type) |
+
+## Query engine {#queryengine}
+
+Information about the query engine.
+
+| Name | Description |
+|---|---|
+| Requests | Number of incoming requests per second (by request type) |
+| Request bytes | Size of incoming requests, bytes per second (query, parameters, total) |
+| Responses | Number of responses per second (by response type) |
+| Response bytes | Response size, bytes per second (total, query result) |
+| Sessions | Information about running sessions |
+| Latencies | Request execution time histograms for different types of requests |
+
+## TxProxy {#txproxy}
+
+Information about transactions from the DataShard transaction proxy layer.
+
+| Name | Description |
+|---|---|
+| Transactions | Datashard transaction metrics |
+| Latencies | Execution time histograms for different stages of datashard transactions |
+
+## DataShard {#datashard}
+
+DataShard tablet metrics.
+
+| Name | Description |
+|---|---|
+| Operations | Datashard operation statistics for different types of operations |
+| Transactions | Information about datashard tablet transactions (by transaction type) |
+| Latencies | Execution time histograms for different stages of custom transactions |
+| Tablet latencies | Tablet transaction execution time histograms |
+| Compactions | Information about LSM compaction operations performed |
+| ReadSets | Information about ReadSets that are sent when executing a customer transaction |
+| Other | Other metrics |
diff --git a/ydb/docs/en/core/administration/monitoring.md b/ydb/docs/en/core/administration/monitoring.md
new file mode 100644
index 00000000000..8ea79cb5efd
--- /dev/null
+++ b/ydb/docs/en/core/administration/monitoring.md
@@ -0,0 +1,48 @@
+# Setting up monitoring for a local {{ ydb-short-name }} cluster
+
+This page provides instructions on how to set up monitoring for a local YDB cluster that is [run from a binary file](../getting_started/self_hosted/ydb_local.md).
+
+{{ ydb-short-name }} has multiple system health sensors. Instant sensor values are available in the web interface:
+
+```http
+http://localhost:31002/counters/
+```
+
+Linked sensors are grouped into a subgroup (such as `counters auth`). To only view sensor values for a particular subgroup, follow a URL like:
+
+```http
+http://localhost:31002/counters/counters=<servicename>/
+```
+
+* `<servicename>`: Sensor subgroup name.
+
+> For example, data about the utilization of server hardware resources is available at the URL:
+>
+> ```http
+> http://localhost:31002/counters/counters=utils
+> ```
+
+You can collect metric values using [Prometheus](https://prometheus.io/), a popular open-source tool. {{ ydb-short-name }} sensor values in [Prometheus format](https://prometheus.io/docs/instrumenting/exposition_formats/) are available at a URL in the following format:
+
+```http
+http://localhost:31002/counters/counters=<servicename>/prometheus
+```
+
+* `<servicename>`: Sensor subgroup name.
+
+To visualize data, use any system that supports Prometheus, such as [Zabbix]{% if lang == "ru" %}(https://www.zabbix.com/ru/){% endif %}{% if lang == "en" %}(https://www.zabbix.com/){% endif %}, [Amazon CloudWatch]{% if lang == "ru" %}(https://aws.amazon.com/ru/cloudwatch/){% endif %}{% if lang == "en" %}(https://aws.amazon.com/cloudwatch/){% endif %}, or [Grafana](https://grafana.com/):
+
+![grafana-actors](../_assets/grafana-actors.png)
+
+## Setting up monitoring with Prometheus and Grafana {#prometheus-grafana}
+
+To set up monitoring for a local single-node {{ ydb-short-name }} cluster using [Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/):
+
+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).
+1. [Install and start](https://grafana.com/docs/grafana/latest/getting-started/getting-started/) the Grafana.
+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.
+1. Upload [{{ ydb-short-name }} dashboards](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/) to Grafana.
+
+ 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.
+
+ Review the dashboard [metric reference](grafana-dashboards.md).
diff --git a/ydb/docs/en/core/cluster/_includes/addition_overlay.md b/ydb/docs/en/core/cluster/_includes/addition_overlay.md
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/ydb/docs/en/core/cluster/_includes/addition_overlay.md
+++ /dev/null
diff --git a/ydb/docs/en/core/cluster/index.md b/ydb/docs/en/core/cluster/index.md
index 07178049d8e..f23755b38db 100644
--- a/ydb/docs/en/core/cluster/index.md
+++ b/ydb/docs/en/core/cluster/index.md
@@ -1,12 +1,9 @@
-# Managing a YDB cluster
+# Managing a {{ ydb-short-name }} cluster
-This section contains articles on procedures of deployment, configuration, maintenance, monitoring and troubleshooting of multi-node YDB clusters.
-
-Articles are based on the description of cluster structure provided in [Concepts - Cluster](../concepts/cluster/index.md).
-
-{% include [addition_overlay](_includes/addition_overlay.md) %}
-
-- [Cluster deployment and configuration](../deploy/index.md) in Kubernetes and on virtual / baremetal servers
-- [Embedded UI](../maintenance/embedded_monitoring/index.md)
-- [Cluster system tables](../troubleshooting/system_views_cluster.md)
+This section provides information about deploying, configuring, maintaining, monitoring, and performing diagnostics of multi-node [{{ ydb-short-name }} clusters](../concepts/cluster/index.md).
+* [{#T}](../deploy/index.md).
+* [{#T}](../maintenance/embedded_monitoring/index.md).
+* [{#T}](../maintenance/manual/index.md).
+* [{#T}](../troubleshooting/system_views_cluster.md).
+* [{#T}](../administration/monitoring.md).
diff --git a/ydb/docs/en/core/cluster/toc_i.yaml b/ydb/docs/en/core/cluster/toc_i.yaml
index a10133b3a8e..9ec6c117881 100644
--- a/ydb/docs/en/core/cluster/toc_i.yaml
+++ b/ydb/docs/en/core/cluster/toc_i.yaml
@@ -5,5 +5,11 @@ items:
include: { mode: link, path: ../maintenance/manual/toc_p.yaml }
- name: Embedded UI
include: { mode: link, path: ../maintenance/embedded_monitoring/toc_p.yaml }
-- name: System views
- href: ../troubleshooting/system_views_cluster.md \ No newline at end of file
+- name: Cluster system views
+ href: ../troubleshooting/system_views_cluster.md
+- name: Monitoring
+ items:
+ - name: Setting up monitoring for a local YDB cluster
+ href: ../administration/monitoring.md
+ - name: Grafana dashboards
+ href: ../administration/grafana-dashboards.md
diff --git a/ydb/docs/en/core/db/toc_i.yaml b/ydb/docs/en/core/db/toc_i.yaml
index b76479eb233..0657e8201ad 100644
--- a/ydb/docs/en/core/db/toc_i.yaml
+++ b/ydb/docs/en/core/db/toc_i.yaml
@@ -2,4 +2,7 @@ items:
- name: Backup and recovery
href: ../maintenance/backup_and_recovery.md
- name: Diagnostics
+ hidden: true
include: { mode: link, path: ../troubleshooting/toc_p.yaml }
+- name: DB system views
+ href: ../troubleshooting/system_views_db.md
diff --git a/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md b/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md
index 7da871050bd..4636bc4da51 100644
--- a/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md
+++ b/ydb/docs/en/core/getting_started/self_hosted/_includes/ydb_local.md
@@ -1,18 +1,18 @@
# Running {{ ydb-short-name }} from a binary file
-This section describes how to deploy a local single-node {{ ydb-short-name }} cluster using a compiled binary file. Currently, the system **only supports builds for Linux**. Support for Windows and MacOS builds will be added later.
+This section describes how to deploy a local single-node {{ ydb-short-name }} cluster using a built binary file. Currently, **only a Linux build** is supported. Support for Windows and MacOS builds will be added later.
## Connection parameters {#conn}
-As a result of completing the steps below, you'll get a YDB database running on a local machine that you can connect to using the following:
+As a result of completing the steps described below, you'll get a YDB database running on your local machine, which you can connect to using the following parameters:
- [Endpoint](../../../concepts/connect.md#endpoint): `grpc://localhost:2136`
-- [Database location](../../../concepts/connect.md#database): `/Root/test`
-- [Authentication](../../../concepts/connect.md#auth-modes): Anonymous (without authentication)
+- [DB path](../../../concepts/connect.md#database): `/Root/test`
+- [Authentication](../../../concepts/connect.md#auth-modes): Anonymous (no authentication)
## Installation {#install}
-Create a working directory. Run the script for downloading an archive with the `ydbd` executable file and the necessary {{ ydb-short-name }} libraries, and a set of scripts and auxiliary files for starting and stopping the server:
+Create a working directory. In this directory, run a script to download an archive with the `ydbd` executable file and libraries required for using {{ ydb-short-name }}, as well as a set of scripts and auxiliary files to start and stop a server:
```bash
curl https://binaries.ydb.tech/local_scripts/install.sh | bash
@@ -22,35 +22,35 @@ curl https://binaries.ydb.tech/local_scripts/install.sh | bash
## Starting {#start}
-The local YDB server can be started in disk or in-memory mode:
+You can start a local YDB server with a disk or in-memory storage:
{% list tabs %}
-- Storing data on disk
+- Disk storage
- - To store data on disk, when running the script for the first time, a 64 GB file named `ydb.data` is created in the working directory. Make sure you have enough free space to create it.
+ - To store data on a disk, when you run the script for the first time, a 64GB `ydb.data` file is created in the working directory. Make sure there's enough disk space to create it.
- - Run the following command from the working directory:
+ - Run the following command from the working directory:
- ```bash
- ./start.sh disk
- ```
+ ```bash
+ ./start.sh disk
+ ```
-- Storing data in memory
+- In-memory storage
- - When using in-memory data storage, the data is lost when stopping the server.
+ - When data is stored in memory, it will be lost if the server is stopped.
- - Run the following command from the working directory:
+ - Run the following command from the working directory:
- ```bash
- ./start.sh ram
- ```
+ ```bash
+ ./start.sh ram
+ ```
{% endlist %}
-The YDB server is started in the context of the current terminal window. Closing the terminal window stops the server.
+The YDB server is started in the current terminal window context. Closing the window stops the server.
-If you get an error saying `Failed to set up IC listener on port 19001 errno# 98 (Address already in use)` at startup, the server might have already been started and you should stop it with the `stop.sh` script (see below).
+If you see an error saying `Failed to set up IC listener on port 19001 errno# 98 (Address already in use)` when you make an attempt to start the server, then the server may already be running and you should stop it using the `stop.sh` script (see bellow).
## Stopping {#stop}
@@ -62,7 +62,7 @@ To stop the server, run the following command in the working directory:
## Making queries via the YDB CLI {#cli}
-[Install the YDB CLI](../../../reference/ydb-cli/install.md) and execute queries as described in [YDB CLI - Getting started](../../cli.md) using the endpoint and database location specified [at the beginning of this article](#conn). For example:
+[Install the YDB CLI](../../../reference/ydb-cli/install.md) and make queries as described in [YDB CLI - Getting started](../../cli.md). To do this, use the endpoint and DB path specified [in the beginning of this article](#conn). For example:
```bash
ydb -e grpc://localhost:2136 -d /Root/test scheme ls
@@ -70,20 +70,8 @@ ydb -e grpc://localhost:2136 -d /Root/test scheme ls
## Working with the database via the Web UI {#web-ui}
-To work with the DB structure and data, you can also use the web interface embedded in the `ydbd` process. It is available at `http://localhost:8765`. For more information about the embedded web interface, see [Embedded UI](../../../maintenance/embedded_monitoring/ydb_monitoring.md).
+To work with the DB structure and data, you can also use a web interface that is embedded in the `ydbd` process and available at `http://localhost:8765`. For more details about the embedded web interface, see [Embedded UI](../../../maintenance/embedded_monitoring/ydb_monitoring.md).
+## Additional features {#advanced}
-## Monitoring database using Grafana and Prometheus {#dashboards}
-
-The local YDB server may be integrated with [Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/), popular open source tools for metrics gathering and visualization. To setup standard [dashboards](../../../troubleshooting/grafana_dashboards.html), follow these instructions:
-
-1. [Install and run](https://prometheus.io/docs/prometheus/latest/getting_started/#downloading-and-running-prometheus) Prometheus with this [configuration file](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/local_ydb_prometheus.yml).
-1. [Install and run](https://grafana.com/docs/grafana/latest/getting-started/getting-started/) Grafana.
-1. [Create](https://prometheus.io/docs/visualization/grafana/#creating-a-prometheus-data-source) datasource of type "prometheus" in Grafana and connect it to your Prometheus instance.
-1. Upload [dashboards](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/) to Grafana. You may upload dashboards manually via Grafana UI [Import](https://grafana.com/docs/grafana/latest/dashboards/export-import/#import-dashboard) function or use simple [script](https://github.com/ydb-platform/ydb/tree/main/ydb/deploy/grafana_dashboards/local_upload_dashboards.sh). Please note that the script uses [basic authentification](https://grafana.com/docs/grafana/latest/http_api/create-api-tokens-for-org/#authentication) in Grafana. For other cases, adjust the script accordingly.
-
-
-## Advanced options {#advanced}
-
-Instructions on how to deploy multi-node clusters and configure them are given in [Deploy YDB on-premises](../../../deploy/manual/deploy-ydb-on-premises.md) in the "Cluster management" section.
-
+For information about how to deploy multi-node clusters and configure them, see [Managing a cluster](../../../deploy/index.md).
diff --git a/ydb/docs/en/core/maintenance/embedded_monitoring/index.md b/ydb/docs/en/core/maintenance/embedded_monitoring/index.md
index 05cd6e80fba..10bc860d8ae 100644
--- a/ydb/docs/en/core/maintenance/embedded_monitoring/index.md
+++ b/ydb/docs/en/core/maintenance/embedded_monitoring/index.md
@@ -1,4 +1,4 @@
-# Embedded UI
+# Using the embedded web UI
{{ ydb-short-name }} provides tools for monitoring and determining system health:
@@ -6,4 +6,3 @@
* [Interconnect overview](interconnect_overview.md): The state of cluster interconnects.
* [Logs](logs.md): Each {{ ydb-short-name }} component writes messages to logs of different levels. They can be used to detect severe issues or identify the root causes of issues.
* [Charts](charts.md): {{ ydb-short-name }} collects a range of metrics that can be used to determine the health of the entire system or of a specific component.
-
diff --git a/ydb/docs/en/core/troubleshooting/_includes/grafana_dashboards.md b/ydb/docs/en/core/troubleshooting/_includes/grafana_dashboards.md
deleted file mode 100644
index 2dfe81c32bd..00000000000
--- a/ydb/docs/en/core/troubleshooting/_includes/grafana_dashboards.md
+++ /dev/null
@@ -1,67 +0,0 @@
-## {{ ydb-full-name }} {#ydb}
-
-### DB status {#dbstatus}
-
-Database overview.
-
-### Actors {#actors}
-
-CPU consumption in actor system.
-
-| **Name** | **Description** |
-|---|---|
-| CPU by execution pool (us) | CPU consumption in different execution pools on all nodes, measured in microseconds per second (one million is one core) |
-| Actor count | Number of actors (by actor type) |
-| CPU | CPU consumption in different execution pools (by actor type) |
-| Events | Metrics of event processing in actor system |
-
-### gRPC {#grpc}
-
-gRPC level metrics.
-
-| **Name** | **Description** |
-|---|---|
-| Requests | Number of requests received by the database per second (by gRPC method) |
-| Request bytes | Size of requests received by the database in bytes per second (by gRPC method) |
-| Response bytes | Size of responses sent by the database in bytes per second (by gRPC method) |
-| Dropped requests | Number of requests dropped at the transport layer due to an error (by gRPC method) |
-| Dropped responses | Number of responses dropped at the transport layer due to an error (by gRPC method) |
-| Requests in flight | Number of requests that a database is simultaneously handling (by gRPC method) |
-| Request bytes in flight | Size of requests that a database is simultaneously handling (by gRPC method) |
-
-### Query engine {#queryengine}
-
-Query engine processing details.
-
-| **Name** | **Description** |
-|---|---|
-| Requests | Number of incoming requests per second (by request type) |
-| Request bytes | Size of incoming requests in bytes per second (query, parameters, total) |
-| Responses | Number of responses per second (by response type) |
-| Response bytes | Size of responses in bytes per second (total, query result) |
-| Sessions | Details about established sessions |
-| Latencies | Histogram latencies of requests for different request types |
-
-### TxProxy {#txproxy}
-
-Details from DataShard transaction proxy level.
-
-| **Name** | **Description** |
-|---|---|
-| Transactions | Metrics of DataShard transactions |
-| Latencies | Histogram latencies of DataShard transaction phases |
-
-### DataShard {#datashard}
-
-DataShard tablet metrics.
-
-| **Name** | **Description** |
-|---|---|
-| Operations | Statistics of DataShard operations for different operation types |
-| Transactions | Information about DataShard transactions (by transaction type) |
-| Latencies | Histograms of execution times of different phases in user transaction processing |
-| Tablet latencies | Histograms of execution times of generic tablet transactions |
-| Compactions | Details of LSM compaction operations |
-| ReadSets | Details of ReadSets sent during user transaction execution |
-| Other | Other metrics |
-
diff --git a/ydb/docs/en/core/troubleshooting/_includes/index.md b/ydb/docs/en/core/troubleshooting/_includes/index.md
deleted file mode 100644
index e4fb7f3e37c..00000000000
--- a/ydb/docs/en/core/troubleshooting/_includes/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Diagnostics
-
-This section contains articles on YDB database diagnostics tools.
-
-- [System tables](../system_views_db.md)
-- [Metrics](../monitoring.md)
-- [Grafana dashboards](../grafana_dashboards.md)
-
diff --git a/ydb/docs/en/core/troubleshooting/_includes/system_views/intro_cluster.md b/ydb/docs/en/core/troubleshooting/_includes/system_views/intro_cluster.md
index 2acdd898470..e678dc5ba81 100644
--- a/ydb/docs/en/core/troubleshooting/_includes/system_views/intro_cluster.md
+++ b/ydb/docs/en/core/troubleshooting/_includes/system_views/intro_cluster.md
@@ -1,8 +1,5 @@
-# Cluster system tables
+To enable internal introspection of the cluster state, the user can make queries to special system views. These tables are accessible from the cluster's root directory and use the `.sys` system path prefix.
-To enable internal introspection of the cluster state, the user can make queries to special service tables (system views). These tables are accessible from the cluster's root directory and use the `.sys` system path prefix.
-
-Usually, cloud database users have no access to cluster system tables, as cluster support and timely diagnostics are the prerogative of the cloud team.
+Cloud database users usually don't have access to cluster system tables, as cluster support and timely diagnostics are the prerogative of the cloud team.
Hereinafter, in the descriptions of available fields, the **Key** column contains the corresponding table's primary key field index.
-
diff --git a/ydb/docs/en/core/troubleshooting/index.md b/ydb/docs/en/core/troubleshooting/index.md
index eb2590567da..38f4912563e 100644
--- a/ydb/docs/en/core/troubleshooting/index.md
+++ b/ydb/docs/en/core/troubleshooting/index.md
@@ -1 +1,7 @@
-{% include [_includes/index.md](_includes/index.md) %} \ No newline at end of file
+# Diagnostics
+
+This section contains articles about YDB database diagnostics tools.
+
+- [System views](system_views_db.md)
+- [Metrics](monitoring.md)
+- [Grafana dashboards](../administration/grafana-dashboards.md)
diff --git a/ydb/docs/en/core/troubleshooting/system_views_cluster.md b/ydb/docs/en/core/troubleshooting/system_views_cluster.md
index 697876861c6..5f3045eda0b 100644
--- a/ydb/docs/en/core/troubleshooting/system_views_cluster.md
+++ b/ydb/docs/en/core/troubleshooting/system_views_cluster.md
@@ -1,3 +1,5 @@
+# Cluster system views
+
{% include [intro.md](_includes/system_views/intro_cluster.md) %}
{% include [distributed_storage.md](_includes/system_views/distributed_storage.md) %}
diff --git a/ydb/docs/en/core/troubleshooting/toc_i.yaml b/ydb/docs/en/core/troubleshooting/toc_i.yaml
index 67d2f78fb78..2639d6c0a58 100644
--- a/ydb/docs/en/core/troubleshooting/toc_i.yaml
+++ b/ydb/docs/en/core/troubleshooting/toc_i.yaml
@@ -3,8 +3,6 @@ items:
href: system_views_db.md
- name: Monitoring
href: monitoring.md
-- name: Grafana dashboards
- href: grafana_dashboards.md
- name: System views (deprecated)
href: system_views.md
hidden: true \ No newline at end of file
diff --git a/ydb/docs/ru/core/administration/monitoring.md b/ydb/docs/ru/core/administration/monitoring.md
index d7b67019118..70791463610 100644
--- a/ydb/docs/ru/core/administration/monitoring.md
+++ b/ydb/docs/ru/core/administration/monitoring.md
@@ -30,7 +30,7 @@ http://localhost:31002/counters/counters=<servicename>/prometheus
* `<servicename>` — имя подгруппы сенсоров.
-Визуализировать данные можно с помощью любой системы, которая поддерживает формат Prometheus, например [Zabbix](https://www.zabbix.com/ru/), [Amazon CloudWatch](https://aws.amazon.com/ru/cloudwatch/) или [Grafana](https://grafana.com/):
+Визуализировать данные можно с помощью любой системы, которая поддерживает формат Prometheus, например [Zabbix]{% if lang == "ru" %}(https://www.zabbix.com/ru/){% endif %}{% if lang == "en" %}(https://www.zabbix.com/){% endif %}, [Amazon CloudWatch]{% if lang == "ru" %}(https://aws.amazon.com/ru/cloudwatch/){% endif %}{% if lang == "en" %}(https://aws.amazon.com/cloudwatch/){% endif %} или [Grafana](https://grafana.com/):
![grafana-actors](../_assets/grafana-actors.png)
diff --git a/ydb/docs/ru/core/cluster/index.md b/ydb/docs/ru/core/cluster/index.md
index 02bc5ee767b..01e4845daa7 100644
--- a/ydb/docs/ru/core/cluster/index.md
+++ b/ydb/docs/ru/core/cluster/index.md
@@ -4,6 +4,6 @@
* [{#T}](../deploy/index.md).
* [{#T}](../maintenance/embedded_monitoring/index.md).
-* [{#T}](../maintenance/manual/index.md)
+* [{#T}](../maintenance/manual/index.md).
* [{#T}](../troubleshooting/system_views_cluster.md).
* [{#T}](../administration/monitoring.md).