Skip to content

Commit 5499d7e

Browse files
doc: explicitly mark all Cartridge dashboards
Explicitly mark all entries of current default dashboard as a dashboard for Tarantool Cartridge and Tarantool 1.10--2.x applications. Grafana pages had been updated as well. Part of #224
1 parent 6720049 commit 5499d7e

File tree

16 files changed

+34
-27
lines changed

16 files changed

+34
-27
lines changed

README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
Dashboard for Tarantool application and database server monitoring, based on [grafonnet](https://github.com/grafana/grafonnet-lib) library.
44

55
Our pages on Grafana Official & community built dashboards:
6-
[InfluxDB version](https://grafana.com/grafana/dashboards/12567),
7-
[Prometheus version](https://grafana.com/grafana/dashboards/13054),
8-
[InfluxDB TDG version](https://grafana.com/grafana/dashboards/16405),
9-
[Prometheus TDG version](https://grafana.com/grafana/dashboards/16406).
6+
- Tarantool Cartridge and Tarantool 1.10—2.x applications:
7+
- [Prometheus](https://grafana.com/grafana/dashboards/13054),
8+
- [InfluxDB](https://grafana.com/grafana/dashboards/12567);
9+
- TDG
10+
- [Prometheus](https://grafana.com/grafana/dashboards/16406),
11+
- [InfluxDB](https://grafana.com/grafana/dashboards/16405).
1012

1113
Refer to dashboard [documentation page](https://www.tarantool.io/en/doc/latest/book/monitoring/grafana_dashboard/) for prerequirements and installation guide.
1214

@@ -34,13 +36,9 @@ Refer to dashboard [documentation page](https://www.tarantool.io/en/doc/latest/b
3436

3537
2. To import a specific dashboard, choose one of the following options:
3638

37-
- paste the dashboard id (``12567`` for InfluxDB dashboard, ``13054`` for Prometheus dashboard,
38-
``16405`` for InfluxDB TDG dashboard, ``16406`` for Prometheus TDG dashboard), or
39-
- paste a link to the dashboard (
40-
https://grafana.com/grafana/dashboards/12567 for InfluxDB dashboard,
41-
https://grafana.com/grafana/dashboards/13054 for Prometheus dashboard,
42-
https://grafana.com/grafana/dashboards/16405 for InfluxDB TDG dashboard,
43-
https://grafana.com/grafana/dashboards/16406 for Prometheus TDG dashboard), or
39+
- paste the dashboard id (for example, ``13054`` for Prometheus Tarantool Cartridge dashboard), or
40+
- paste a link to the dashboard (for example,
41+
https://grafana.com/grafana/dashboards/13054 for Prometheus Tarantool Cartridge dashboard), or
4442
- paste the dashboard JSON file contents, or
4543
- upload the dashboard JSON file.
4644

doc/monitoring/grafana_dashboard.rst

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,23 @@
44
Grafana dashboard
55
===============================================================================
66

7-
Tarantool Grafana dashboard is available as part of
8-
`Grafana Official & community built dashboards <https://grafana.com/grafana/dashboards>`_.
9-
There's a version
10-
`for Prometheus data source <https://grafana.com/grafana/dashboards/13054>`_
11-
and one `for InfluxDB data source <https://grafana.com/grafana/dashboards/12567>`_.
12-
There are also separate dashboards for TDG applications:
13-
`for Prometheus data source <https://grafana.com/grafana/dashboards/16406>`_
14-
and `for InfluxDB data source <https://grafana.com/grafana/dashboards/16405>`_.
7+
Tarantool Grafana dashboards are available as part of
8+
`Grafana Official & community built dashboards <https://grafana.com/grafana/dashboards>`_:
9+
10+
.. container:: table
11+
12+
.. list-table::
13+
:widths: 25 75
14+
:header-rows: 0
15+
16+
* Tarantool Cartridge and Tarantool 1.10—2.x applications:
17+
- `Prometheus <https://grafana.com/grafana/dashboards/13054>`_,
18+
- `InfluxDB <https://grafana.com/grafana/dashboards/12567>`_;
19+
20+
* TDG:
21+
- `Prometheus <https://grafana.com/grafana/dashboards/16406>`_,
22+
- `InfluxDB <https://grafana.com/grafana/dashboards/16405>`_.
23+
1524
Tarantool Grafana dashboard is a ready for import template with basic memory,
1625
space operations, and HTTP load panels, based on default `metrics <https://github.com/tarantool/metrics>`_
1726
package functionality.

docker-compose.yml renamed to docker-compose.cartridge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
app:
33
build:
4-
context: ./example_cluster/project
4+
context: ./example_cluster/cartridge_project
55
dockerfile: app.Dockerfile
66
networks:
77
tarantool_dashboard_dev:
@@ -19,7 +19,7 @@ services:
1919

2020
load_generator:
2121
build:
22-
context: ./example_cluster/project
22+
context: ./example_cluster/cartridge_project
2323
dockerfile: load.Dockerfile
2424
networks:
2525
tarantool_dashboard_dev:

example_cluster/project/project-scm-1.rockspec renamed to example_cluster/cartridge_project/cartridge_project-scm-1.rockspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package = 'project'
1+
package = 'cartridge_project'
22
version = 'scm-1'
33
source = {
44
url = '/dev/null',

0 commit comments

Comments
 (0)