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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d1c3f3d8
Commit
d1c3f3d8
authored
Jun 14, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add monitoring link with subtabs
parent
922a164d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
137 additions
and
119 deletions
+137
-119
app/views/admin/background_jobs/_head.html.haml
app/views/admin/background_jobs/_head.html.haml
+14
-0
app/views/admin/background_jobs/show.html.haml
app/views/admin/background_jobs/show.html.haml
+43
-39
app/views/admin/health_check/show.html.haml
app/views/admin/health_check/show.html.haml
+48
-45
app/views/admin/logs/show.html.haml
app/views/admin/logs/show.html.haml
+28
-24
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+4
-11
No files found.
app/views/admin/background_jobs/_head.html.haml
0 → 100644
View file @
d1c3f3d8
%ul
.nav-links.sub-nav
%div
{
class:
(
container_class
)
}
=
nav_link
(
controller: :background_jobs
)
do
=
link_to
admin_background_jobs_path
,
title:
'Background Jobs'
do
%span
Background Jobs
=
nav_link
(
controller: :logs
)
do
=
link_to
admin_logs_path
,
title:
'Logs'
do
%span
Logs
=
nav_link
(
controller: :health_check
)
do
=
link_to
admin_health_check_path
,
title:
'Health Check'
do
%span
Health Check
app/views/admin/background_jobs/show.html.haml
View file @
d1c3f3d8
-
@no_container
=
true
-
page_title
"Background Jobs"
-
page_title
"Background Jobs"
%h3
.page-title
Background Jobs
=
render
'admin/background_jobs/head'
%p
.light
GitLab uses
#{
link_to
"sidekiq"
,
"http://sidekiq.org/"
}
library for async job processing
%hr
%div
{
class:
(
container_class
)
}
%h3
.page-title
Background Jobs
%p
.light
GitLab uses
#{
link_to
"sidekiq"
,
"http://sidekiq.org/"
}
library for async job processing
.panel.panel-default
%hr
.panel.panel-default
.panel-heading
Sidekiq running processes
.panel-heading
Sidekiq running processes
.panel-body
.panel-body
-
if
@sidekiq_processes
.
empty?
-
if
@sidekiq_processes
.
empty?
...
@@ -42,5 +46,5 @@
...
@@ -42,5 +46,5 @@
.panel.panel-default
.panel.panel-default
%iframe
{
src:
sidekiq_path
,
width:
'100%'
,
height:
970
,
style:
"border: none"
}
%iframe
{
src:
sidekiq_path
,
width:
'100%'
,
height:
970
,
style:
"border: none"
}
app/views/admin/health_check/show.html.haml
View file @
d1c3f3d8
-
@no_container
=
true
-
page_title
"Health Check"
-
page_title
"Health Check"
=
render
'admin/background_jobs/head'
%h3
.page-title
%div
{
class:
(
container_class
)
}
%h3
.page-title
Health Check
Health Check
.bs-callout.clearfix
.bs-callout.clearfix
.pull-left
.pull-left
%p
%p
Access token is
Access token is
...
@@ -12,7 +15,7 @@
...
@@ -12,7 +15,7 @@
data:
{
confirm:
'Are you sure you want to reset the health check token?'
}
do
data:
{
confirm:
'Are you sure you want to reset the health check token?'
}
do
=
icon
(
'refresh'
)
=
icon
(
'refresh'
)
Reset health check access token
Reset health check access token
%p
.light
%p
.light
Health information can be retrieved as plain text, JSON, or XML using:
Health information can be retrieved as plain text, JSON, or XML using:
%ul
%ul
%li
%li
...
@@ -22,7 +25,7 @@
...
@@ -22,7 +25,7 @@
%li
%li
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
format: :xml
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
format: :xml
)
%p
.light
%p
.light
You can also ask for the status of specific services:
You can also ask for the status of specific services:
%ul
%ul
%li
%li
...
@@ -32,8 +35,8 @@
...
@@ -32,8 +35,8 @@
%li
%li
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
checks: :migrations
)
%code
=
health_check_url
(
token:
current_application_settings
.
health_check_access_token
,
checks: :migrations
)
%hr
%hr
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
Current Status:
Current Status:
-
if
@errors
.
blank?
-
if
@errors
.
blank?
...
...
app/views/admin/logs/show.html.haml
View file @
d1c3f3d8
-
@no_container
=
true
-
page_title
"Logs"
-
page_title
"Logs"
-
loggers
=
[
Gitlab
::
GitLogger
,
Gitlab
::
AppLogger
,
-
loggers
=
[
Gitlab
::
GitLogger
,
Gitlab
::
AppLogger
,
Gitlab
::
ProductionLogger
,
Gitlab
::
SidekiqLogger
,
Gitlab
::
ProductionLogger
,
Gitlab
::
SidekiqLogger
,
Gitlab
::
RepositoryCheckLogger
]
Gitlab
::
RepositoryCheckLogger
]
%ul
.nav-links.log-tabs
=
render
'admin/background_jobs/head'
%div
{
class:
(
container_class
)
}
%ul
.nav-links.log-tabs
-
loggers
.
each
do
|
klass
|
-
loggers
.
each
do
|
klass
|
%li
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
)
}
%li
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
)
}
=
link_to
klass
::
file_name
,
"#
#{
klass
::
file_name_noext
}
"
,
=
link_to
klass
::
file_name
,
"#
#{
klass
::
file_name_noext
}
"
,
'data-toggle'
=>
'tab'
'data-toggle'
=>
'tab'
.row-content-block
.row-content-block
To prevent performance issues admin logs output the last 2000 lines
To prevent performance issues admin logs output the last 2000 lines
.tab-content
.tab-content
-
loggers
.
each
do
|
klass
|
-
loggers
.
each
do
|
klass
|
.tab-pane
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
),
.tab-pane
{
class:
(
klass
==
Gitlab
::
GitLogger
?
'active'
:
''
),
id:
klass
::
file_name_noext
}
id:
klass
::
file_name_noext
}
...
...
app/views/layouts/nav/_admin.html.haml
View file @
d1c3f3d8
...
@@ -16,14 +16,10 @@
...
@@ -16,14 +16,10 @@
=
link_to
admin_builds_path
,
title:
'Builds'
do
=
link_to
admin_builds_path
,
title:
'Builds'
do
%span
%span
Builds
Builds
=
nav_link
(
controller:
:logs
)
do
=
nav_link
(
controller:
%w(background_jobs logs health_check)
)
do
=
link_to
admin_
logs_path
,
title:
'Logs
'
do
=
link_to
admin_
background_jobs_path
,
title:
'Monitoring
'
do
%span
%span
Logs
Monitoring
=
nav_link
(
controller: :health_check
)
do
=
link_to
admin_health_check_path
,
title:
'Health Check'
do
%span
Health Check
=
nav_link
(
controller: :broadcast_messages
)
do
=
nav_link
(
controller: :broadcast_messages
)
do
=
link_to
admin_broadcast_messages_path
,
title:
'Messages'
do
=
link_to
admin_broadcast_messages_path
,
title:
'Messages'
do
%span
%span
...
@@ -32,10 +28,7 @@
...
@@ -32,10 +28,7 @@
=
link_to
admin_hooks_path
,
title:
'Hooks'
do
=
link_to
admin_hooks_path
,
title:
'Hooks'
do
%span
%span
Hooks
Hooks
=
nav_link
(
controller: :background_jobs
)
do
=
link_to
admin_background_jobs_path
,
title:
'Background Jobs'
do
%span
Background Jobs
=
nav_link
(
controller: :appearances
)
do
=
nav_link
(
controller: :appearances
)
do
=
link_to
admin_appearances_path
,
title:
'Appearances'
do
=
link_to
admin_appearances_path
,
title:
'Appearances'
do
%span
%span
...
...
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