Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

5 files changed, 19 insertions, 143 deletions

diff --git a/lib/gitlab/database_importers/common_metrics.rb b/lib/gitlab/database_importers/common_metrics.rb
deleted file mode 100644
index f964ae8a275..00000000000
--- a/lib/gitlab/database_importers/common_metrics.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module DatabaseImporters
-    module CommonMetrics
-    end
-  end
-end
diff --git a/lib/gitlab/database_importers/common_metrics/importer.rb b/lib/gitlab/database_importers/common_metrics/importer.rb
deleted file mode 100644
index 6c61e05674e..00000000000
--- a/lib/gitlab/database_importers/common_metrics/importer.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module DatabaseImporters
-    module CommonMetrics
-      class Importer
-        MissingQueryId = Class.new(StandardError)
-
-        attr_reader :content
-
-        def initialize(filename = 'common_metrics.yml')
-          @content = YAML.load_file(Rails.root.join('config', 'prometheus', filename))
-        end
-
-        def execute
-          CommonMetrics::PrometheusMetric.reset_column_information
-
-          process_content do |id, attributes|
-            find_or_build_metric!(id)
-              .update!(**attributes)
-          end
-        end
-
-        private
-
-        def process_content(&blk)
-          content['panel_groups'].map do |group|
-            process_group(group, &blk)
-          end
-        end
-
-        def process_group(group, &blk)
-          attributes = {
-            group: find_group_title_key(group['group'])
-          }
-
-          group['panels'].map do |panel|
-            process_panel(panel, attributes, &blk)
-          end
-        end
-
-        def process_panel(panel, attributes, &blk)
-          attributes = attributes.merge(
-            title: panel['title'],
-            y_label: panel['y_label'])
-
-          panel['metrics'].map do |metric_details|
-            process_metric_details(metric_details, attributes, &blk)
-          end
-        end
-
-        def process_metric_details(metric_details, attributes, &blk)
-          attributes = attributes.merge(
-            legend: metric_details['label'],
-            query: metric_details['query_range'],
-            unit: metric_details['unit'])
-
-          yield(metric_details['id'], attributes)
-        end
-
-        def find_or_build_metric!(id)
-          raise MissingQueryId unless id
-
-          CommonMetrics::PrometheusMetric.common.find_by(identifier: id) ||
-            CommonMetrics::PrometheusMetric.new(common: true, identifier: id)
-        end
-
-        def find_group_title_key(title)
-          CommonMetrics::PrometheusMetricEnums.groups[find_group_title(title)]
-        end
-
-        def find_group_title(title)
-          CommonMetrics::PrometheusMetricEnums.group_titles.invert[title]
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/database_importers/common_metrics/prometheus_metric.rb b/lib/gitlab/database_importers/common_metrics/prometheus_metric.rb
deleted file mode 100644
index b4a392cbea9..00000000000
--- a/lib/gitlab/database_importers/common_metrics/prometheus_metric.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module DatabaseImporters
-    module CommonMetrics
-      class PrometheusMetric < ApplicationRecord
-        enum group: PrometheusMetricEnums.groups
-        scope :common, -> { where(common: true) }
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb b/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb
deleted file mode 100644
index 8a5f53be20f..00000000000
--- a/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module DatabaseImporters
-    module CommonMetrics
-      module PrometheusMetricEnums
-        def self.groups
-          {
-            # built-in groups
-            nginx_ingress_vts: -1,
-            ha_proxy: -2,
-            aws_elb: -3,
-            nginx: -4,
-            kubernetes: -5,
-            nginx_ingress: -6,
-
-            # custom groups
-            business: 0,
-            response: 1,
-            system: 2,
-            custom: 3,
-
-            cluster_health: -100
-          }
-        end
-
-        def self.group_titles
-          {
-            business: _('Business metrics (Custom)'),
-            response: _('Response metrics (Custom)'),
-            system: _('System metrics (Custom)'),
-            nginx_ingress_vts: _('Response metrics (NGINX Ingress VTS)'),
-            nginx_ingress: _('Response metrics (NGINX Ingress)'),
-            ha_proxy: _('Response metrics (HA Proxy)'),
-            aws_elb: _('Response metrics (AWS ELB)'),
-            nginx: _('Response metrics (NGINX)'),
-            kubernetes: _('System metrics (Kubernetes)'),
-            cluster_health: _('Cluster Health'),
-            custom: _('Custom metrics')
-          }
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/database_importers/default_organization_importer.rb b/lib/gitlab/database_importers/default_organization_importer.rb
new file mode 100644
index 00000000000..147c0d19b01
--- /dev/null
+++ b/lib/gitlab/database_importers/default_organization_importer.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module DatabaseImporters
+    module DefaultOrganizationImporter
+      def self.create_default_organization
+        return if Organizations::Organization.default_organization
+
+        # When adding or changing attributes, consider changing the factory for Organization model as well
+        # spec/factories/organizations/organizations.rb
+        Organizations::Organization.create!(
+          id: Organizations::Organization::DEFAULT_ORGANIZATION_ID,
+          name: 'Default',
+          path: 'default'
+        )
+      end
+    end
+  end
+end