Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 33 insertions, 4 deletions

diff --git a/lib/generators/gitlab/usage_metric_definition/redis_hll_generator.rb b/lib/generators/gitlab/usage_metric_definition/redis_hll_generator.rb
new file mode 100644
index 00000000000..d826c51a73d
--- /dev/null
+++ b/lib/generators/gitlab/usage_metric_definition/redis_hll_generator.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require_relative '../usage_metric_definition_generator'
+
+module Gitlab
+  module UsageMetricDefinition
+    class RedisHllGenerator < Rails::Generators::Base
+      desc 'Generates a metric definition .yml file with defaults for Redis HLL.'
+
+      argument :category, type: :string, desc: "Category name"
+      argument :event, type: :string, desc: "Event name"
+
+      def create_metrics
+        Gitlab::UsageMetricDefinitionGenerator.start(["#{key_path}_weekly", '--dir', '7d'])
+        Gitlab::UsageMetricDefinitionGenerator.start(["#{key_path}_monthly", '--dir', '28d'])
+      end
+
+      private
+
+      def key_path
+        "redis_hll_counters.#{category}.#{event}"
+      end
+    end
+  end
+end
diff --git a/lib/generators/gitlab/usage_metric_definition_generator.rb b/lib/generators/gitlab/usage_metric_definition_generator.rb
index 7a01050ed0c..cadc319a212 100644
--- a/lib/generators/gitlab/usage_metric_definition_generator.rb
+++ b/lib/generators/gitlab/usage_metric_definition_generator.rb
@@ -5,6 +5,11 @@ require 'rails/generators'
 module Gitlab
   class UsageMetricDefinitionGenerator < Rails::Generators::Base
     Directory = Struct.new(:name, :time_frame, :value_type) do
+      def initialize(...)
+        super
+        freeze
+      end
+
       def match?(str)
         (name == str || time_frame == str) && str != 'none'
       end
@@ -60,9 +65,7 @@ module Gitlab
     private
 
     def metric_name_suggestion
-      return unless Feature.enabled?(:product_intelligence_metrics_names_suggestions, default_enabled: :yaml)
-
-      "\nname: #{Usage::Metrics::NamesSuggestions::Generator.generate(key_path)}"
+      "\nname: \"#{Usage::Metrics::NamesSuggestions::Generator.generate(key_path)}\""
     end
 
     def file_path
@@ -101,7 +104,7 @@ module Gitlab
     end
 
     def metric_definitions
-      @definitions ||= Gitlab::Usage::MetricDefinition.definitions
+      @definitions ||= Gitlab::Usage::MetricDefinition.definitions(skip_validation: true)
     end
 
     def metric_definition_exists?