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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
06e7c157
Commit
06e7c157
authored
Jan 31, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style the prometheus integration service page according to design
parent
310ae687
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
10 deletions
+33
-10
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+11
-0
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+1
-1
app/views/projects/services/prometheus/_help.html.haml
app/views/projects/services/prometheus/_help.html.haml
+21
-9
No files found.
app/assets/stylesheets/pages/settings.scss
View file @
06e7c157
...
...
@@ -135,6 +135,17 @@
padding-top
:
0
;
}
.integration-settings-form
{
.well
{
padding
:
$gl-padding
/
2
;
box-shadow
:
none
;
}
.svg-container
{
max-width
:
150px
;
}
}
.token-token-container
{
#impersonation-token-token
{
width
:
80%
;
...
...
app/views/projects/services/_form.html.haml
View file @
06e7c157
...
...
@@ -9,7 +9,7 @@
%p
=
@service
.
description
.col-lg-9
=
form_for
(
@service
,
as: :service
,
url:
project_service_path
(
@project
,
@service
.
to_param
),
method: :put
,
html:
{
class:
'gl-show-field-errors form-horizontal js-integration-settings-form'
,
data:
{
'can-test'
=>
@service
.
can_test?
,
'test-url'
=>
test_project_service_path
(
@project
,
@service
)
}
})
do
|
form
|
=
form_for
(
@service
,
as: :service
,
url:
project_service_path
(
@project
,
@service
.
to_param
),
method: :put
,
html:
{
class:
'gl-show-field-errors form-horizontal
integration-settings-form
js-integration-settings-form'
,
data:
{
'can-test'
=>
@service
.
can_test?
,
'test-url'
=>
test_project_service_path
(
@project
,
@service
)
}
})
do
|
form
|
=
render
'shared/service_settings'
,
form:
form
,
subject:
@service
-
if
@service
.
editable?
.footer-block.row-content-block
...
...
app/views/projects/services/prometheus/_help.html.haml
View file @
06e7c157
%h4
Auto configuration
.prepend-top-default.append-bottom-default
-
unless
@service
.
manual_configuration?
-
if
@service
.
prometheus_installed?
=
link_to
'Manage clusters'
,
project_clusters_path
(
@project
),
class:
'btn'
-
else
=
link_to
'Install Prometheus on clusters'
,
project_clusters_path
(
@project
),
class:
'btn btn-success'
-
else
.well
To enable the installation of Prometheus on your clusters, deactivate the manual configuration below
-
unless
@service
.
manual_configuration?
.container-fluid
.row
-
if
@service
.
prometheus_installed?
.col-sm-2
.svg-container
=
image_tag
'illustrations/monitoring/getting_started.svg'
.col-sm-10
%p
.text-success.prepend-top-default
Prometheus is being automatically managed on your clusters
=
link_to
'Manage clusters'
,
project_clusters_path
(
@project
),
class:
'btn'
-
else
.col-sm-2
=
image_tag
'illustrations/monitoring/loading.svg'
.col-sm-10
%p
.prepend-top-default
Automatically deploy and configure Prometheus on your clusters to monitor your project’s environments
=
link_to
'Install Prometheus on clusters'
,
project_clusters_path
(
@project
),
class:
'btn btn-success'
-
else
.well
To enable the installation of Prometheus on your clusters, deactivate the manual configuration below
%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