diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/views/projects/tracings | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/views/projects/tracings')
-rw-r--r-- | app/views/projects/tracings/_tracing_button.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/tracings/show.html.haml | 33 |
2 files changed, 35 insertions, 0 deletions
diff --git a/app/views/projects/tracings/_tracing_button.html.haml b/app/views/projects/tracings/_tracing_button.html.haml new file mode 100644 index 00000000000..c9a6afd3761 --- /dev/null +++ b/app/views/projects/tracings/_tracing_button.html.haml @@ -0,0 +1,2 @@ += link_to project_settings_operations_path(@project), title: _('Configure Tracing'), class: 'btn btn-success' do + = _('Add Jaeger URL') diff --git a/app/views/projects/tracings/show.html.haml b/app/views/projects/tracings/show.html.haml new file mode 100644 index 00000000000..8c9bffc81bf --- /dev/null +++ b/app/views/projects/tracings/show.html.haml @@ -0,0 +1,33 @@ +- @content_class = "limit-container-width" unless fluid_layout +- page_title _("Tracing") + +- if @project.tracing_external_url.present? + %h3.page-title= _('Tracing') + .gl-alert.gl-alert-info.alert.flex-alert + = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + .alert-message + = _("Your password isn't required to view this page. If a password or any other personal details are requested, please contact your administrator to report abuse.") + - jaeger_link = link_to('Jaeger tracing', 'https://www.jaegertracing.io/', target: "_blank", rel: "noreferrer") + %p.light= _("GitLab uses %{jaeger_link} to monitor distributed systems.").html_safe % { jaeger_link: jaeger_link } + + + .card + - iframe_permissions = "allow-forms allow-scripts allow-same-origin allow-popups" + %iframe.border-0{ src: sanitize(@project.tracing_external_url, scrubber: Rails::Html::TextOnlyScrubber.new), width: '100%', height: 970, sandbox: iframe_permissions } +- else + .row.empty-state + .col-12 + .svg-content + = image_tag 'illustrations/monitoring/tracing.svg' + + .col-12 + .text-content + %h4.text-left= _('Troubleshoot and monitor your application with tracing') + %p + - 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', css_class: 'ml-1 vertical-align-middle')}</a>".html_safe + = _('To get started, link this page to your Jaeger server, or find out how to %{link_start_tag}install Jaeger%{link_end_tag}').html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag } + + .text-center + = render 'tracing_button' |