You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/11/14 05:23:13 UTC
[servicecomb-website] 01/02: Merge branch 'master' into asf-site
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit 7a40e11068a993f4b9927d23899fc73deb468ba8
Merge: f4bc0bd 457801b
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Wed Nov 14 12:56:32 2018 +0800
Merge branch 'master' into asf-site
_developers/cn/contributing.md | 22 ++++++++++----------
_developers/cn/developer-guide.md | 12 +++++------
_developers/cn/release_guide.md | 16 +++++++--------
_developers/cn/setup-develop-environment.md | 4 ++--
_developers/cn/submit-codes.md | 22 ++++++++++----------
_developers/cn/subscribe-mail-list.md | 6 +++---
_developers/contributing.md | 14 ++++++-------
_developers/developer-guide.md | 12 +++++------
_developers/release_guide.md | 16 +++++++--------
_developers/setup-develop-environment.md | 4 ++--
_developers/submit-codes.md | 24 +++++++++++-----------
_docs/cn/load-balance.md | 2 +-
_docs/cn/quick-start-bmi.md | 2 +-
_docs/cn/quick-start-dataconsistency.md | 6 +++---
_docs/cn/quick-start.md | 4 ++--
_docs/load-balance.md | 2 +-
_docs/quick-start-bmi.md | 2 +-
_docs/quick-start-dataconsistency.md | 6 +++---
_docs/quick-start.md | 4 ++--
_faqs/cn/faq.md | 4 ++--
_faqs/faq.md | 2 +-
_users/cn/deploy-mode.md | 6 +++---
_users/cn/develop-with-jax-rs.md | 4 ++--
_users/cn/develop-with-springboot-starter.md | 2 +-
_users/cn/develop-with-springmvc.md | 4 ++--
_users/cn/develop-with-transparent-rpc.md | 4 ++--
_users/cn/edge-in-1.0.0-m1.md | 2 +-
_users/cn/metrics-in-0.5.0.md | 2 +-
_users/cn/metrics-in-1.0.0-m1.md | 2 +-
...rics-integration-with-prometheus-in-1.0.0-m1.md | 2 +-
...-write-file-extension-and-sample-in-1.0.0-m1.md | 2 +-
_users/cn/setup-environment.md | 6 +++---
_users/develop-with-jax-rs.md | 4 ++--
_users/develop-with-springboot-starter.md | 2 +-
_users/develop-with-springmvc.md | 4 ++--
_users/develop-with-transparent-rpc.md | 4 ++--
_users/edge-in-1.0.0-m1.md | 2 +-
_users/faq.md | 2 +-
_users/metrics-in-1.0.0-m1.md | 2 +-
...rics-integration-with-prometheus-in-1.0.0-m1.md | 2 +-
script/bootstrap | 2 +-
script/deploy | 2 +-
42 files changed, 124 insertions(+), 124 deletions(-)
diff --cc _users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md
index d0fbfef,24d87a9..01e5f96
--- a/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md
+++ b/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md
@@@ -10,10 -10,10 +10,10 @@@ redirect_from
---
{% include toc %}
- 微服务框架从0.5.0版本开始支持监控功能Metrics，1.0.0-m1版本正式发布，请通过查看用户手册和[Release Note](https://github.com/apache/incubator-servicecomb-java-chassis/releases)获取更多信息，我们也会继续追加新特性新功能，欢迎订阅ServiceComb邮件列表(dev-subscribe@servicecomb.incubator.apache.org)参与讨论。
+ 微服务框架从0.5.0版本开始支持监控功能Metrics，1.0.0-m1版本正式发布，请通过查看用户手册和[Release Note](https://github.com/apache/servicecomb-java-chassis/releases)获取更多信息，我们也会继续追加新特性新功能，欢迎订阅ServiceComb邮件列表(dev-subscribe@servicecomb.apache.org)参与讨论。
## 背景
-[普罗米修斯](http://www.prometheus.io/)是相似于Google Borgmon的一个开源监控系统，也是[CNCF](https://www.cncf.io/)的成员之一，目前社区非常活跃，Java Chassis Metrics在1.0.0-m1中支持对接普罗米修斯，并进一步实现使用[Grafana](https://grafana.com/)查询Metrics数据。
+[prometheus](http://www.prometheus.io/)是相似于Google Borgmon的一个开源监控系统，也是[CNCF](https://www.cncf.io/)的成员之一，目前社区非常活跃，Java Chassis Metrics在1.0.0-m1中支持对接prometheus，并进一步实现使用[Grafana](https://grafana.com/)查询Metrics数据。
## 对接原理
由于Java Chassis由Java语言开发，我们使用[prometheus java client](https://github.com/prometheus/client_java)中的Simple Client作为对接SDK，版本为0.1.0。