Reduce CE/EE difference in app/views/projects/services/prometheus/_show.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/services/prometheus/_metrics.html.haml

+- project = local_assigns.fetch(:project)
+
+.card.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/metrics') } }
+  .card-header
+    %h3.card-title
+      = s_('PrometheusService|Common metrics')
+      %span.badge.badge-pill.js-monitored-count 0
+  .card-body
+    .loading-metrics.js-loading-metrics
+      %p.prepend-top-10.prepend-left-10
+        = icon('spinner spin', class: 'metrics-load-spinner')
+        = s_('PrometheusService|Finding and configuring metrics...')
+    .empty-metrics.hidden.js-empty-metrics
+      %p.text-tertiary.prepend-top-10.prepend-left-10
+        = s_('PrometheusService|Waiting for your first deployment to an environment to find common metrics')
+    %ul.list-unstyled.metrics-list.hidden.js-metrics-list
+
+.card.hidden.js-panel-missing-env-vars
+  .card-header
+    %h3.card-title
+      = icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
+      = s_('PrometheusService|Missing environment variable')
+      %span.badge.badge-pill.js-env-var-count 0
+  .card-body.hidden
+    .flash-container
+      .flash-notice
+        .flash-text
+          = s_("PrometheusService|To set up automatic monitoring, add the environment variable %{variable} to exporter's queries." % { variable: "<code>$CI_ENVIRONMENT_SLUG</code>" }).html_safe
+          = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus', anchor: 'metrics-and-labels')
+    %ul.list-unstyled.metrics-list.js-missing-var-metrics-list

app/views/projects/services/prometheus/_show.html.haml

@@ -3,35 +3,8 @@
     %h4.prepend-top-0
       = s_('PrometheusService|Metrics')
     %p
-      = s_('PrometheusService|Metrics are automatically configured and monitored based on a library of metrics from popular exporters.')
-      = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus')
+      = s_('PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters.')
+      = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus_library/metrics'), target: '_blank', rel: "noopener noreferrer"
 
   .col-lg-9
-    .card.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(@project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/metrics') } }
-      .card-header
-        %h3.card-title
-          = s_('PrometheusService|Common metrics')
-          %span.badge.badge-pill.js-monitored-count 0
-      .card-body
-        .loading-metrics.js-loading-metrics
-          %p.prepend-top-10.prepend-left-10
-            = icon('spinner spin', class: 'metrics-load-spinner')
-            = s_('PrometheusService|Finding and configuring metrics...')
-        .empty-metrics.hidden.js-empty-metrics
-          %p.text-tertiary.prepend-top-10.prepend-left-10
-            = s_('PrometheusService|Waiting for your first deployment to an environment to find common metrics')
-        %ul.list-unstyled.metrics-list.hidden.js-metrics-list
-
-    .card.hidden.js-panel-missing-env-vars
-      .card-header
-        %h3.card-title
-          = icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
-          = s_('PrometheusService|Missing environment variable')
-          %span.badge.badge-pill.js-env-var-count 0
-      .card-body.hidden
-        .flash-container
-          .flash-notice
-            .flash-text
-              = s_("PrometheusService|To set up automatic monitoring, add the environment variable %{variable} to exporter's queries." % { variable: "<code>$CI_ENVIRONMENT_SLUG</code>" }).html_safe
-              = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus', anchor: 'metrics-and-labels')
-        %ul.list-unstyled.metrics-list.js-missing-var-metrics-list
+    = render_if_exists 'projects/services/prometheus/metrics', project: @project

locale/gitlab.pot

@@ -4106,6 +4106,9 @@ msgstr ""
 msgid "PrometheusService|Common metrics"
 msgstr ""
 
+msgid "PrometheusService|Common metrics are automatically monitored based on a library of metrics from popular exporters."
+msgstr ""
+
 msgid "PrometheusService|Finding and configuring metrics..."
 msgstr ""
 
@@ -4121,9 +4124,6 @@ msgstr ""
 msgid "PrometheusService|Metrics"
 msgstr ""
 
-msgid "PrometheusService|Metrics are automatically configured and monitored based on a library of metrics from popular exporters."
-msgstr ""
-
 msgid "PrometheusService|Missing environment variable"
 msgstr ""