Skip to content

Commit 6389dc0

Browse files
Merge pull request #83 from tarantool/35-grid-generation
Rework code structure, introduce grid generation
2 parents 334ae66 + 22766bf commit 6389dc0

20 files changed

+824
-663
lines changed

CHANGELOG.md

+22-10
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ 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
8+
9+
### Changed
10+
- Code rework: introduce grid generation, separate dashboards code
11+
12+
713
## [0.3.0] - 2021-06-17
814
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)
915

10-
## Added
16+
### Added
1117
- Prometheus example alert rules (instance state, memory usage, HTTP load and latency rule examples, etc)
1218
- Test Prometheus example alert rules with promtool
1319
- Cartridge issues metrics labels to Telegraf configuration
@@ -17,53 +23,58 @@ Grafana revisions: [InfluxDB revision 5](https://grafana.com/api/dashboards/1256
1723
- CPU time getrusage panels
1824
- Replication lag panel
1925

20-
## Changed
26+
### Changed
2127
- Update metrics version to 0.9.0
2228
- Separate app cluster and load generator in example docker stand
2329
- Use cartridge-cli to run and setup example app cluster instead of luatest
2430
- Group Prometheus cluster overview panels into "Cluster overview" row
2531
- Rework "Tarantool spaces statistics" block to "Tarantool operations statistics"
2632
- Use Tarantool 2.x instead of Tarantool 1.x in test app and load generator
2733

28-
## Fixed
34+
### Fixed
2935
- Add missing space and replication metrics labels to Telegraf configuration
3036

37+
3138
## [0.2.3] - 2021-03-11
3239
Grafana revisions: [InfluxDB revision 4](https://grafana.com/api/dashboards/12567/revisions/4/download), [Prometheus revision 4](https://grafana.com/api/dashboards/13054/revisions/4/download)
3340

34-
## Added
41+
### Added
3542
- Memory miscellaneous row with Lua memory panel
3643

37-
## Changed
44+
### Changed
3845
- Rename memory overview row
3946

47+
4048
## [0.2.2] - 2021-01-28
4149
Grafana revisions: [Prometheus revision 3](https://grafana.com/api/dashboards/13054/revisions/3/download)
4250

43-
## Changed
51+
### Changed
4452
- Make Prometheus rps graphs rate() time range configurable
4553

54+
4655
## [0.2.1] - 2020-12-11
4756
Grafana revisions: [Prometheus revision 2](https://grafana.com/api/dashboards/13054/revisions/2/download)
4857

49-
## Added
58+
### Added
5059
- Cluster overview panels for Prometheus
5160

61+
5262
## [0.2.0] - 2020-09-23
5363
Grafana revisions: [InfluxDB revision 3](https://grafana.com/api/dashboards/12567/revisions/3/download), [Prometheus revision 1](https://grafana.com/api/dashboards/13054/revisions/1/download)
5464

55-
## Added
65+
### Added
5666
- Dashboard for Prometheus
5767

58-
## Changed
68+
### Changed
5969
- Update metrics version to 0.5.0
6070
- Replace average latency collector with summary collector in example cluster
6171
- Replace average latency panels with summary 99th percentile panels
6272

63-
## Fixed
73+
### Fixed
6474
- Example cluster now starts successfully
6575
- Example cluster metrics no more breaks Prometheus metrics collect
6676

77+
6778
## [0.1.1] - 2020-09-04
6879
Grafana revisions: [InfluxDB revision 2](https://grafana.com/api/dashboards/12567/revisions/2/download)
6980

@@ -78,6 +89,7 @@ Grafana revisions: [InfluxDB revision 2](https://grafana.com/api/dashboards/1256
7889
- Make InfluxDB policy configurable
7990
- Documentation improvements and fixes
8091

92+
8193
## [0.1.0] - 2020-06-30
8294
Grafana revisions: [InfluxDB revision 1](https://grafana.com/api/dashboards/12567/revisions/1/download)
8395

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ Refer to dashboard [documentation page](https://www.tarantool.io/en/doc/latest/b
2626

2727
You can compile Prometheus dashboard template with
2828
```bash
29-
jsonnet -J ./vendor/ ./tarantool/prometheus_dashboard.jsonnet
29+
jsonnet -J ./vendor/ ./dashboard/prometheus_dashboard.jsonnet
3030
```
3131
and InfluxDB dashboard template with
3232
```bash
33-
jsonnet -J ./vendor/ ./tarantool/influxdb_dashboard.jsonnet
33+
jsonnet -J ./vendor/ ./dashboard/influxdb_dashboard.jsonnet
3434
```
3535

3636
To save output into `output.json` file, use
3737
```bash
38-
jsonnet -J ./vendor/ ./tarantool/prometheus_dashboard.jsonnet -o ./output.json
38+
jsonnet -J ./vendor/ ./dashboard/prometheus_dashboard.jsonnet -o ./output.json
3939
```
4040
and to save output into clipboard, use
4141
```bash
42-
jsonnet -J ./vendor/ ./tarantool/prometheus_dashboard.jsonnet | xclip -selection clipboard
42+
jsonnet -J ./vendor/ ./dashboard/prometheus_dashboard.jsonnet | xclip -selection clipboard
4343
```
4444

4545
## Tests
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)