Adding files for release 3.8.0

scylladb · Jun 16, 2021 · 60d6ea9 · 60d6ea9
1 parent 508dab2
commit 60d6ea9
Show file tree

Hide file tree

Showing 40 changed files with 43,858 additions and 1,692 deletions.
diff --git a/CURRENT_VERSION.sh b/CURRENT_VERSION.sh
@@ -1 +1 @@
-master
+3.8.0
diff --git a/grafana/build/manager_2.3/scylla-manager.2.3.json b/grafana/build/manager_2.3/scylla-manager.2.3.json
@@ -343,6 +343,7 @@
             "span": 2,
             "targets": [
                 {
+                    "dashversion": "<2.4",
                     "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)",
                     "format": "time_series",
                     "intervalFactor": 2,
@@ -512,6 +513,7 @@
             "span": 2,
             "targets": [
                 {
+                    "dashversion": "<2.4",
                     "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)",
                     "format": "time_series",
                     "intervalFactor": 2,
@@ -643,6 +645,7 @@
             "class": "ops_panel",
             "dashLength": 10,
             "dashes": false,
+            "dashversion": "<2.4",
             "datasource": "prometheus",
             "editable": true,
             "error": false,
@@ -746,6 +749,7 @@
             "class": "ops_panel",
             "dashLength": 10,
             "dashes": false,
+            "dashversion": "<2.4",
             "datasource": "prometheus",
             "editable": true,
             "error": false,
@@ -849,6 +853,7 @@
             "class": "graph_panel",
             "dashLength": 10,
             "dashes": false,
+            "dashversion": "<2.4",
             "datasource": "prometheus",
             "description": "The number of SSH connection used by the manager",
             "editable": true,
@@ -1302,7 +1307,7 @@
             "links": [],
             "mode": "html",
             "options": {
-                "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>",
+                "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>",
                 "mode": "html"
             },
             "span": 12,
@@ -1373,9 +1378,38 @@
                 "includeAll": false,
                 "label": "cluster",
                 "multi": false,
+                "name": "cluster_name",
+                "options": [],
+                "query": "label_values(scylla_manager_cluster_name,name)",
+                "refresh": 2,
+                "regex": "",
+                "skipUrlSync": false,
+                "sort": 1,
+                "tagValuesQuery": "",
+                "tags": [],
+                "tagsQuery": "",
+                "type": "query",
+                "useTags": false
+            },
+            {
+                "allValue": null,
+                "class": "template_variable_single",
+                "current": {
+                    "isNone": true,
+                    "selected": false,
+                    "text": "None",
+                    "value": ""
+                },
+                "datasource": "prometheus",
+                "definition": "",
+                "error": null,
+                "hide": 2,
+                "includeAll": false,
+                "label": "cluster_id",
+                "multi": false,
                 "name": "cluster",
                 "options": [],
-                "query": "label_values(scylla_manager_healthcheck_cql_rtt_ms, cluster)",
+                "query": "label_values(scylla_manager_cluster_name{name=\"$cluster_name\"}, cluster)",
                 "refresh": 2,
                 "regex": "",
                 "skipUrlSync": false,
@@ -1462,7 +1496,7 @@
                 "includeAll": false,
                 "label": null,
                 "multi": false,
-                "name": "scylla_dash_version",
+                "name": "scylla_version",
                 "options": [
                     {
                         "selected": true,
@@ -1478,8 +1512,8 @@
                 "allValue": null,
                 "class": "monitor_version_var",
                 "current": {
-                    "text": "master",
-                    "value": "master"
+                    "text": "3.8.0",
+                    "value": "3.8.0"
                 },
                 "error": null,
                 "hide": 2,
@@ -1490,11 +1524,11 @@
                 "options": [
                     {
                         "selected": true,
-                        "text": "master",
-                        "value": "master"
+                        "text": "3.8.0",
+                        "value": "3.8.0"
                     }
                 ],
-                "query": "master",
+                "query": "3.8.0",
                 "skipUrlSync": false,
                 "type": "custom"
             }