This is an automated email from the ASF dual-hosted git repository.
lichaoyong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new e9f7576 [Enhancement] make metrics api more clear (#3891)
e9f7576 is described below
commit e9f7576b9d39ff4215aca52913c162eba4540fe1
Author: lichaoyong <[email protected]>
AuthorDate: Wed Jun 17 12:17:54 2020 +0800
[Enhancement] make metrics api more clear (#3891)
---
be/src/http/action/metrics_action.cpp | 2 +-
docs/en/administrator-guide/operation/monitor-metrics/be-metrics.md | 2 +-
docs/en/administrator-guide/operation/monitor-metrics/fe-metrics.md | 2 +-
docs/zh-CN/administrator-guide/operation/monitor-metrics/be-metrics.md | 2 +-
docs/zh-CN/administrator-guide/operation/monitor-metrics/fe-metrics.md | 2 +-
fe/src/main/java/org/apache/doris/http/rest/MetricsAction.java | 3 ++-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/be/src/http/action/metrics_action.cpp
b/be/src/http/action/metrics_action.cpp
index b487820..a84efea 100644
--- a/be/src/http/action/metrics_action.cpp
+++ b/be/src/http/action/metrics_action.cpp
@@ -210,7 +210,7 @@ void MetricsAction::handle(HttpRequest* req) {
SimpleCoreMetricsVisitor visitor;
_metrics->collect(&visitor);
str.assign(visitor.to_string());
- } else if (type == "agent") {
+ } else if (type == "json") {
JsonMetricsVisitor visitor;
_metrics->collect(&visitor);
str.assign(visitor.to_string());
diff --git
a/docs/en/administrator-guide/operation/monitor-metrics/be-metrics.md
b/docs/en/administrator-guide/operation/monitor-metrics/be-metrics.md
index e2b7d03..642228f 100644
--- a/docs/en/administrator-guide/operation/monitor-metrics/be-metrics.md
+++ b/docs/en/administrator-guide/operation/monitor-metrics/be-metrics.md
@@ -40,7 +40,7 @@ The default format is of [Prometheus](https://prometheus.io/).
You can get Json format by visiting:
-`http://be_host:be_webserver_port/metrics?type=agent`
+`http://be_host:be_webserver_port/metrics?type=json`
## Metrics List
diff --git
a/docs/en/administrator-guide/operation/monitor-metrics/fe-metrics.md
b/docs/en/administrator-guide/operation/monitor-metrics/fe-metrics.md
index 5406e7c..9c5487f 100644
--- a/docs/en/administrator-guide/operation/monitor-metrics/fe-metrics.md
+++ b/docs/en/administrator-guide/operation/monitor-metrics/fe-metrics.md
@@ -40,7 +40,7 @@ The default format is of [Prometheus](https://prometheus.io/).
You can get Json format by visiting:
-`http://fe_host:fe_http_port/metrics?type=agent`
+`http://fe_host:fe_http_port/metrics?type=json`
## Metrics List
diff --git
a/docs/zh-CN/administrator-guide/operation/monitor-metrics/be-metrics.md
b/docs/zh-CN/administrator-guide/operation/monitor-metrics/be-metrics.md
index 529de29..1a2afde 100644
--- a/docs/zh-CN/administrator-guide/operation/monitor-metrics/be-metrics.md
+++ b/docs/zh-CN/administrator-guide/operation/monitor-metrics/be-metrics.md
@@ -40,7 +40,7 @@ BE 的监控项可以通过以下方式访问：
通过以下接口可以获取 Json 格式的监控项：
-`http://be_host:be_webserver_port/metrics?type=agent`
+`http://be_host:be_webserver_port/metrics?type=json`
## 监控项列表
diff --git
a/docs/zh-CN/administrator-guide/operation/monitor-metrics/fe-metrics.md
b/docs/zh-CN/administrator-guide/operation/monitor-metrics/fe-metrics.md
index 3ac23f5..a938ae6 100644
--- a/docs/zh-CN/administrator-guide/operation/monitor-metrics/fe-metrics.md
+++ b/docs/zh-CN/administrator-guide/operation/monitor-metrics/fe-metrics.md
@@ -40,7 +40,7 @@ FE 的监控项可以通过以下方式访问：
通过以下接口可以获取 Json 格式的监控项：
-`http://fe_host:fe_http_port/metrics?type=agent`
+`http://fe_host:fe_http_port/metrics?type=json`
## 监控项列表
diff --git a/fe/src/main/java/org/apache/doris/http/rest/MetricsAction.java
b/fe/src/main/java/org/apache/doris/http/rest/MetricsAction.java
index 24a6224..34bc785 100644
--- a/fe/src/main/java/org/apache/doris/http/rest/MetricsAction.java
+++ b/fe/src/main/java/org/apache/doris/http/rest/MetricsAction.java
@@ -33,6 +33,7 @@ import io.netty.handler.codec.http.HttpMethod;
//fehost:port/metrics
//fehost:port/metrics?type=core
+//fehost:port/metrics?type=json
public class MetricsAction extends RestBaseAction {
private static final String TYPE_PARAM = "type";
@@ -51,7 +52,7 @@ public class MetricsAction extends RestBaseAction {
MetricVisitor visitor = null;
if (!Strings.isNullOrEmpty(type) && type.equalsIgnoreCase("core")) {
visitor = new SimpleCoreMetricVisitor("doris_fe");
- } else if (!Strings.isNullOrEmpty(type) &&
type.equalsIgnoreCase("agent")) {
+ } else if (!Strings.isNullOrEmpty(type) &&
type.equalsIgnoreCase("json")) {
visitor = new JsonMetricVisitor("doris_fe");
} else {
visitor = new PrometheusMetricVisitor("doris_fe");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
