Skip to content

Commit 45c725f

Browse files
Release 1.2.0
Grafana revisions: - InfluxDB revision 12 [1] - Prometheus revision 12 [2] - InfluxDB TDG revision 1 [3] - Prometheus TDG revision 1 [4] Added: - TDG (ver. 2) example cluster draft - Dashboard templates for TDG (ver. 2) - Kafka metrics panels for TDG dashboard - Thread CPU panels for TDG dashboard - expirationd panels for TDG dashboard - Tuples panels for TDG dashboard - File connectors panels for TDG dashboard - GraphQL requests panels for TDG dashboard - IProto requests panels for TDG dashboard - REST API requests panels for TDG dashboard - Task statistics panels for TDG dashboard Changed: - Change replication status panel labels Fixed: - Remove rate from fiber context switches panel - Remove fiber context switches alert example 1. https://grafana.com/api/dashboards/12567/revisions/12/download 2. https://grafana.com/api/dashboards/13054/revisions/12/download 3. https://grafana.com/api/dashboards/16405/revisions/1/download 4. https://grafana.com/api/dashboards/16406/revisions/1/download
1 parent a760f9a commit 45c725f

File tree

3 files changed

+72
-8
lines changed

3 files changed

+72
-8
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## Unreleased
7+
## [1.2.0] - 2022-06-08
8+
Grafana revisions: [InfluxDB revision 12](https://grafana.com/api/dashboards/12567/revisions/12/download),
9+
[Prometheus revision 12](https://grafana.com/api/dashboards/13054/revisions/12/download),
10+
[InfluxDB TDG revision 1](https://grafana.com/api/dashboards/16405/revisions/1/download),
11+
[Prometheus TDG revision 1](https://grafana.com/api/dashboards/16406/revisions/1/download),
812

913
### Added
1014
- TDG (ver. 2) example cluster draft

README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
Dashboard for Tarantool application and database server monitoring, based on [grafonnet](https://github.com/grafana/grafonnet-lib) library.
44

5-
Our pages on Grafana Official & community built dashboards: [InfluxDB version](https://grafana.com/grafana/dashboards/12567), [Prometheus version](https://grafana.com/grafana/dashboards/13054).
5+
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).
610

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

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

2731
2. To import a specific dashboard, choose one of the following options:
2832

29-
- paste the dashboard id (``12567`` for InfluxDB dashboard, ``13054`` for Prometheus dashboard), or
30-
- paste a link to the dashboard (https://grafana.com/grafana/dashboards/12567 for InfluxDB dashboard,
31-
https://grafana.com/grafana/dashboards/13054 for Prometheus dashboard), or
33+
- paste the dashboard id (``12567`` for InfluxDB dashboard, ``13054`` for Prometheus dashboard,
34+
``16405`` for InfluxDB TDG dashboard, ``16406`` for Prometheus TDG dashboard), or
35+
- paste a link to the dashboard (
36+
https://grafana.com/grafana/dashboards/12567 for InfluxDB dashboard,
37+
https://grafana.com/grafana/dashboards/13054 for Prometheus dashboard,
38+
https://grafana.com/grafana/dashboards/16405 for InfluxDB TDG dashboard,
39+
https://grafana.com/grafana/dashboards/16406 for Prometheus TDG dashboard), or
3240
- paste the dashboard JSON file contents, or
3341
- upload the dashboard JSON file.
3442

doc/monitoring/grafana_dashboard.rst

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Tarantool Grafana dashboard is available as part of
99
There's a version
1010
`for Prometheus data source <https://grafana.com/grafana/dashboards/13054>`_
1111
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>`_.
1215
Tarantool Grafana dashboard is a ready for import template with basic memory,
1316
space operations, and HTTP load panels, based on default `metrics <https://github.com/tarantool/metrics>`_
1417
package functionality.
@@ -127,6 +130,51 @@ Be sure to include each label key as ``label_pairs_<key>`` so it will be
127130
extracted with plugin. For example, if you use :code:`{ state = 'ready' }` labels
128131
somewhere in metric collectors, add ``label_pairs_state`` tag key.
129132

133+
For TDG dashboard, please use
134+
135+
.. code-block:: toml
136+
137+
[[inputs.http]]
138+
urls = [
139+
"http://example_tdg_project:8081/metrics/json",
140+
"http://example_tdg_project:8082/metrics/json",
141+
"http://example_tdg_project:8083/metrics/json"
142+
]
143+
timeout = "30s"
144+
tag_keys = [
145+
"metric_name",
146+
"label_pairs_alias",
147+
"label_pairs_quantile",
148+
"label_pairs_path",
149+
"label_pairs_method",
150+
"label_pairs_status",
151+
"label_pairs_operation",
152+
"label_pairs_level",
153+
"label_pairs_id",
154+
"label_pairs_engine",
155+
"label_pairs_name",
156+
"label_pairs_index_name",
157+
"label_pairs_delta",
158+
"label_pairs_stream",
159+
"label_pairs_type",
160+
"label_pairs_connector_name",
161+
"label_pairs_broker_name",
162+
"label_pairs_topic",
163+
"label_pairs_request",
164+
"label_pairs_kind",
165+
"label_pairs_thread_name",
166+
"label_pairs_type_name",
167+
"label_pairs_operation_name",
168+
"label_pairs_schema",
169+
"label_pairs_entity",
170+
"label_pairs_status_code"
171+
]
172+
insecure_skip_verify = true
173+
interval = "10s"
174+
data_format = "json"
175+
name_prefix = "example_project_"
176+
fieldpass = ["value"]
177+
130178
If you connect Telegraf instance to InfluxDB storage, metrics will be stored
131179
with ``"<name_prefix>http"`` measurement (``"example_project_http"`` in our example).
132180

@@ -142,9 +190,13 @@ Open Grafana import menu.
142190

143191
To import a specific dashboard, choose one of the following options:
144192

145-
- paste the dashboard id (``12567`` for InfluxDB dashboard, ``13054`` for Prometheus dashboard), or
146-
- paste a link to the dashboard (https://grafana.com/grafana/dashboards/12567 for InfluxDB dashboard,
147-
https://grafana.com/grafana/dashboards/13054 for Prometheus dashboard), or
193+
- paste the dashboard id (``12567`` for InfluxDB dashboard, ``13054`` for Prometheus dashboard,
194+
``16405`` for InfluxDB TDG dashboard, ``16406`` for Prometheus TDG dashboard), or
195+
- paste a link to the dashboard (
196+
https://grafana.com/grafana/dashboards/12567 for InfluxDB dashboard,
197+
https://grafana.com/grafana/dashboards/13054 for Prometheus dashboard,
198+
https://grafana.com/grafana/dashboards/16405 for InfluxDB TDG dashboard,
199+
https://grafana.com/grafana/dashboards/16406 for Prometheus TDG dashboard), or
148200
- paste the dashboard JSON file contents, or
149201
- upload the dashboard JSON file.
150202

0 commit comments

Comments
 (0)