Skip to content
Snippets Groups Projects
Commit 993147d9345a authored by Ian Baum's avatar Ian Baum
Browse files

Merge branch 'grafana-downgrade' into 'master'

Downgrade grafana to the 7.x release branch

See merge request gitlab-org/omnibus-gitlab!5675
No related branches found
No related tags found
2 merge requests!55Intermediate build after shift of stable series,!54GitLab 14.4
......@@ -18,7 +18,7 @@
require "#{Omnibus::Config.project_root}/lib/gitlab/ohai_helper.rb"
name 'grafana'
version = Gitlab::Version.new('grafana', '8.1.3')
version = Gitlab::Version.new('grafana', '7.5.11')
default_version version.print(false)
license 'APACHE-2.0'
......@@ -28,5 +28,5 @@
skip_transitive_dependency_licensing true
arch, sha = if OhaiHelper.raspberry_pi?
%w[armv7 e668f5ebfb068c8390d2ef16f2bb2622b47b015f273c7b98811ce3c35609dc43]
%w[armv7 2a4e6da6b70e8d39c04b884d210036d2e55e05c7413abe7ba12b7a1d1064ecb0]
elsif /aarch64/.match?(ohai['kernel']['machine'])
......@@ -32,3 +32,3 @@
elsif /aarch64/.match?(ohai['kernel']['machine'])
%w[arm64 7d8cb5c03d6f126baded2da41a9f4802453e4bbaf72a2889d414d303feb6b587]
%w[arm64 3b18082d1159014015d52e6fe706fd91d9862b659d5ff9ba1c1641072544702e]
else
......@@ -34,5 +34,5 @@
else
%w[amd64 d5964c64412bb7f383e79984bbf985d97aec65c0d593bd348d19137182b5e2b1]
%w[amd64 3244d0ced48d2de9726c9a3bd6d5f08c1b6a081d42665401e033fc4a31c57d5d]
end
source url: "https://dl.grafana.com/oss/release/grafana-#{default_version}.linux-#{arch}.tar.gz",
......
......@@ -9,6 +9,21 @@
NOTE:
When upgrading to a new major version, remember to first [check for background migrations](https://docs.gitlab.com/ee/update/index.html#checking-for-background-migrations-before-upgrading).
## 14.4
### Downgrading Grafana from 8.1 to 7.5
In GitLab 14.4 the provided Grafana version is 7.5, this is a downgrade from
the Grafana 8.1 version introduced in GitLab 14.3. This was reverted to an
Apache-licensed Grafana release to allow time to consider the implications of
the newer AGPL-licensed releases.
Users that have customized their Grafana install with plugins or library
panels may experience errors in Grafana after the downgrade. If the errors
persist after a Grafana restart you may need to reset the Grafana db and
re-add the customizations. The Grafana database can be reset with
`sudo gitlab-ctl reset-grafana`.
## 14.0
### Removing support for running Sidekiq directly instead of `sidekiq-cluster`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment