diff options
Diffstat (limited to 'app/models/project_services')
8 files changed, 66 insertions, 28 deletions
diff --git a/app/models/project_services/chat_notification_service.rb b/app/models/project_services/chat_notification_service.rb index 1d50d5cf19e..cf7cad09676 100644 --- a/app/models/project_services/chat_notification_service.rb +++ b/app/models/project_services/chat_notification_service.rb @@ -97,9 +97,12 @@ class ChatNotificationService < Service opts[:channel] = channels if channels.present? opts[:username] = username if username - return false unless notify(message, opts) + if notify(message, opts) + log_usage(event_type, user_id_from_hook_data(data)) + return true + end - true + false end def event_channel_names @@ -120,6 +123,10 @@ class ChatNotificationService < Service private + def log_usage(_, _) + # Implement in child class + end + def labels_to_be_notified_list return [] if labels_to_be_notified.nil? @@ -136,6 +143,10 @@ class ChatNotificationService < Service (labels_to_be_notified_list & label_titles).any? end + def user_id_from_hook_data(data) + data.dig(:user, :id) || data[:user_id] + end + # every notifier must implement this independently def notify(message, opts) raise NotImplementedError diff --git a/app/models/project_services/discord_service.rb b/app/models/project_services/discord_service.rb index 941b7f64263..37bbb9b8752 100644 --- a/app/models/project_services/discord_service.rb +++ b/app/models/project_services/discord_service.rb @@ -59,6 +59,9 @@ class DiscordService < ChatNotificationService embed.description = (message.pretext + "\n" + Array.wrap(message.attachments).join("\n")).gsub(ATTACHMENT_REGEX, " \\k<entry> - \\k<name>\n") end end + rescue RestClient::Exception => error + log_error(error.message) + false end def custom_data(data) diff --git a/app/models/project_services/mattermost_service.rb b/app/models/project_services/mattermost_service.rb index c1055db78e5..9cff979fcf2 100644 --- a/app/models/project_services/mattermost_service.rb +++ b/app/models/project_services/mattermost_service.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class MattermostService < ChatNotificationService - include ::SlackService::Notifier + include SlackMattermost::Notifier def title 'Mattermost notifications' diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index ab043227832..b8869547a37 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -46,7 +46,7 @@ class PrometheusService < MonitoringService end def description - s_('PrometheusService|Time-series monitoring service') + s_('PrometheusService|Monitor application health with Prometheus metrics and dashboards') end def self.to_param @@ -59,20 +59,23 @@ class PrometheusService < MonitoringService type: 'checkbox', name: 'manual_configuration', title: s_('PrometheusService|Active'), + help: s_('PrometheusService|Select this checkbox to override the auto configuration settings with your own settings.'), required: true }, { type: 'text', name: 'api_url', title: 'API URL', - placeholder: s_('PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/'), + placeholder: s_('PrometheusService|https://prometheus.example.com/'), + help: s_('PrometheusService|The Prometheus API base URL.'), required: true }, { type: 'text', name: 'google_iap_audience_client_id', title: 'Google IAP Audience Client ID', - placeholder: s_('PrometheusService|Client ID of the IAP secured resource (looks like IAP_CLIENT_ID.apps.googleusercontent.com)'), + placeholder: s_('PrometheusService|IAP_CLIENT_ID.apps.googleusercontent.com'), + help: s_('PrometheusService|PrometheusService|The ID of the IAP-secured resource.'), autocomplete: 'off', required: false }, @@ -80,7 +83,8 @@ class PrometheusService < MonitoringService type: 'textarea', name: 'google_iap_service_account_json', title: 'Google IAP Service Account JSON', - placeholder: s_('PrometheusService|Contents of the credentials.json file of your service account, like: { "type": "service_account", "project_id": ... }'), + placeholder: s_('PrometheusService|{ "type": "service_account", "project_id": ... }'), + help: s_('PrometheusService|The contents of the credentials.json file of your service account.'), required: false } ] diff --git a/app/models/project_services/slack_mattermost/notifier.rb b/app/models/project_services/slack_mattermost/notifier.rb new file mode 100644 index 00000000000..1a78cea5933 --- /dev/null +++ b/app/models/project_services/slack_mattermost/notifier.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +module SlackMattermost + module Notifier + private + + def notify(message, opts) + # See https://gitlab.com/gitlab-org/slack-notifier/#custom-http-client + notifier = Slack::Messenger.new(webhook, opts.merge(http_client: HTTPClient)) + notifier.ping( + message.pretext, + attachments: message.attachments, + fallback: message.fallback + ) + end + + class HTTPClient + def self.post(uri, params = {}) + params.delete(:http_options) # these are internal to the client and we do not want them + Gitlab::HTTP.post(uri, body: params) + end + end + end +end diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb index 79245e84238..f42b3de39d5 100644 --- a/app/models/project_services/slack_service.rb +++ b/app/models/project_services/slack_service.rb @@ -1,6 +1,14 @@ # frozen_string_literal: true class SlackService < ChatNotificationService + include SlackMattermost::Notifier + extend ::Gitlab::Utils::Override + + SUPPORTED_EVENTS_FOR_USAGE_LOG = %w[ + push issue confidential_issue merge_request note confidential_note + tag_push wiki_page deployment + ].freeze + prop_accessor EVENT_CHANNEL['alert'] def title @@ -36,26 +44,14 @@ class SlackService < ChatNotificationService super end - module Notifier - private + override :log_usage + def log_usage(event, user_id) + return unless user_id - def notify(message, opts) - # See https://gitlab.com/gitlab-org/slack-notifier/#custom-http-client - notifier = Slack::Messenger.new(webhook, opts.merge(http_client: HTTPClient)) - notifier.ping( - message.pretext, - attachments: message.attachments, - fallback: message.fallback - ) - end + return unless SUPPORTED_EVENTS_FOR_USAGE_LOG.include?(event) - class HTTPClient - def self.post(uri, params = {}) - params.delete(:http_options) # these are internal to the client and we do not want them - Gitlab::HTTP.post(uri, body: params) - end - end - end + key = "i_ecosystem_slack_service_#{event}_notification" - include Notifier + Gitlab::UsageDataCounters::HLLRedisCounter.track_event(key, values: user_id) + end end diff --git a/app/models/project_services/unify_circuit_service.rb b/app/models/project_services/unify_circuit_service.rb index 1e12179e62a..1a0eebe7d64 100644 --- a/app/models/project_services/unify_circuit_service.rb +++ b/app/models/project_services/unify_circuit_service.rb @@ -47,7 +47,7 @@ class UnifyCircuitService < ChatNotificationService def notify(message, opts) response = Gitlab::HTTP.post(webhook, body: { subject: message.project_name, - text: message.pretext, + text: message.summary, markdown: true }.to_json) diff --git a/app/models/project_services/webex_teams_service.rb b/app/models/project_services/webex_teams_service.rb index 1d791b19486..4e8281f4e81 100644 --- a/app/models/project_services/webex_teams_service.rb +++ b/app/models/project_services/webex_teams_service.rb @@ -46,7 +46,7 @@ class WebexTeamsService < ChatNotificationService def notify(message, opts) header = { 'Content-Type' => 'application/json' } - response = Gitlab::HTTP.post(webhook, headers: header, body: { markdown: message.pretext }.to_json) + response = Gitlab::HTTP.post(webhook, headers: header, body: { markdown: message.summary }.to_json) response if response.success? end |