Skip to content

Commit 6aaa7ff

Browse files
patapenka-alexeypatapenka-alexey
committed
tests: update compiled files
1 parent df0c929 commit 6aaa7ff

8 files changed

+76
-28
lines changed

‎tests/InfluxDB/dashboard_cartridge_compiled.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14739,6 +14739,7 @@
1473914739
"steppedLine": false,
1474014740
"targets": [
1474114741
{
14742+
"alias": "$tag_label_pairs_alias",
1474214743
"groupBy": [
1474314744
{
1474414745
"params": [
@@ -14754,6 +14755,8 @@
1475414755
}
1475514756
],
1475614757
"policy": "default",
14758+
"query": "SELECT non_negative_derivative(sum(\"value\"), 1s)\nFROM \"$policy\".\"$measurement\"\nWHERE ((\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time') AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval), \"label_pairs_alias\" fill(none)\n",
14759+
"rawQuery": true,
1475714760
"refId": "A",
1475814761
"resultFormat": "time_series",
1475914762
"select": [ ],
@@ -15123,6 +15126,7 @@
1512315126
"steppedLine": false,
1512415127
"targets": [
1512515128
{
15129+
"alias": "CPU total time per cluster",
1512615130
"groupBy": [
1512715131
{
1512815132
"params": [
@@ -15138,6 +15142,8 @@
1513815142
}
1513915143
],
1514015144
"policy": "default",
15145+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_time_per_cluster\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time')\nAND $timeFilter\nGROUP BY time($__interval)\n",
15146+
"rawQuery": true,
1514115147
"refId": "A",
1514215148
"resultFormat": "time_series",
1514315149
"select": [ ],
@@ -15225,6 +15231,7 @@
1522515231
"steppedLine": false,
1522615232
"targets": [
1522715233
{
15234+
"alias": "CPU total user time per cluster",
1522815235
"groupBy": [
1522915236
{
1523015237
"params": [
@@ -15240,6 +15247,8 @@
1524015247
}
1524115248
],
1524215249
"policy": "default",
15250+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_user_time\nFROM \"$policy\".\"$measurement\"\nWHERE \"metric_name\" = 'tnt_cpu_user_time' AND \"label_pairs_alias\" =~ /^$alias$/\nAND $timeFilter\nGROUP BY time($__interval)\n",
15251+
"rawQuery": true,
1524315252
"refId": "A",
1524415253
"resultFormat": "time_series",
1524515254
"select": [ ],
@@ -15327,6 +15336,7 @@
1532715336
"steppedLine": false,
1532815337
"targets": [
1532915338
{
15339+
"alias": "CPU total system time per cluster",
1533015340
"groupBy": [
1533115341
{
1533215342
"params": [
@@ -15342,6 +15352,8 @@
1534215352
}
1534315353
],
1534415354
"policy": "default",
15355+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_system_time\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_system_time' AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval)\n",
15356+
"rawQuery": true,
1534515357
"refId": "A",
1534615358
"resultFormat": "time_series",
1534715359
"select": [ ],

‎tests/InfluxDB/dashboard_tarantool3_compiled.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14669,6 +14669,7 @@
1466914669
"steppedLine": false,
1467014670
"targets": [
1467114671
{
14672+
"alias": "$tag_label_pairs_alias",
1467214673
"groupBy": [
1467314674
{
1467414675
"params": [
@@ -14684,6 +14685,8 @@
1468414685
}
1468514686
],
1468614687
"policy": "default",
14688+
"query": "SELECT non_negative_derivative(sum(\"value\"), 1s)\nFROM \"$policy\".\"$measurement\"\nWHERE ((\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time') AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval), \"label_pairs_alias\" fill(none)\n",
14689+
"rawQuery": true,
1468714690
"refId": "A",
1468814691
"resultFormat": "time_series",
1468914692
"select": [ ],
@@ -15053,6 +15056,7 @@
1505315056
"steppedLine": false,
1505415057
"targets": [
1505515058
{
15059+
"alias": "CPU total time per cluster",
1505615060
"groupBy": [
1505715061
{
1505815062
"params": [
@@ -15068,6 +15072,8 @@
1506815072
}
1506915073
],
1507015074
"policy": "default",
15075+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_time_per_cluster\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time')\nAND $timeFilter\nGROUP BY time($__interval)\n",
15076+
"rawQuery": true,
1507115077
"refId": "A",
1507215078
"resultFormat": "time_series",
1507315079
"select": [ ],
@@ -15155,6 +15161,7 @@
1515515161
"steppedLine": false,
1515615162
"targets": [
1515715163
{
15164+
"alias": "CPU total user time per cluster",
1515815165
"groupBy": [
1515915166
{
1516015167
"params": [
@@ -15170,6 +15177,8 @@
1517015177
}
1517115178
],
1517215179
"policy": "default",
15180+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_user_time\nFROM \"$policy\".\"$measurement\"\nWHERE \"metric_name\" = 'tnt_cpu_user_time' AND \"label_pairs_alias\" =~ /^$alias$/\nAND $timeFilter\nGROUP BY time($__interval)\n",
15181+
"rawQuery": true,
1517315182
"refId": "A",
1517415183
"resultFormat": "time_series",
1517515184
"select": [ ],
@@ -15257,6 +15266,7 @@
1525715266
"steppedLine": false,
1525815267
"targets": [
1525915268
{
15269+
"alias": "CPU total system time per cluster",
1526015270
"groupBy": [
1526115271
{
1526215272
"params": [
@@ -15272,6 +15282,8 @@
1527215282
}
1527315283
],
1527415284
"policy": "default",
15285+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_system_time\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_system_time' AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval)\n",
15286+
"rawQuery": true,
1527515287
"refId": "A",
1527615288
"resultFormat": "time_series",
1527715289
"select": [ ],

‎tests/InfluxDB/dashboard_tdg_compiled.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13735,6 +13735,7 @@
1373513735
"steppedLine": false,
1373613736
"targets": [
1373713737
{
13738+
"alias": "$tag_label_pairs_alias",
1373813739
"groupBy": [
1373913740
{
1374013741
"params": [
@@ -13750,6 +13751,8 @@
1375013751
}
1375113752
],
1375213753
"policy": "default",
13754+
"query": "SELECT non_negative_derivative(sum(\"value\"), 1s)\nFROM \"$policy\".\"$measurement\"\nWHERE ((\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time') AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval), \"label_pairs_alias\" fill(none)\n",
13755+
"rawQuery": true,
1375313756
"refId": "A",
1375413757
"resultFormat": "time_series",
1375513758
"select": [ ],
@@ -14119,6 +14122,7 @@
1411914122
"steppedLine": false,
1412014123
"targets": [
1412114124
{
14125+
"alias": "CPU total time per cluster",
1412214126
"groupBy": [
1412314127
{
1412414128
"params": [
@@ -14134,6 +14138,8 @@
1413414138
}
1413514139
],
1413614140
"policy": "default",
14141+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_time_per_cluster\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time')\nAND $timeFilter\nGROUP BY time($__interval)\n",
14142+
"rawQuery": true,
1413714143
"refId": "A",
1413814144
"resultFormat": "time_series",
1413914145
"select": [ ],
@@ -14221,6 +14227,7 @@
1422114227
"steppedLine": false,
1422214228
"targets": [
1422314229
{
14230+
"alias": "CPU total user time per cluster",
1422414231
"groupBy": [
1422514232
{
1422614233
"params": [
@@ -14236,6 +14243,8 @@
1423614243
}
1423714244
],
1423814245
"policy": "default",
14246+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_user_time\nFROM \"$policy\".\"$measurement\"\nWHERE \"metric_name\" = 'tnt_cpu_user_time' AND \"label_pairs_alias\" =~ /^$alias$/\nAND $timeFilter\nGROUP BY time($__interval)\n",
14247+
"rawQuery": true,
1423914248
"refId": "A",
1424014249
"resultFormat": "time_series",
1424114250
"select": [ ],
@@ -14323,6 +14332,7 @@
1432314332
"steppedLine": false,
1432414333
"targets": [
1432514334
{
14335+
"alias": "CPU total system time per cluster",
1432614336
"groupBy": [
1432714337
{
1432814338
"params": [
@@ -14338,6 +14348,8 @@
1433814348
}
1433914349
],
1434014350
"policy": "default",
14351+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_system_time\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_system_time' AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval)\n",
14352+
"rawQuery": true,
1434114353
"refId": "A",
1434214354
"resultFormat": "time_series",
1434314355
"select": [ ],

‎tests/InfluxDB/dashboard_with_custom_panels_compiled.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14669,6 +14669,7 @@
1466914669
"steppedLine": false,
1467014670
"targets": [
1467114671
{
14672+
"alias": "$tag_label_pairs_alias",
1467214673
"groupBy": [
1467314674
{
1467414675
"params": [
@@ -14684,6 +14685,8 @@
1468414685
}
1468514686
],
1468614687
"policy": "default",
14688+
"query": "SELECT non_negative_derivative(sum(\"value\"), 1s)\nFROM \"$policy\".\"$measurement\"\nWHERE ((\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time') AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval), \"label_pairs_alias\" fill(none)\n",
14689+
"rawQuery": true,
1468714690
"refId": "A",
1468814691
"resultFormat": "time_series",
1468914692
"select": [ ],
@@ -15053,6 +15056,7 @@
1505315056
"steppedLine": false,
1505415057
"targets": [
1505515058
{
15059+
"alias": "CPU total time per cluster",
1505615060
"groupBy": [
1505715061
{
1505815062
"params": [
@@ -15068,6 +15072,8 @@
1506815072
}
1506915073
],
1507015074
"policy": "default",
15075+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_time_per_cluster\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_user_time' OR \"metric_name\" = 'tnt_cpu_system_time')\nAND $timeFilter\nGROUP BY time($__interval)\n",
15076+
"rawQuery": true,
1507115077
"refId": "A",
1507215078
"resultFormat": "time_series",
1507315079
"select": [ ],
@@ -15155,6 +15161,7 @@
1515515161
"steppedLine": false,
1515615162
"targets": [
1515715163
{
15164+
"alias": "CPU total user time per cluster",
1515815165
"groupBy": [
1515915166
{
1516015167
"params": [
@@ -15170,6 +15177,8 @@
1517015177
}
1517115178
],
1517215179
"policy": "default",
15180+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_user_time\nFROM \"$policy\".\"$measurement\"\nWHERE \"metric_name\" = 'tnt_cpu_user_time' AND \"label_pairs_alias\" =~ /^$alias$/\nAND $timeFilter\nGROUP BY time($__interval)\n",
15181+
"rawQuery": true,
1517315182
"refId": "A",
1517415183
"resultFormat": "time_series",
1517515184
"select": [ ],
@@ -15257,6 +15266,7 @@
1525715266
"steppedLine": false,
1525815267
"targets": [
1525915268
{
15269+
"alias": "CPU total system time per cluster",
1526015270
"groupBy": [
1526115271
{
1526215272
"params": [
@@ -15272,6 +15282,8 @@
1527215282
}
1527315283
],
1527415284
"policy": "default",
15285+
"query": "SELECT non_negative_derivative(SUM(\"value\"), 1s) AS total_cpu_system_time\nFROM \"$policy\".\"$measurement\"\nWHERE (\"metric_name\" = 'tnt_cpu_system_time' AND \"label_pairs_alias\" =~ /^$alias$/)\nAND $timeFilter\nGROUP BY time($__interval)\n",
15286+
"rawQuery": true,
1527515287
"refId": "A",
1527615288
"resultFormat": "time_series",
1527715289
"select": [ ],

‎tests/Prometheus/dashboard_cartridge_compiled.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9930,7 +9930,7 @@
99309930
"steppedLine": false,
99319931
"targets": [
99329932
{
9933-
"expr": "rate(tnt_cpu_user_time[$__rate_interval]) + rate(tnt_cpu_system_time[$__rate_interval])",
9933+
"expr": "rate(tnt_cpu_user_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) +\nrate(tnt_cpu_system_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])\n",
99349934
"format": "time_series",
99359935
"intervalFactor": 2,
99369936
"legendFormat": "{{alias}}",
@@ -10194,10 +10194,10 @@
1019410194
"steppedLine": false,
1019510195
"targets": [
1019610196
{
10197-
"expr": "sum(rate(tnt_cpu_user_time{job=~\"$job\"}[$__rate_interval])) + sum(rate(tnt_cpu_system_time{job=~\"$job\"}[$__rate_interval]))",
10197+
"expr": "sum(rate(tnt_cpu_user_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])) +\nsum(rate(tnt_cpu_system_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]))\n",
1019810198
"format": "time_series",
1019910199
"intervalFactor": 2,
10200-
"legendFormat": "CPU total time",
10200+
"legendFormat": "CPU total time per cluster",
1020110201
"refId": "A"
1020210202
}
1020310203
],
@@ -10282,10 +10282,10 @@
1028210282
"steppedLine": false,
1028310283
"targets": [
1028410284
{
10285-
"expr": "sum(rate(tnt_cpu_user_time{job=~\"$job\"}[$__rate_interval]))",
10285+
"expr": "sum(rate(tnt_cpu_user_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]))\n",
1028610286
"format": "time_series",
1028710287
"intervalFactor": 2,
10288-
"legendFormat": "CPU total user time",
10288+
"legendFormat": "CPU total user time per cluster",
1028910289
"refId": "A"
1029010290
}
1029110291
],
@@ -10370,10 +10370,10 @@
1037010370
"steppedLine": false,
1037110371
"targets": [
1037210372
{
10373-
"expr": "sum(rate(tnt_cpu_system_time{job=~\"$job\"}[$__rate_interval]))",
10373+
"expr": "sum(rate(tnt_cpu_system_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]))\n",
1037410374
"format": "time_series",
1037510375
"intervalFactor": 2,
10376-
"legendFormat": "CPU total system time",
10376+
"legendFormat": "CPU total system time per cluster",
1037710377
"refId": "A"
1037810378
}
1037910379
],

‎tests/Prometheus/dashboard_tarantool3_compiled.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9862,7 +9862,7 @@
98629862
"steppedLine": false,
98639863
"targets": [
98649864
{
9865-
"expr": "rate(tnt_cpu_user_time[$__rate_interval]) + rate(tnt_cpu_system_time[$__rate_interval])",
9865+
"expr": "rate(tnt_cpu_user_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]) +\nrate(tnt_cpu_system_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])\n",
98669866
"format": "time_series",
98679867
"intervalFactor": 2,
98689868
"legendFormat": "{{alias}}",
@@ -10126,10 +10126,10 @@
1012610126
"steppedLine": false,
1012710127
"targets": [
1012810128
{
10129-
"expr": "sum(rate(tnt_cpu_user_time{job=~\"$job\"}[$__rate_interval])) + sum(rate(tnt_cpu_system_time{job=~\"$job\"}[$__rate_interval]))",
10129+
"expr": "sum(rate(tnt_cpu_user_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval])) +\nsum(rate(tnt_cpu_system_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]))\n",
1013010130
"format": "time_series",
1013110131
"intervalFactor": 2,
10132-
"legendFormat": "CPU total time",
10132+
"legendFormat": "CPU total time per cluster",
1013310133
"refId": "A"
1013410134
}
1013510135
],
@@ -10214,10 +10214,10 @@
1021410214
"steppedLine": false,
1021510215
"targets": [
1021610216
{
10217-
"expr": "sum(rate(tnt_cpu_user_time{job=~\"$job\"}[$__rate_interval]))",
10217+
"expr": "sum(rate(tnt_cpu_user_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]))\n",
1021810218
"format": "time_series",
1021910219
"intervalFactor": 2,
10220-
"legendFormat": "CPU total user time",
10220+
"legendFormat": "CPU total user time per cluster",
1022110221
"refId": "A"
1022210222
}
1022310223
],
@@ -10302,10 +10302,10 @@
1030210302
"steppedLine": false,
1030310303
"targets": [
1030410304
{
10305-
"expr": "sum(rate(tnt_cpu_system_time{job=~\"$job\"}[$__rate_interval]))",
10305+
"expr": "sum(rate(tnt_cpu_system_time{alias=~\"$alias\",job=~\"$job\"}[$__rate_interval]))\n",
1030610306
"format": "time_series",
1030710307
"intervalFactor": 2,
10308-
"legendFormat": "CPU total system time",
10308+
"legendFormat": "CPU total system time per cluster",
1030910309
"refId": "A"
1031010310
}
1031110311
],

0 commit comments

Comments
 (0)