Merge branch 'ah-support-accepting-epoch-time-for-alert-manager-ended-at' into 'master'

Support accepting epoch millis for alert manager ended at

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145502



Merged-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Approved-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Reviewed-by: Sean Arnold <sarnold@gitlab.com>
Reviewed-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Co-authored-by: Adam Hegyi <ahegyi@gitlab.com>

doc/api/graphql/reference/index.md

@@ -31693,6 +31693,7 @@ Values for alert field types used in the custom mapping.
 | ----- | ----------- |
 | <a id="alertmanagementpayloadalertfieldtypearray"></a>`ARRAY` | Array field type. |
 | <a id="alertmanagementpayloadalertfieldtypedatetime"></a>`DATETIME` | DateTime field type. |
+| <a id="alertmanagementpayloadalertfieldtypenumber"></a>`NUMBER` | Number field type. |
 | <a id="alertmanagementpayloadalertfieldtypestring"></a>`STRING` | String field type. |
 ### `AlertManagementSeverity`

ee/app/graphql/types/alert_management/payload_alert_field_type_enum.rb

@@ -9,6 +9,7 @@ class PayloadAlertFieldTypeEnum < BaseEnum
       value 'ARRAY', 'Array field type.', value: 'array'
       value 'DATETIME', 'DateTime field type.', value: 'datetime'
       value 'STRING', 'String field type.', value: 'string'
+      value 'NUMBER', 'Number field type.', value: 'number'
     end
   end
 end

ee/app/models/alert_management/alert_payload_field.rb

@@ -10,7 +10,8 @@ class AlertPayloadField
     ARRAY_TYPE = 'array'
     DATETIME_TYPE = 'datetime'
     STRING_TYPE = 'string'
-    SUPPORTED_TYPES = [ARRAY_TYPE, DATETIME_TYPE, STRING_TYPE].freeze
+    NUMBER_TYPE = 'number'
+    SUPPORTED_TYPES = [ARRAY_TYPE, DATETIME_TYPE, STRING_TYPE, NUMBER_TYPE].freeze
 
     validates :project, presence: true
     validates :label, presence: true

ee/lib/ee/gitlab/alert_management/payload/mappable.rb

@@ -56,7 +56,9 @@ def custom_mapping_value(attribute_name)
           end
 
           def custom_mapping_type(attribute_name)
-            :time if custom_mapping.dig(attribute_name, 'type') == 'datetime'
+            return :time if custom_mapping.dig(attribute_name, 'type') == 'datetime'
+
+            :time_with_epoch_millis if attribute_name == 'end_time'
           end
         end
       end

ee/lib/gitlab/alert_management.rb

@@ -34,7 +34,7 @@ def self.alert_fields
           name: 'end_time',
           label: 'End time',
           description: 'The resolved time of the incident.',
-          types: %w[datetime]
+          types: %w[datetime number]
         },
         {
           name: 'service',

ee/lib/gitlab/alert_management/alert_payload_field_extractor.rb

@@ -90,6 +90,8 @@ def type_of(value)
           ::AlertManagement::AlertPayloadField::DATETIME_TYPE
         when String
           ::AlertManagement::AlertPayloadField::STRING_TYPE
+        when Integer
+          ::AlertManagement::AlertPayloadField::NUMBER_TYPE
         end
       end
 

ee/spec/graphql/types/alert_management/payload_alert_field_type_enum_spec.rb

@@ -4,6 +4,6 @@
 
 RSpec.describe GitlabSchema.types['AlertManagementPayloadAlertFieldType'] do
   it 'exposes all alert field types' do
-    expect(described_class.values.keys).to match_array(%w[ARRAY DATETIME STRING])
+    expect(described_class.values.keys).to match_array(%w[ARRAY DATETIME STRING NUMBER])
   end
 end

ee/spec/services/alert_management/extract_alert_payload_fields_service_spec.rb

@@ -45,6 +45,20 @@
           end
         end
 
+        context 'when payload is integer' do
+          let(:payload) { { key: 100 } }
+
+          it 'returns parsed fields' do
+            fields = response.payload[:payload_alert_fields]
+            field = fields.first
+
+            expect(fields.count).to eq(1)
+            expect(field.label).to eq('key')
+            expect(field.type).to eq('number')
+            expect(field.path).to eq(%w[key])
+          end
+        end
+
         context 'when limits are exceeded' do
           before do
             allow(Gitlab::Utils::DeepSize)

lib/gitlab/alert_management/payload/base.rb

@@ -43,6 +43,8 @@ class Base
           :title
         ].freeze
 
+        EPOCH_MILLISECONDS_DIGIT_COUNT = (Time.current.to_f * 1000).to_i.to_s.size
+
         private_constant :EXPECTED_PAYLOAD_ATTRIBUTES
 
         # Define expected API for a payload
@@ -188,6 +190,12 @@ def value_for_paths(paths)
 
         def parse_value(value, type)
           case type
+          when :time_with_epoch_millis
+            if value.is_a?(Integer) && value.to_s.size == EPOCH_MILLISECONDS_DIGIT_COUNT
+              Time.at(0, value, :millisecond).utc
+            else
+              parse_time(value)
+            end
           when :time
             parse_time(value)
           when :integer

lib/gitlab/alert_management/payload/generic.rb

@@ -9,7 +9,7 @@ class Generic < Base
         DEFAULT_SOURCE = 'Generic Alert Endpoint'
 
         attribute :description, paths: 'description'
-        attribute :ends_at, paths: 'end_time', type: :time
+        attribute :ends_at, paths: 'end_time', type: :time_with_epoch_millis
         attribute :environment_name, paths: 'gitlab_environment_name'
         attribute :hosts, paths: 'hosts'
         attribute :monitoring_tool, paths: 'monitoring_tool'

spec/lib/gitlab/alert_management/payload/base_spec.rb

@@ -124,6 +124,37 @@
         it { is_expected.to be_nil }
       end
     end
+
+    context 'with a time_with_epoch_millis type provided' do
+      let(:timestamp) { 3.hours.ago }
+      let(:epoch_millis) { (timestamp.to_f * 1000).to_i }
+
+      let(:payload_class) do
+        Class.new(described_class) do
+          attribute :test, paths: [['test']], type: :time_with_epoch_millis
+        end
+      end
+
+      it { is_expected.to be_nil }
+
+      context 'with a compatible matching value' do
+        let(:raw_payload) { { 'test' => epoch_millis } }
+
+        it { is_expected.to be_within(1.second).of(timestamp) }
+      end
+
+      context 'with an incompatible matching value' do
+        let(:raw_payload) { { 'test' => String } }
+
+        it { is_expected.to be_nil }
+      end
+
+      context 'with an incompatible matching value' do
+        let(:raw_payload) { { 'test' => 'apple' } }
+
+        it { is_expected.to be_nil }
+      end
+    end
   end
 
   describe '#alert_params' do

spec/lib/gitlab/alert_management/payload/generic_spec.rb

@@ -142,6 +142,16 @@
       end
 
       it { is_expected.to eq(value) }
+
+      context 'when integer is given' do
+        let(:current_time) { Time.current }
+
+        before do
+          raw_payload['end_time'] = (current_time.to_f * 1000).to_i
+        end
+
+        it { is_expected.to be_within(1.second).of(current_time) }
+      end
     end
   end