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
55d0aeac
Commit
55d0aeac
authored
Jan 01, 2019
by
Peter Leitzen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move tracing view into own partial
parent
cf3ccf49
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
34 deletions
+31
-34
ee/app/views/projects/settings/operations/_tracing.html.haml
ee/app/views/projects/settings/operations/_tracing.html.haml
+29
-0
ee/app/views/projects/settings/operations/show.html.haml
ee/app/views/projects/settings/operations/show.html.haml
+2
-31
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/views/projects/settings/operations/_tracing.html.haml
0 → 100644
View file @
55d0aeac
-
has_jaeger_url
=
setting
.
external_url
.
present?
%section
%h4
=
_
(
"Jaeger tracing"
)
%p
-
if
has_jaeger_url
-
tracing_link
=
link_to
sanitize
(
@project
.
tracing_external_url
,
tags:
[]),
target:
"_blank"
,
rel:
'noopener noreferrer'
do
%span
=
_
(
'Tracing'
)
=
sprite_icon
(
'external-link'
,
size:
16
,
css_class:
'ml-1 vertical-align-middle'
)
-
else
-
tracing_link
=
link_to
project_tracing_path
(
@project
)
do
%span
=
_
(
'Tracing'
)
=
_
(
"To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server"
).
html_safe
%
{
link:
tracing_link
}
=
form_for
@project
,
url:
project_settings_operations_path
(
@project
),
method: :patch
do
|
f
|
=
form_errors
(
@project
)
.form-group
=
f
.
fields_for
:tracing_setting_attributes
,
setting
do
|
form
|
=
form
.
label
:external_url
,
_
(
'Jaeger URL'
),
class:
'label-bold'
=
form
.
url_field
:external_url
,
class:
'form-control'
,
placeholder:
'e.g. https://jaeger.mycompany.com'
%p
.form-text.text-muted
-
jaeger_help_url
=
"https://www.jaegertracing.io/docs/1.7/getting-started/"
-
link_start_tag
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
jaeger_help_url
}
-
link_end_tag
=
"
#{
sprite_icon
(
'external-link'
,
size:
16
,
css_class:
'ml-1 vertical-align-middle'
)
}
</a>"
.
html_safe
=
_
(
"For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}"
).
html_safe
%
{
link_start_tag:
link_start_tag
,
link_end_tag:
link_end_tag
}
=
f
.
submit
_
(
'Save changes'
),
class:
'btn btn-success'
ee/app/views/projects/settings/operations/show.html.haml
View file @
55d0aeac
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
page_title
_
(
"Operations Settings"
)
-
page_title
_
(
"Operations"
)
-
page_title
_
(
"Operations"
)
-
setting
=
tracing_setting
-
if
@project
.
feature_available?
(
:tracing
,
current_user
)
-
has_jaeger_url
=
setting
.
external_url
.
present?
=
render_if_exists
'projects/settings/operations/tracing'
,
setting:
tracing_setting
%section
%h4
=
_
(
"Jaeger tracing"
)
%p
-
if
has_jaeger_url
-
tracing_link
=
link_to
sanitize
(
@project
.
tracing_external_url
,
tags:
[]),
target:
"_blank"
,
rel:
'noopener noreferrer'
do
%span
=
_
(
'Tracing'
)
=
sprite_icon
(
'external-link'
,
size:
16
,
css_class:
'ml-1 vertical-align-middle'
)
-
else
-
tracing_link
=
link_to
project_tracing_path
(
@project
)
do
%span
=
_
(
'Tracing'
)
=
_
(
"To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server"
).
html_safe
%
{
link:
tracing_link
}
=
form_for
@project
,
url:
project_settings_operations_path
(
@project
),
method: :patch
do
|
f
|
=
form_errors
(
@project
)
.form-group
=
f
.
fields_for
:tracing_setting_attributes
,
setting
do
|
form
|
=
form
.
label
:external_url
,
_
(
'Jaeger URL'
),
class:
'label-bold'
=
form
.
url_field
:external_url
,
class:
'form-control'
,
placeholder:
'e.g. https://jaeger.mycompany.com'
%p
.form-text.text-muted
-
jaeger_help_url
=
"https://www.jaegertracing.io/docs/1.7/getting-started/"
-
link_start_tag
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
jaeger_help_url
}
-
link_end_tag
=
"
#{
sprite_icon
(
'external-link'
,
size:
16
,
css_class:
'ml-1 vertical-align-middle'
)
}
</a>"
.
html_safe
=
_
(
"For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}"
).
html_safe
%
{
link_start_tag:
link_start_tag
,
link_end_tag:
link_end_tag
}
=
f
.
submit
_
(
'Save changes'
),
class:
'btn btn-success'
locale/gitlab.pot
View file @
55d0aeac
...
@@ -6138,9 +6138,6 @@ msgstr ""
...
@@ -6138,9 +6138,6 @@ msgstr ""
msgid "Operations Dashboard"
msgid "Operations Dashboard"
msgstr ""
msgstr ""
msgid "Operations Settings"
msgstr ""
msgid "OperationsDashboard|Add a project to the dashboard"
msgid "OperationsDashboard|Add a project to the dashboard"
msgstr ""
msgstr ""
...
...
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