Skip to content

Commit 79db56c

Browse files
test: build from YAML instead of jsonnet
Part of #206
1 parent 93dc2b9 commit 79db56c

21 files changed

+24932
-183
lines changed

dashboard/build/config.libsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ local variable = import 'dashboard/variable.libsonnet';
2323
title: 'Tarantool dashboard',
2424
description: 'Dashboard for Tarantool application and database server monitoring, based on grafonnet library.',
2525
grafana_tags: ['tarantool'],
26-
datasource: variable.datasource.prometheus,
26+
datasource: '$prometheus',
2727
filters: {},
2828
metrics_prefix: '',
2929
sections: [
@@ -48,9 +48,9 @@ local variable = import 'dashboard/variable.libsonnet';
4848
title: 'Tarantool dashboard',
4949
description: 'Dashboard for Tarantool application and database server monitoring, based on grafonnet library.',
5050
grafana_tags: ['tarantool'],
51-
datasource: variable.datasource.influxdb,
52-
policy: variable.influxdb.policy,
53-
measurement: variable.influxdb.measurement,
51+
datasource: '$influxdb',
52+
policy: '$policy',
53+
measurement: '$measurement',
5454
filters: {},
5555
metrics_prefix: '',
5656
sections: [

dashboard/build/influxdb/dashboard.libsonnet

Lines changed: 0 additions & 32 deletions
This file was deleted.

dashboard/build/influxdb/tdg_dashboard.libsonnet

Lines changed: 0 additions & 41 deletions
This file was deleted.

dashboard/build/prometheus/dashboard.libsonnet

Lines changed: 0 additions & 30 deletions
This file was deleted.

dashboard/build/prometheus/tdg_dashboard.libsonnet

Lines changed: 0 additions & 39 deletions
This file was deleted.

dashboard/variable.libsonnet

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@
33
influxdb: 'influxdb',
44
prometheus: 'prometheus',
55
},
6-
datasource: {
7-
influxdb: '$influxdb',
8-
prometheus: '$prometheus',
9-
},
10-
prometheus: {
11-
job: '$job',
12-
alias: '$alias',
13-
},
14-
influxdb: {
15-
policy: '$policy',
16-
measurement: '$measurement',
17-
alias: '/^$alias$/',
18-
},
196
metrics: {
207
// It is expected that every job/measurement with Tarantool metrics would have this one.
218
tarantool_indicator: 'tnt_info_uptime',

tests.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,30 @@ do
6969
x=1
7070
fi
7171
done
72+
73+
for i in tests/*/*.yml
74+
do
75+
json=$(dirname $i)/$( basename $i .yml )_test_output.json
76+
json_e=$(dirname $i)/$( basename $i .yml )_compiled.json
77+
t="Building $i..."
78+
if CONFIG=$i OUTPUT=$json make build > /dev/null
79+
then
80+
echo $t OK
81+
else
82+
echo $t NOK
83+
x=1
84+
continue
85+
fi
86+
87+
if [[ "$1" == "update" ]]; then cp $json $json_e; fi
88+
89+
t="Checking $i..."
90+
if diff -urt $json_e $json
91+
then
92+
echo $t OK
93+
else
94+
echo $t NOK
95+
x=1
96+
fi
97+
done
7298
exit $x

tests/InfluxDB/dashboard.jsonnet

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/InfluxDB/dashboard.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
type: influxdb
2+
title: Tarantool dashboard
3+
description: Dashboard for Tarantool application and database server monitoring, based on grafonnet library.
4+
grafana_tags: [tarantool]
5+
datasource: '$influxdb'
6+
policy: '$policy'
7+
measurement: '$measurement'
8+
filters:
9+
label_pairs_alias: ['=~', '/^$alias$/']
10+
sections:
11+
- cluster
12+
- replication
13+
- http
14+
- net
15+
- slab
16+
- mvcc
17+
- space
18+
- vinyl
19+
- cpu
20+
- runtime
21+
- luajit
22+
- operations
23+
- crud
24+
- expirationd

tests/InfluxDB/dashboard_custom.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
type: influxdb
2+
title: MyCacheApplication dashboard
3+
description: Dashboard for MyCacheApplication monitoring.
4+
grafana_tags: [tarantool, cache]
5+
datasource: '$influxdb'
6+
policy: default
7+
measurement: '$measurement'
8+
filters:
9+
label_pairs_alias: ['=~', '$alias']
10+
vendor_app_tag: ['=', 'MyCacheApplication']
11+
metrics_prefix: vendor_tt_
12+
sections:
13+
- cluster
14+
- replication
15+
- http
16+
- net
17+
- slab
18+
- space
19+
- runtime
20+
- luajit
21+
- operations

0 commit comments

Comments
 (0)