Skip to content

Commit

Permalink
*: update a monitor image and fix typos (pingcap#1009)
Browse files Browse the repository at this point in the history
* media: update a monitor image

Related PR: pingcap/docs-cn#1212

* *: fix typos
  • Loading branch information
lilin90 authored and CaitinChen committed Apr 3, 2019
1 parent 3768641 commit d1fd9bb
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
Binary file modified media/prometheus-in-tidb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion op-guide/monitor-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Prometheus consists of multiple components. Currently, TiDB uses the following o

- The Prometheus Server to scrape and store time series data
- The client libraries to customize necessary metrics in the application
- An AlertManager for the alerting mechanism
- An Alertmanager for the alerting mechanism

The diagram is as follows:

Expand Down
2 changes: 1 addition & 1 deletion tools/syncer.md
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ The `syncer` monitoring solution contains the following components:

- Prometheus, an open source time series database, used to store the monitoring and performance metrics
- Grafana, an open source project for analyzing and visualizing metrics, used to display the performance metrics
- AlertManager, combined with Grafana to implement the alerting mechanism
- Alertmanager, combined with Grafana to implement the alerting mechanism

See the following diagram:

Expand Down
4 changes: 2 additions & 2 deletions v1.0/op-guide/monitor-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ The TiDB monitoring framework adopts two open source projects: Prometheus and Gr

## About Prometheus in TiDB

As a time series database, Prometheus has a multi-dimensional data model and flexible query language. As one of the most popular open source projects, many companies and organizations have adopted Prometheus, and the project has a very active community. PingCAP is one of the active developers and adoptors of Prometheus for monitoring and alerting in TiDB, TiKV and PD.
As a time series database, Prometheus has a multi-dimensional data model and flexible query language. As one of the most popular open source projects, many companies and organizations have adopted Prometheus, and the project has a very active community. PingCAP is one of the active developers and adopters of Prometheus for monitoring and alerting in TiDB, TiKV and PD.

Prometheus consists of multiple components. Currently, TiDB uses the following of them:

- The Prometheus Server to scrape and store time series data.
- The client libraries to customize necessary metrics in the application.
- A push GateWay to receive the data from Client Push for the Prometheus main server.
- An AlertManager for the alerting mechanism.
- An Alertmanager for the alerting mechanism.

The diagram is as follows:

Expand Down
2 changes: 1 addition & 1 deletion v1.0/tools/syncer.md
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ The `syncer` monitoring solution contains the following components:

- Prometheus, an open source time series database, used to store the monitoring and performance metrics
- Grafana, an open source project for analyzing and visualizing metrics, used to display the performance metrics
- AlertManager, combined with Grafana to implement the alerting mechanism
- Alertmanager, combined with Grafana to implement the alerting mechanism

See the following diagram:

Expand Down
4 changes: 2 additions & 2 deletions v2.0/op-guide/monitor-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ The TiDB monitoring framework adopts two open source projects: Prometheus and Gr

## About Prometheus in TiDB

As a time series database, Prometheus has a multi-dimensional data model and flexible query language. As one of the most popular open source projects, many companies and organizations have adopted Prometheus, and the project has a very active community. PingCAP is one of the active developers and adoptors of Prometheus for monitoring and alerting in TiDB, TiKV and PD.
As a time series database, Prometheus has a multi-dimensional data model and flexible query language. As one of the most popular open source projects, many companies and organizations have adopted Prometheus, and the project has a very active community. PingCAP is one of the active developers and adopters of Prometheus for monitoring and alerting in TiDB, TiKV and PD.

Prometheus consists of multiple components. Currently, TiDB uses the following of them:

- The Prometheus Server to scrape and store time series data.
- The client libraries to customize necessary metrics in the application.
- A push GateWay to receive the data from Client Push for the Prometheus main server.
- An AlertManager for the alerting mechanism.
- An Alertmanager for the alerting mechanism.

The diagram is as follows:

Expand Down
2 changes: 1 addition & 1 deletion v2.0/tools/syncer.md
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ The `syncer` monitoring solution contains the following components:

- Prometheus, an open source time series database, used to store the monitoring and performance metrics
- Grafana, an open source project for analyzing and visualizing metrics, used to display the performance metrics
- AlertManager, combined with Grafana to implement the alerting mechanism
- Alertmanager, combined with Grafana to implement the alerting mechanism

See the following diagram:

Expand Down
2 changes: 1 addition & 1 deletion v2.1/op-guide/monitor-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Prometheus consists of multiple components. Currently, TiDB uses the following o
- The Prometheus Server to scrape and store time series data.
- The client libraries to customize necessary metrics in the application.
- A push GateWay to receive the data from Client Push for the Prometheus main server.
- An AlertManager for the alerting mechanism.
- An Alertmanager for the alerting mechanism.

The diagram is as follows:

Expand Down
2 changes: 1 addition & 1 deletion v2.1/tools/syncer.md
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ The `syncer` monitoring solution contains the following components:

- Prometheus, an open source time series database, used to store the monitoring and performance metrics
- Grafana, an open source project for analyzing and visualizing metrics, used to display the performance metrics
- AlertManager, combined with Grafana to implement the alerting mechanism
- Alertmanager, combined with Grafana to implement the alerting mechanism

See the following diagram:

Expand Down

0 comments on commit d1fd9bb

Please sign in to comment.