Skip to content

Commit f4a50dc

Browse files
Merge pull request #81 from tarantool/release-0.3.0
Release 0.3.0
2 parents 6e19ad6 + 478ab0e commit f4a50dc

File tree

10 files changed

+21
-22
lines changed

10 files changed

+21
-22
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ 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+
## [0.3.0] - 2021-06-17
8+
Grafana revisions: [InfluxDB revision 5](https://grafana.com/api/dashboards/12567/revisions/5/download), [Prometheus revision 5](https://grafana.com/api/dashboards/13054/revisions/5/download)
89

910
## Added
1011
- Prometheus example alert rules (instance state, memory usage, HTTP load and latency rule examples, etc)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +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](https://grafana.com/grafana/dashboards/12567), [Prometheus](https://grafana.com/grafana/dashboards/13054).
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).
66

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

9-
<img src="./doc/monitoring/images/Prometheus_dashboard_1.png" width="310"/> <img src="./doc/monitoring/images/Prometheus_dashboard_2.png" width="310"/> <img src="./doc/monitoring/images/Prometheus_dashboard_3.png" width="310"/>
9+
<img src="./doc/monitoring/images/Prometheus_dashboard_1.png" width="300"/> <img src="./doc/monitoring/images/Prometheus_dashboard_2.png" width="300"/> <img src="./doc/monitoring/images/Prometheus_dashboard_3.png" width="300"/>
1010

1111
# How to build
1212

doc/monitoring/grafana_dashboard.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Tarantool Grafana dashboard is a ready for import template with basic memory,
1313
space operations, and HTTP load panels, based on default `metrics <https://github.com/tarantool/metrics>`_
1414
package functionality.
1515

16-
Dashboard requires using ``metrics`` **0.5.0** or newer;
16+
Dashboard requires using ``metrics`` **0.8.0** or newer for complete experience;
1717
``'alias'`` :ref:`global label <tarantool-metrics>` must be set on each instance
1818
to properly display panels (e.g. provided with ``cartridge.roles.metrics`` role).
1919

-55.7 KB
Loading
123 KB
Loading
105 KB
Loading

tarantool/influxdb_dashboard.jsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ local dashboard = import 'dashboard.libsonnet';
55
local row = grafana.row;
66

77
local raw_dashboard = grafana.dashboard.new(
8-
title='Example InfluxDB dashboard',
9-
description='Example dashboard',
8+
title='Tarantool dashboard',
9+
description='Dashboard for Tarantool application and database server monitoring, based on grafonnet library.',
1010
editable=true,
1111
schemaVersion=21,
12-
time_from='now-6h',
12+
time_from='now-3h',
1313
time_to='now',
1414
refresh='30s',
15-
tags=['tag1', 'tag2'],
15+
tags=['tarantool'],
1616
);
1717

1818
local datasource = '${DS_INFLUXDB}';

tarantool/prometheus_dashboard.jsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ local dashboard = import 'dashboard.libsonnet';
66
local row = grafana.row;
77

88
local raw_dashboard = grafana.dashboard.new(
9-
title='Example Prometheus dashboard',
10-
description='Example dashboard',
9+
title='Tarantool dashboard',
10+
description='Dashboard for Tarantool application and database server monitoring, based on grafonnet library.',
1111
editable=true,
1212
schemaVersion=21,
13-
time_from='now-6h',
13+
time_from='now-3h',
1414
time_to='now',
1515
refresh='30s',
16-
tags=['tag1', 'tag2'],
16+
tags=['tarantool'],
1717
);
1818

1919
local datasource = '${DS_PROMETHEUS}';

tests/InfluxDB/dashboard_compiled.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"annotations": {
5252
"list": [ ]
5353
},
54-
"description": "Example dashboard",
54+
"description": "Dashboard for Tarantool application and database server monitoring, based on grafonnet library.",
5555
"editable": true,
5656
"gnetId": null,
5757
"graphTooltip": 0,
@@ -5553,14 +5553,13 @@
55535553
"schemaVersion": 21,
55545554
"style": "dark",
55555555
"tags": [
5556-
"tag1",
5557-
"tag2"
5556+
"tarantool"
55585557
],
55595558
"templating": {
55605559
"list": [ ]
55615560
},
55625561
"time": {
5563-
"from": "now-6h",
5562+
"from": "now-3h",
55645563
"to": "now"
55655564
},
55665565
"timepicker": {
@@ -5589,6 +5588,6 @@
55895588
]
55905589
},
55915590
"timezone": "browser",
5592-
"title": "Example InfluxDB dashboard",
5591+
"title": "Tarantool dashboard",
55935592
"version": 0
55945593
}

tests/Prometheus/dashboard_compiled.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"annotations": {
6464
"list": [ ]
6565
},
66-
"description": "Example dashboard",
66+
"description": "Dashboard for Tarantool application and database server monitoring, based on grafonnet library.",
6767
"editable": true,
6868
"gnetId": null,
6969
"graphTooltip": 0,
@@ -4012,8 +4012,7 @@
40124012
"schemaVersion": 21,
40134013
"style": "dark",
40144014
"tags": [
4015-
"tag1",
4016-
"tag2"
4015+
"tarantool"
40174016
],
40184017
"templating": {
40194018
"list": [
@@ -4062,7 +4061,7 @@
40624061
]
40634062
},
40644063
"time": {
4065-
"from": "now-6h",
4064+
"from": "now-3h",
40664065
"to": "now"
40674066
},
40684067
"timepicker": {
@@ -4091,6 +4090,6 @@
40914090
]
40924091
},
40934092
"timezone": "browser",
4094-
"title": "Example Prometheus dashboard",
4093+
"title": "Tarantool dashboard",
40954094
"version": 0
40964095
}

0 commit comments

Comments
 (0)