Add latest changes from gitlab-org/gitlab@master

4 files changed, 3 insertions, 52 deletions

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/settings/operations/_configuration_banner.html.haml b/app/views/projects/settings/operations/_configuration_banner.html.haml
deleted file mode 100644
index 9803ffc3c4e..00000000000
--- a/app/views/projects/settings/operations/_configuration_banner.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-%b
-  = s_('PrometheusService|Prometheus cluster integration')
-
-- if service.manual_configuration?
-  .info-well.p-2.mt-2
-    = s_('PrometheusService|To use a Prometheus installed on a cluster, deactivate the manual configuration.')
-- else
-  .container-fluid
-    .row
-      - if service.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: 'gl-button btn btn-default'
-      - 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'
diff --git a/app/views/projects/settings/operations/_prometheus.html.haml b/app/views/projects/settings/operations/_prometheus.html.haml
index 1c7bcbbca0b..93281cc225b 100644
--- a/app/views/projects/settings/operations/_prometheus.html.haml
+++ b/app/views/projects/settings/operations/_prometheus.html.haml
@@ -9,7 +9,7 @@
       = link_to _('More information'), help_page_path('user/project/integrations/prometheus'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     - if @project
-      = render 'projects/settings/operations/configuration_banner', project: @project, service: service
+      = render 'shared/prometheus_configuration_banner', project: @project, integration: service, header_tag: :b, info_well_classes: 'gl-p-3 gl-mt-3'
 
     %b.gl-mb-3
       = s_('PrometheusService|Manual configuration')