Merge pull request #2202 from amnonh/prepare_for_4_7

Prepare for 4 7
scylladb · Mar 6, 2024 · 531f028 · 531f028
2 parents 7f0900d + d1fb77e
commit 531f028
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/docs/source/reference/matrix.rst b/docs/source/reference/matrix.rst
@@ -14,6 +14,11 @@ The following table shows which version of Scylla Monitoring Stack supports dash
      - Scylla Enterprise Version
      - Node_exporter[1] Version
      - Scylla Manager Version
+   * - 4.7
+     - 5.2, 5.4, 6.0
+     - 2021.1, 2022.1, 2022.2, 2023.1, 2024.1
+     - 1.4.1
+     - 3.2
    * - 4.6
      - 5.2, 5.4
      - 2021.1, 2022.1, 2022.2, 2023.1, 2024.1

diff --git a/grafana/scylla-detailed.template.json b/grafana/scylla-detailed.template.json
@@ -76,6 +76,7 @@
             },
             {
                 "class": "row",
+                "dashversion":[">6.0"],
                 "panels": [
                     {
                         "class": "collapsible_row_panel",
@@ -85,6 +86,7 @@
             },
            {
            "class": "row",
+           "dashversion":[">6.0"],
                 "panels": [
                  {
                  "title": "Tablet over time per [[by]]",
@@ -120,7 +122,8 @@
                    }
                  ]
                }
-         ]},
+         ]
+         },
             {
                 "class": "row",
                 "panels": [

diff --git a/grafana/scylla-ks.template.json b/grafana/scylla-ks.template.json
@@ -34,9 +34,10 @@
             },
            {
            "class": "row",
+           "dashversion":[">6.0"],
                 "panels": [
                  {
-                 "title": "Tablet over time per [[by]]",
+                 "title": "Tablets over time per [[by]]",
                  "type": "heatmap",
                  "class": "barchart_panel",
                  "gridPos": {
@@ -249,7 +250,6 @@
                         ],
                         "title": "Live sstables by [[by]]"
                     }
-
                 ]
             },
             {

diff --git a/versions.sh b/versions.sh
@@ -85,11 +85,16 @@ DEFAULT_VERSION["4.6"]="5.4"
 DEFAULT_ENTERPRISE_VERSION["4.6"]="2023.1"
 MANAGER_DEFAULT_VERSION["4.6"]="3.1"
 MANAGER_SUPPORTED_VERSIONS["4.6"]="3.0,3.1,3.2"
-MANAGER_DEFAULT_VERSION["master"]="3.1"
-PROMETHEUS_VERSION=v2.49.1
+SUPPORTED_VERSIONS["4.7"]="5.2,5.4,6.0,2021.1,2022.1,2022.2,2023.1,2024.1,master"
+DEFAULT_VERSION["4.7"]="6.0"
+DEFAULT_ENTERPRISE_VERSION["4.7"]="2024.1"
+MANAGER_DEFAULT_VERSION["4.7"]="3.2"
+MANAGER_SUPPORTED_VERSIONS["4.7"]="3.2"
+MANAGER_DEFAULT_VERSION["master"]="3.2"
+PROMETHEUS_VERSION=v2.50.1
 ALERT_MANAGER_VERSION="v0.26.0"
 GRAFANA_VERSION=10.3.3
-LOKI_VERSION="2.9.3"
-GRAFANA_RENDERER_VERSION="3.9.0"
-THANOS_VERSION="v0.32.5"
+LOKI_VERSION="2.9.5"
+GRAFANA_RENDERER_VERSION="3.10.0"
+THANOS_VERSION="v0.34.1"
 VICTORIA_METRICS_VERSION="v1.96.0"