Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0af8af1a
Commit
0af8af1a
authored
Mar 22, 2022
by
Jaspreet Singh
Committed by
Paul Slaughter
Mar 22, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve duplication between configuration_banner files
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81395
parent
4655b0ab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
32 deletions
+10
-32
app/views/projects/services/prometheus/_help.html.haml
app/views/projects/services/prometheus/_help.html.haml
+2
-1
app/views/projects/settings/operations/_configuration_banner.html.haml
...jects/settings/operations/_configuration_banner.html.haml
+0
-24
app/views/projects/settings/operations/_prometheus.html.haml
app/views/projects/settings/operations/_prometheus.html.haml
+1
-1
app/views/shared/_prometheus_configuration_banner.html.haml
app/views/shared/_prometheus_configuration_banner.html.haml
+7
-6
No files found.
app/views/projects/services/prometheus/_help.html.haml
View file @
0af8af1a
-
if
@project
-
if
@project
=
render
'projects/services/prometheus/configuration_banner'
,
project:
@project
,
integration:
integration
=
render
'shared/prometheus_configuration_banner'
,
project:
@project
,
integration:
integration
,
header_tag: :h4
%hr
%h4
.gl-mb-3
%h4
.gl-mb-3
=
s_
(
'PrometheusService|Manual configuration'
)
=
s_
(
'PrometheusService|Manual configuration'
)
...
...
app/views/projects/settings/operations/_configuration_banner.html.haml
deleted
100644 → 0
View file @
4655b0ab
%b
=
s_
(
'PrometheusService|Prometheus cluster integration'
)
-
if
service
.
manual_configuration?
.info-well.p-2.mt-2
=
s_
(
'PrometheusService|To use a Prometheus installed on a cluster, deactivate the manual configuration.'
)
-
else
.container-fluid
.row
-
if
service
.
prometheus_available?
.col-sm-2
.svg-container
=
image_tag
'illustrations/monitoring/getting_started.svg'
.col-sm-10
%p
.text-success.gl-mt-3
=
s_
(
'PrometheusService|You have a cluster with the Prometheus integration enabled.'
)
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
project
),
class:
'gl-button btn btn-default'
-
else
.col-sm-2
=
image_tag
'illustrations/monitoring/loading.svg'
.col-sm-10
%p
.gl-mt-3
=
s_
(
'PrometheusService|Configure GitLab to query a Prometheus installed in one of your clusters.'
)
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
project
),
class:
'btn gl-button btn-confirm'
app/views/projects/settings/operations/_prometheus.html.haml
View file @
0af8af1a
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
=
link_to
_
(
'More information'
),
help_page_path
(
'user/project/integrations/prometheus'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
=
link_to
_
(
'More information'
),
help_page_path
(
'user/project/integrations/prometheus'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
.settings-content
.settings-content
-
if
@project
-
if
@project
=
render
'
projects/settings/operations/configuration_banner'
,
project:
@project
,
service:
service
=
render
'
shared/prometheus_configuration_banner'
,
project:
@project
,
integration:
service
,
header_tag: :b
,
info_well_classes:
'gl-p-3 gl-mt-3'
%b
.gl-mb-3
%b
.gl-mb-3
=
s_
(
'PrometheusService|Manual configuration'
)
=
s_
(
'PrometheusService|Manual configuration'
)
...
...
app/views/
projects/services/prometheus/
_configuration_banner.html.haml
→
app/views/
shared/_prometheus
_configuration_banner.html.haml
View file @
0af8af1a
%h4
-
header_tag
=
local_assigns
.
fetch
(
:header_tag
)
=
s_
(
'PrometheusService|Prometheus cluster integration'
)
-
info_well_classes
=
local_assigns
.
fetch
(
:info_well_classes
,
''
)
-
integration
=
local_assigns
.
fetch
(
:integration
)
=
content_tag
(
header_tag
,
s_
(
'PrometheusService|Prometheus cluster integration'
))
-
if
integration
.
manual_configuration?
-
if
integration
.
manual_configuration?
.info-well
.info-well
{
class:
info_well_classes
}
=
s_
(
'PrometheusService|To use a Prometheus installed on a cluster, deactivate the manual configuration.'
)
=
s_
(
'PrometheusService|To use a Prometheus installed on a cluster, deactivate the manual configuration.'
)
-
else
-
else
.container-fluid
.container-fluid
...
@@ -14,7 +17,7 @@
...
@@ -14,7 +17,7 @@
.col-sm-10
.col-sm-10
%p
.text-success.gl-mt-3
%p
.text-success.gl-mt-3
=
s_
(
'PrometheusService|You have a cluster with the Prometheus integration enabled.'
)
=
s_
(
'PrometheusService|You have a cluster with the Prometheus integration enabled.'
)
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
project
),
class:
'btn gl-button'
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
project
),
class:
'btn gl-button
btn-default
'
-
else
-
else
.col-sm-2
.col-sm-2
=
image_tag
'illustrations/monitoring/loading.svg'
=
image_tag
'illustrations/monitoring/loading.svg'
...
@@ -22,5 +25,3 @@
...
@@ -22,5 +25,3 @@
%p
.gl-mt-3
%p
.gl-mt-3
=
s_
(
'PrometheusService|Configure GitLab to query a Prometheus installed in one of your clusters.'
)
=
s_
(
'PrometheusService|Configure GitLab to query a Prometheus installed in one of your clusters.'
)
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
project
),
class:
'btn gl-button btn-confirm'
=
link_to
s_
(
'PrometheusService|Manage clusters'
),
project_clusters_path
(
project
),
class:
'btn gl-button btn-confirm'
%hr
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment