diff options
Diffstat (limited to 'app/views/projects/services')
4 files changed, 6 insertions, 33 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 7a47b504b7c..d1d9a220068 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -5,14 +5,13 @@ -# When using integration.activate_disabled_reason[:trackers], it's potentially insecure to use the raw records -# when passed directly to the frontend. Only use specific fields that are needed for render. -# For example, we can get the link to each tracker with scoped_edit_integration_path(tracker, tracker.project) - = render 'shared/global_alert', - title: s_('ExternalIssueIntegration|Another issue tracker is already in use'), + = render Pajamas::AlertComponent.new(title: s_('ExternalIssueIntegration|Another issue tracker is already in use'), variant: :warning, - dismissible: false do + dismissible: false) do .gl-alert-body = s_('ExternalIssueIntegration|Only one issue tracker integration can be active at a time. Please disable the active tracker first and try again.') -%h3.page-title +%h2.gl-mb-4 = integration.title - if integration.operating? = sprite_icon('check', css_class: 'gl-text-green-500') diff --git a/app/views/projects/services/prometheus/_configuration_banner.html.haml b/app/views/projects/services/prometheus/_configuration_banner.html.haml deleted file mode 100644 index a34aa22acbb..00000000000 --- a/app/views/projects/services/prometheus/_configuration_banner.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -%h4 - = s_('PrometheusService|Prometheus cluster integration') - -- if integration.manual_configuration? - .info-well - = s_('PrometheusService|To use a Prometheus installed on a cluster, deactivate the manual configuration.') -- else - .container-fluid - .row - - if integration.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: 'btn gl-button' - - 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' - -%hr diff --git a/app/views/projects/services/prometheus/_help.html.haml b/app/views/projects/services/prometheus/_help.html.haml index 9b3cb8893c4..f40d8638845 100644 --- a/app/views/projects/services/prometheus/_help.html.haml +++ b/app/views/projects/services/prometheus/_help.html.haml @@ -1,5 +1,6 @@ - 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 = s_('PrometheusService|Manual configuration') diff --git a/app/views/projects/services/prometheus/_top.html.haml b/app/views/projects/services/prometheus/_top.html.haml index f7446273a80..52b29ea2e8f 100644 --- a/app/views/projects/services/prometheus/_top.html.haml +++ b/app/views/projects/services/prometheus/_top.html.haml @@ -2,8 +2,7 @@ .row .col-lg-12 - .gl-alert.gl-alert-info{ role: 'alert' } - = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + = render Pajamas::AlertComponent.new(dismissible: false) do .gl-alert-body = s_('AlertSettings|You can now set up alert endpoints for manually configured Prometheus instances in the Alerts section on the Operations settings page. Alert endpoint fields on this page have been deprecated.') .gl-alert-actions |