From 0cff929ed8e8c37881d255fab6a4774a45a1fff8 Mon Sep 17 00:00:00 2001 From: Eric Shen Date: Mon, 4 Nov 2019 11:29:10 +0800 Subject: [PATCH 1/2] cherry pick #13024 to release-2.1 Signed-off-by: sre-bot --- config/config.toml.example | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/config/config.toml.example b/config/config.toml.example index af4780e94b1d2..6aaf8c45f513c 100644 --- a/config/config.toml.example +++ b/config/config.toml.example @@ -128,13 +128,22 @@ cluster-ssl-key = "" # If enable status report HTTP service. report-status = true +<<<<<<< HEAD +======= +# TiDB status host. +status-host = "0.0.0.0" + +## status-host is the HTTP address for reporting the internal status of a TiDB server, for example: +## API for prometheus: http://${status-host}:${status_port}/metrics +## API for pprof: http://${status-host}:${status_port}/debug/pprof +>>>>>>> 97061e8... update explaination of status and metrics configs (#13024) # TiDB status port. status-port = 10080 -# Prometheus pushgateway address, leaves it empty will disable prometheus push. +# Prometheus pushgateway address, leaves it empty will disable push to pushgateway. metrics-addr = "" -# Prometheus client push interval in second, set \"0\" to disable prometheus push. +# Prometheus client push interval in second, set \"0\" to disable push to pushgateway. metrics-interval = 15 [performance] From a635043b2505d9711f820d33b43c38f2052e8894 Mon Sep 17 00:00:00 2001 From: xuhuaiyu <391585975@qq.com> Date: Mon, 13 Apr 2020 15:41:01 +0800 Subject: [PATCH 2/2] resolve conflicts --- config/config.toml.example | 9 --------- 1 file changed, 9 deletions(-) diff --git a/config/config.toml.example b/config/config.toml.example index 6aaf8c45f513c..e29ef4443475b 100644 --- a/config/config.toml.example +++ b/config/config.toml.example @@ -128,15 +128,6 @@ cluster-ssl-key = "" # If enable status report HTTP service. report-status = true -<<<<<<< HEAD -======= -# TiDB status host. -status-host = "0.0.0.0" - -## status-host is the HTTP address for reporting the internal status of a TiDB server, for example: -## API for prometheus: http://${status-host}:${status_port}/metrics -## API for pprof: http://${status-host}:${status_port}/debug/pprof ->>>>>>> 97061e8... update explaination of status and metrics configs (#13024) # TiDB status port. status-port = 10080