From 8d63689b17d4cfd3c6b69f9478ec6fff0810fd13 Mon Sep 17 00:00:00 2001 From: ana-uvarova Date: Wed, 30 Dec 2020 02:53:44 +0300 Subject: [PATCH] content fix --- .../server-configuration-parameters/settings.md | 16 +++++++++++++++- docs/en/operations/system-tables/metric_log.md | 2 +- .../server-configuration-parameters/settings.md | 16 +++++++++++++++- docs/ru/operations/system-tables/metric_log.md | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md index 78402e8e7a..6fba98892f 100644 --- a/docs/en/operations/server-configuration-parameters/settings.md +++ b/docs/en/operations/server-configuration-parameters/settings.md @@ -569,7 +569,11 @@ For more information, see the MergeTreeSettings.h header file. ## metric_log {#metric_log} -To turn on metrics history collection on [`system.metric_log`](../../operations/system-tables/metric_log.md), create `/etc/clickhouse-server/config.d/metric_log.xml` with following content: +It is enabled by default. If it`s not, you can do this manually. + +**Enabling** + +To manually turn on metrics history collection [`system.metric_log`](../../operations/system-tables/metric_log.md), create `/etc/clickhouse-server/config.d/metric_log.xml` with the following content: ``` xml @@ -582,6 +586,16 @@ To turn on metrics history collection on [`system.metric_log`](../../operations/ ``` +**Disabling** + +To disable `metric_log` setting, you should create the following file `/etc/clickhouse-server/config.d/disable_metric_log.xml` with the following content: + +``` xml + + + +``` + ## replicated_merge_tree {#server_configuration_parameters-replicated_merge_tree} Fine tuning for tables in the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/mergetree.md). diff --git a/docs/en/operations/system-tables/metric_log.md b/docs/en/operations/system-tables/metric_log.md index 8cef5dc093..1f72c9a735 100644 --- a/docs/en/operations/system-tables/metric_log.md +++ b/docs/en/operations/system-tables/metric_log.md @@ -42,7 +42,7 @@ CurrentMetric_DistributedFilesToInsert: 0 **See also** -- [metric_log setting](../../operations/server-configuration-parameters/settings.md#metric_log) — What you should add. +- [metric_log setting](../../operations/server-configuration-parameters/settings.md#metric_log) — Enabling and disabling the setting. - [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md) — Contains periodically calculated metrics. - [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that occurred. - [system.metrics](../../operations/system-tables/metrics.md) — Contains instantly calculated metrics. diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md index 25197b57c1..c858cf9e67 100644 --- a/docs/ru/operations/server-configuration-parameters/settings.md +++ b/docs/ru/operations/server-configuration-parameters/settings.md @@ -558,7 +558,11 @@ ClickHouse проверяет условия для `min_part_size` и `min_part ## metric_log {#metric_log} -Чтобы включить сбор истории метрик в таблице [`system.metric_log`](../../operations/system-tables/metric_log.md), создайте `/etc/clickhouse-server/config.d/metric_log.xml` следующего содержания: +Эта настройка включена по умолчанию. Если это не так, вы можете включить ее сами. + +**Включение** + +Чтобы вручную включить сбор истории метрик в таблице [`system.metric_log`](../../operations/system-tables/metric_log.md), создайте `/etc/clickhouse-server/config.d/metric_log.xml` следующего содержания: ``` xml @@ -571,6 +575,16 @@ ClickHouse проверяет условия для `min_part_size` и `min_part ``` +**Выключение** + +Чтобы отключить настройку `metric_log` , создайте файл `/etc/clickhouse-server/config.d/disable_metric_log.xml` следующего содержания: + +``` xml + + + +``` + ## replicated\_merge\_tree {#server_configuration_parameters-replicated_merge_tree} Тонкая настройка таблиц в [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/mergetree.md). diff --git a/docs/ru/operations/system-tables/metric_log.md b/docs/ru/operations/system-tables/metric_log.md index 2bd23dd2c6..2458c93da5 100644 --- a/docs/ru/operations/system-tables/metric_log.md +++ b/docs/ru/operations/system-tables/metric_log.md @@ -42,7 +42,7 @@ CurrentMetric_ReplicatedChecks: 0 **Смотрите также** -- [Настройка metric_log](../../operations/server-configuration-parameters/settings.md#metric_log) — то, что вы должны добавить для записи истории. +- [Настройка metric_log](../../operations/server-configuration-parameters/settings.md#metric_log) — как включить и выключить запись истории. - [system.asynchronous_metrics](#system_tables-asynchronous_metrics) — таблица с периодически вычисляемыми метриками. - [system.events](#system_tables-events) — таблица с количеством произошедших событий. - [system.metrics](#system_tables-metrics) — таблица с мгновенно вычисляемыми метриками. -- GitLab