Add latest changes from gitlab-org/gitlab@13-4-stable-ee

3 files changed, 8 insertions, 4 deletions

diff --git a/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb b/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb
index fb0fcc5a93b..8a5f53be20f 100644
--- a/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb
+++ b/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb
@@ -18,6 +18,7 @@ module Gitlab
             business: 0,
             response: 1,
             system: 2,
+            custom: 3,
 
             cluster_health: -100
           }
@@ -34,7 +35,8 @@ module Gitlab
             aws_elb: _('Response metrics (AWS ELB)'),
             nginx: _('Response metrics (NGINX)'),
             kubernetes: _('System metrics (Kubernetes)'),
-            cluster_health: _('Cluster Health')
+            cluster_health: _('Cluster Health'),
+            custom: _('Custom metrics')
           }
         end
       end
diff --git a/lib/gitlab/database_importers/instance_administrators/create_group.rb b/lib/gitlab/database_importers/instance_administrators/create_group.rb
index 5bf0e5a320d..d9425810405 100644
--- a/lib/gitlab/database_importers/instance_administrators/create_group.rb
+++ b/lib/gitlab/database_importers/instance_administrators/create_group.rb
@@ -6,6 +6,8 @@ module Gitlab
       class CreateGroup < ::BaseService
         include Stepable
 
+        NAME = 'GitLab Instance'
+        PATH_PREFIX = 'gitlab-instance'
         VISIBILITY_LEVEL = Gitlab::VisibilityLevel::INTERNAL
 
         steps :validate_application_settings,
@@ -117,12 +119,12 @@ module Gitlab
 
         def create_group_params
           {
-            name: 'GitLab Instance Administrators',
+            name: NAME,
             visibility_level: VISIBILITY_LEVEL,
 
             # The 8 random characters at the end are so that the path does not
             # clash with any existing group that the user might have created.
-            path: "gitlab-instance-administrators-#{SecureRandom.hex(4)}"
+            path: "#{PATH_PREFIX}-#{SecureRandom.hex(4)}"
           }
         end
       end
diff --git a/lib/gitlab/database_importers/self_monitoring/project/create_service.rb b/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
index 07a4c3bf5e6..88f035c2d1b 100644
--- a/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
+++ b/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
@@ -9,7 +9,7 @@ module Gitlab
           include SelfMonitoring::Helpers
 
           VISIBILITY_LEVEL = Gitlab::VisibilityLevel::INTERNAL
-          PROJECT_NAME = 'GitLab self monitoring'
+          PROJECT_NAME = 'Monitoring'
 
           steps :validate_application_settings,
             :create_group,