Skip to content

Commit 60d6ea9

Browse files
committed
Adding files for release 3.8.0
1 parent 508dab2 commit 60d6ea9

40 files changed

+43858
-1692
lines changed

CURRENT_VERSION.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
master
1+
3.8.0

grafana/build/manager_2.3/scylla-manager.2.3.json

+42-8
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@
343343
"span": 2,
344344
"targets": [
345345
{
346+
"dashversion": "<2.4",
346347
"expr": "sum(avg(scylla_manager_repair_progress{cluster=~\"[[cluster]]\", instance=\"\", keyspace=\"\"}) by (task) * sum(scylla_manager_task_active_count{cluster=~\"[[cluster]]\", type=\"repair\"}) by (task)) or vector(0)",
347348
"format": "time_series",
348349
"intervalFactor": 2,
@@ -512,6 +513,7 @@
512513
"span": 2,
513514
"targets": [
514515
{
516+
"dashversion": "<2.4",
515517
"expr": "sum(avg(scylla_manager_backup_percent_progress{cluster=~\"[[cluster]]\", instance=\"\", keyspace=\"\"}) by (task) * sum(scylla_manager_task_active_count{cluster=~\"[[cluster]]\", type=\"backup\"}) by (task)) or vector(0)",
516518
"format": "time_series",
517519
"intervalFactor": 2,
@@ -643,6 +645,7 @@
643645
"class": "ops_panel",
644646
"dashLength": 10,
645647
"dashes": false,
648+
"dashversion": "<2.4",
646649
"datasource": "prometheus",
647650
"editable": true,
648651
"error": false,
@@ -746,6 +749,7 @@
746749
"class": "ops_panel",
747750
"dashLength": 10,
748751
"dashes": false,
752+
"dashversion": "<2.4",
749753
"datasource": "prometheus",
750754
"editable": true,
751755
"error": false,
@@ -849,6 +853,7 @@
849853
"class": "graph_panel",
850854
"dashLength": 10,
851855
"dashes": false,
856+
"dashversion": "<2.4",
852857
"datasource": "prometheus",
853858
"description": "The number of SSH connection used by the manager",
854859
"editable": true,
@@ -1302,7 +1307,7 @@
13021307
"links": [],
13031308
"mode": "html",
13041309
"options": {
1305-
"content": "<div style=\"color:#5881c2; border-bottom: 0px solid #5881c2;\">Scylla Monitoring version - master</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_dash_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1000&height=2500\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
1310+
"content": "<div style=\"color:#5881c2; border-bottom: 0px solid #5881c2;\">Scylla Monitoring version - 3.8.0</div> <div style=\"\"><a href=\"https://github.com/scylladb/scylla-monitoring/issues/new?body=scylla-version%3D[[scylla_version]]%0Amonitoring-version%3D[[monitoring_version]]%0Adashboard%3D${__dashboard.uid}\" target=\"_blank\">\n<input title=\"Report an issue with Scylla Monitoring\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;Report an issue on this page&nbsp;\"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"/render/d/${__dashboard.uid}?orgId=1&from=${__from}&to=${__to}&width=1000&height=2500\" target=\"_blank\" download=\"dashboard_${__dashboard.uid}-${__from:date:iso}.png\"><input title=\"Make a Screenshot\" type=\"button\" style=\"background-color:#306EE6;color:white;border-radius: 15px;font-size:14px;line-height:22px;padding:2px\" value=\"&nbsp;&nbsp;&nbsp;Screenshot&nbsp;&nbsp;&nbsp;\"></input></a></span></div>",
13061311
"mode": "html"
13071312
},
13081313
"span": 12,
@@ -1373,9 +1378,38 @@
13731378
"includeAll": false,
13741379
"label": "cluster",
13751380
"multi": false,
1381+
"name": "cluster_name",
1382+
"options": [],
1383+
"query": "label_values(scylla_manager_cluster_name,name)",
1384+
"refresh": 2,
1385+
"regex": "",
1386+
"skipUrlSync": false,
1387+
"sort": 1,
1388+
"tagValuesQuery": "",
1389+
"tags": [],
1390+
"tagsQuery": "",
1391+
"type": "query",
1392+
"useTags": false
1393+
},
1394+
{
1395+
"allValue": null,
1396+
"class": "template_variable_single",
1397+
"current": {
1398+
"isNone": true,
1399+
"selected": false,
1400+
"text": "None",
1401+
"value": ""
1402+
},
1403+
"datasource": "prometheus",
1404+
"definition": "",
1405+
"error": null,
1406+
"hide": 2,
1407+
"includeAll": false,
1408+
"label": "cluster_id",
1409+
"multi": false,
13761410
"name": "cluster",
13771411
"options": [],
1378-
"query": "label_values(scylla_manager_healthcheck_cql_rtt_ms, cluster)",
1412+
"query": "label_values(scylla_manager_cluster_name{name=\"$cluster_name\"}, cluster)",
13791413
"refresh": 2,
13801414
"regex": "",
13811415
"skipUrlSync": false,
@@ -1462,7 +1496,7 @@
14621496
"includeAll": false,
14631497
"label": null,
14641498
"multi": false,
1465-
"name": "scylla_dash_version",
1499+
"name": "scylla_version",
14661500
"options": [
14671501
{
14681502
"selected": true,
@@ -1478,8 +1512,8 @@
14781512
"allValue": null,
14791513
"class": "monitor_version_var",
14801514
"current": {
1481-
"text": "master",
1482-
"value": "master"
1515+
"text": "3.8.0",
1516+
"value": "3.8.0"
14831517
},
14841518
"error": null,
14851519
"hide": 2,
@@ -1490,11 +1524,11 @@
14901524
"options": [
14911525
{
14921526
"selected": true,
1493-
"text": "master",
1494-
"value": "master"
1527+
"text": "3.8.0",
1528+
"value": "3.8.0"
14951529
}
14961530
],
1497-
"query": "master",
1531+
"query": "3.8.0",
14981532
"skipUrlSync": false,
14991533
"type": "custom"
15001534
}

0 commit comments

Comments
 (0)