diff options
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/alert_management/payload.rb | 17 | ||||
| -rw-r--r-- | lib/gitlab/alert_management/payload/managed_prometheus.rb | 46 | ||||
| -rw-r--r-- | lib/gitlab/metrics/dashboard/service_selector.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/metrics/global_search_slis.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/quick_actions/relate_actions.rb | 2 |
5 files changed, 7 insertions, 62 deletions
diff --git a/lib/gitlab/alert_management/payload.rb b/lib/gitlab/alert_management/payload.rb index de34a0f5d47..c6244124022 100644 --- a/lib/gitlab/alert_management/payload.rb +++ b/lib/gitlab/alert_management/payload.rb @@ -18,31 +18,20 @@ module Gitlab # @param monitoring_tool [String] # @param integration [AlertManagement::HttpIntegration] def parse(project, payload, monitoring_tool: nil, integration: nil) - payload_class = payload_class_for( - monitoring_tool: monitoring_tool || payload&.dig('monitoring_tool'), - payload: payload - ) + payload_class = payload_class_for(monitoring_tool: monitoring_tool || payload&.dig('monitoring_tool')) payload_class.new(project: project, payload: payload, integration: integration) end private - def payload_class_for(monitoring_tool:, payload:) + def payload_class_for(monitoring_tool:) if monitoring_tool == MONITORING_TOOLS[:prometheus] - if gitlab_managed_prometheus?(payload) - ::Gitlab::AlertManagement::Payload::ManagedPrometheus - else - ::Gitlab::AlertManagement::Payload::Prometheus - end + ::Gitlab::AlertManagement::Payload::Prometheus else ::Gitlab::AlertManagement::Payload::Generic end end - - def gitlab_managed_prometheus?(payload) - payload&.dig('labels', 'gitlab_alert_id').present? - end end end end diff --git a/lib/gitlab/alert_management/payload/managed_prometheus.rb b/lib/gitlab/alert_management/payload/managed_prometheus.rb deleted file mode 100644 index 4ed21108d3e..00000000000 --- a/lib/gitlab/alert_management/payload/managed_prometheus.rb +++ /dev/null @@ -1,46 +0,0 @@ -# frozen_string_literal: true - -# Attribute mapping for alerts via prometheus alerting integration, -# and for which payload includes gitlab-controlled attributes. -module Gitlab - module AlertManagement - module Payload - class ManagedPrometheus < ::Gitlab::AlertManagement::Payload::Prometheus - attribute :gitlab_prometheus_alert_id, - paths: %w(labels gitlab_prometheus_alert_id), - type: :integer - attribute :metric_id, - paths: %w(labels gitlab_alert_id), - type: :integer - - def gitlab_alert - strong_memoize(:gitlab_alert) do - next unless metric_id || gitlab_prometheus_alert_id - - alerts = Projects::Prometheus::AlertsFinder - .new(project: project, metric: metric_id, id: gitlab_prometheus_alert_id) - .execute - - next if alerts.blank? || alerts.size > 1 - - alerts.first - end - end - - def full_query - gitlab_alert&.full_query || super - end - - def environment - gitlab_alert&.environment || super - end - - private - - def plain_gitlab_fingerprint - [metric_id, starts_at_raw].join('/') - end - end - end - end -end diff --git a/lib/gitlab/metrics/dashboard/service_selector.rb b/lib/gitlab/metrics/dashboard/service_selector.rb index 632f6ce6160..d192fc04e89 100644 --- a/lib/gitlab/metrics/dashboard/service_selector.rb +++ b/lib/gitlab/metrics/dashboard/service_selector.rb @@ -15,7 +15,6 @@ module Gitlab SERVICES = [ ::Metrics::Dashboard::GitlabAlertEmbedService, ::Metrics::Dashboard::CustomMetricEmbedService, - ::Metrics::Dashboard::DynamicEmbedService, ::Metrics::Dashboard::DefaultEmbedService, ::Metrics::Dashboard::SystemDashboardService, ::Metrics::Dashboard::CustomDashboardService diff --git a/lib/gitlab/metrics/global_search_slis.rb b/lib/gitlab/metrics/global_search_slis.rb index c361d755a12..530bebd72ab 100644 --- a/lib/gitlab/metrics/global_search_slis.rb +++ b/lib/gitlab/metrics/global_search_slis.rb @@ -11,6 +11,7 @@ module Gitlab BASIC_CODE_TARGET_S = 27.538 ADVANCED_CONTENT_TARGET_S = 2.452 ADVANCED_CODE_TARGET_S = 15.52 + ZOEKT_TARGET_S = 15.52 def initialize_slis! Gitlab::Metrics::Sli::Apdex.initialize_sli(:global_search, possible_labels) @@ -42,6 +43,8 @@ module Gitlab ADVANCED_CONTENT_TARGET_S elsif search_type == 'advanced' && code_search?(search_scope) ADVANCED_CODE_TARGET_S + elsif search_type == 'zoekt' && code_search?(search_scope) + ZOEKT_TARGET_S end end diff --git a/lib/gitlab/quick_actions/relate_actions.rb b/lib/gitlab/quick_actions/relate_actions.rb index 058c1e7e9bf..294ddd985de 100644 --- a/lib/gitlab/quick_actions/relate_actions.rb +++ b/lib/gitlab/quick_actions/relate_actions.rb @@ -36,7 +36,7 @@ module Gitlab extract_references(issue_param, :issue).first end command :unlink do |issue| - link = IssueLink.for_issues(quick_action_target, issue).first + link = IssueLink.for_items(quick_action_target, issue).first if link call_link_service(IssueLinks::DestroyService.new(link, current_user)) |