Skip to content

Commit 153fede

Browse files
pursultaniRobert Marshall
authored andcommitted
Drop Grafana and related code from the package
Software configuration and related code and documentation are removed from the package. Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8092 Changelog: removed
1 parent 1a156d0 commit 153fede

File tree

39 files changed

+9
-2529
lines changed

39 files changed

+9
-2529
lines changed

.custom_sources.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ nginx-module-vts:
8282
ngx_security_headers:
8383
remote: "[email protected]:omnibus-mirror/ngx_security_headers.git"
8484
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/ngx_security_headers.git"
85-
grafana-dashboards:
86-
remote: "[email protected]:omnibus-mirror/grafana-dashboards.git"
87-
alternative: "https://gitlab.com/gitlab-org/grafana-dashboards.git"
8885
zlib:
8986
remote: "[email protected]:omnibus-mirror/zlib.git"
9087
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/zlib.git"
@@ -154,9 +151,6 @@ libtensorflow_lite:
154151
spamcheck:
155152
remote: "[email protected]:gitlab/spamcheck.git"
156153
alternative: "https://gitlab.com/gitlab-com/gl-security/engineering-and-research/automation-team/spam/spamcheck.git"
157-
grafana:
158-
remote: "[email protected]:omnibus-mirror/grafana.git"
159-
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/grafana.git"
160154
ncurses:
161155
remote: "[email protected]:omnibus-mirror/ncurses.git"
162156
alternative: "https://gitlab.com/gitlab-org/build/omnibus-mirror/ncurses.git"

.rubocop_todo.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,6 @@ Style/HashTransformation:
279279
- 'files/gitlab-cookbooks/gitlab/libraries/nginx.rb'
280280
- 'lib/gitlab/deployer_helper.rb'
281281

282-
# Offense count: 1
283-
# This cop supports safe autocorrection (--autocorrect).
284-
Style/IfUnlessModifier:
285-
Exclude:
286-
- 'files/gitlab-cookbooks/monitoring/recipes/grafana.rb'
287-
288282
# Offense count: 43
289283
# This cop supports safe autocorrection (--autocorrect).
290284
# Configuration parameters: EnforcedOctalStyle.

config/patches/grafana/cve-2023-1410.patch

Lines changed: 0 additions & 395 deletions
This file was deleted.

config/patches/grafana/deprecation-warning.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.

config/patches/grafana/session-cookie.patch

Lines changed: 0 additions & 144 deletions
This file was deleted.

config/projects/gitlab.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
dependency 'go-crond'
118118
dependency 'docker-distribution-pruner'
119119

120-
dependency 'grafana-dashboards'
121120
if Build::Check.include_ee?
122121
dependency 'consul'
123122
dependency 'pgbouncer-exporter'
@@ -131,7 +130,6 @@
131130
dependency 'redis-exporter'
132131
dependency 'postgres-exporter'
133132
dependency 'prometheus'
134-
dependency 'grafana'
135133
dependency 'gitlab-exporter'
136134
dependency 'mattermost'
137135

config/software/grafana-dashboards.rb

Lines changed: 0 additions & 36 deletions
This file was deleted.

config/software/grafana.rb

Lines changed: 0 additions & 99 deletions
This file was deleted.

deps.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,6 @@ dependencies:
184184
- filename: config/software/libtiff.rb
185185
pattern: "Gitlab::Version.new\\('libtiff', 'v(\\S+)'\\)"
186186
tag_prefix: 'v'
187-
# grafana
188-
https://github.com/grafana/grafana.git:
189-
replace_in_files:
190-
- filename: config/software/grafana.rb
191-
pattern: "Gitlab::Version.new\\('grafana', '(\\S+)'\\)"
192-
tag_prefix: 'v'
193-
range: '< 8.0.0'
194187
# gitlab-registry
195188
https://gitlab.com/gitlab-org/container-registry.git:
196189
replace_in_files:

0 commit comments

Comments
 (0)