Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for 4 8 #2351

Merged
merged 3 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

# Build documentation for the following tags and branches
TAGS = []
BRANCHES = ['master', 'branch-3.4', 'branch-3.5', 'branch-3.6', 'branch-3.7', 'branch-3.8', 'branch-3.9', 'branch-3.10', 'branch-4.0', 'branch-4.1', 'branch-4.2', 'branch-4.3', 'branch-4.4', 'branch-4.5', 'branch-4.6', 'branch-4.7']
BRANCHES = ['master', 'branch-3.4', 'branch-3.5', 'branch-3.6', 'branch-3.7', 'branch-3.8', 'branch-3.9', 'branch-3.10', 'branch-4.0', 'branch-4.1', 'branch-4.2', 'branch-4.3', 'branch-4.4', 'branch-4.5', 'branch-4.6', 'branch-4.7', 'branch-4.8']
# Set the latest version.
LATEST_VERSION = 'branch-4.7'
# Set which versions are not released yet.
UNSTABLE_VERSIONS = ['master']
UNSTABLE_VERSIONS = ['master', 'branch-4.8']
# Set which versions are deprecated
DEPRECATED_VERSIONS = []

Expand Down Expand Up @@ -67,7 +67,7 @@
.. |mon_root| replace:: `Scylla Monitoring Stack </>`__
""".format(current_version=current_version, current_branch=current_branch)

# -- Options for not found extension
# -- Options for not found extension

# Template used to render the 404.html generated by this extension.
notfound_template = '404.html'
Expand Down
6 changes: 6 additions & 0 deletions docs/source/install/monitoring-stack.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ Prerequisites
* - Scylla Monitoring Stack Version
- Prometheus Version
- Grafana Version
* - 4.8
- 2.53.0
- 11.1.0
* - 4.7
- 2.50.1
- 11.0.0
* - 4.6
- 2.48.1
- 10.2.2
Expand Down
11 changes: 8 additions & 3 deletions docs/source/reference/matrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
- 5.2, 5.4, 6.0, 6.1
- 2022.1, 2022.2, 2023.1, 2024.1
- 1.7.0
- 3.3
* - 4.7
- 5.2, 5.4, 6.0
- 2022.1, 2022.2, 2023.1, 2024.1
Expand Down Expand Up @@ -128,12 +133,12 @@ The following table shows which version of Scylla Monitoring Stack supports dash
- 3.1, 3.2, 3.3
- 2018.1, 2019.1
- 0.17
- 1.4, 2.0
- 1.4, 2.0
* - 3.1
- 2.3, 3.0, 3.1, 3.2
- 2018.1, 2019.1
- 0.17
- 1.3, 1.4, 2.0
- 1.3, 1.4, 2.0
* - 3.0
- 2.3, 3.0, 3.1, 3.2
- 2018.1, 2019.1
Expand All @@ -148,7 +153,7 @@ The following table shows which version of Scylla Monitoring Stack supports dash
- 2.3, 3.0
- 2018.1, 2019.1
- 0.14, 0.17
- 1.3
- 1.3
* - 2.2
- 2.3, 3.0
- 2018.1, 2019.1
Expand Down
4 changes: 2 additions & 2 deletions versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ MANAGER_SUPPORTED_VERSIONS["4.7"]="3.2"
SUPPORTED_VERSIONS["4.8"]="5.4,6.0,6.1,2022.1,2022.2,2023.1,2024.1,master"
DEFAULT_VERSION["4.8"]="6.0"
DEFAULT_ENTERPRISE_VERSION["4.8"]="2024.1"
MANAGER_DEFAULT_VERSION["4.8"]="3.2"
MANAGER_DEFAULT_VERSION["4.8"]="3.3"
MANAGER_SUPPORTED_VERSIONS["4.8"]="3.2,3.3"
MANAGER_DEFAULT_VERSION["master"]="3.3"
PROMETHEUS_VERSION=v2.53.0
ALERT_MANAGER_VERSION="v0.27.0"
GRAFANA_VERSION=11.1.0
LOKI_VERSION="3.0.0"
LOKI_VERSION="3.1.0"
GRAFANA_RENDERER_VERSION="3.11.0"
THANOS_VERSION="v0.35.1"
VICTORIA_METRICS_VERSION="v1.96.0"