Commit c8fe7afc authored by Amy Qualls's avatar Amy Qualls Committed by Tetiana Chupryna

Revise helptext on Datadog page

parent efe3c814
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
module Integrations module Integrations
class Datadog < Integration class Datadog < Integration
include ActionView::Helpers::UrlHelper
include HasWebHook include HasWebHook
extend Gitlab::Utils::Override extend Gitlab::Utils::Override
...@@ -47,11 +48,12 @@ module Integrations ...@@ -47,11 +48,12 @@ module Integrations
end end
def description def description
'Trace your GitLab pipelines with Datadog' s_('DatadogIntegration|Trace your GitLab pipelines with Datadog.')
end end
def help def help
nil docs_link = link_to s_('DatadogIntegration|How do I set up this integration?'), Rails.application.routes.url_helpers.help_page_url('integration/datadog'), target: '_blank', rel: 'noopener noreferrer'
s_('DatadogIntegration|Send CI/CD pipeline information to Datadog to monitor for job failures and troubleshoot performance issues. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
end end
def self.to_param def self.to_param
...@@ -64,14 +66,19 @@ module Integrations ...@@ -64,14 +66,19 @@ module Integrations
type: 'text', type: 'text',
name: 'datadog_site', name: 'datadog_site',
placeholder: DEFAULT_DOMAIN, placeholder: DEFAULT_DOMAIN,
help: 'Choose the Datadog site to send data to. Set to "datadoghq.eu" to send data to the EU site', help: ERB::Util.html_escape(
s_('DatadogIntegration|The Datadog site to send data to. To send data to the EU site, use %{codeOpen}datadoghq.eu%{codeClose}.')
) % {
codeOpen: '<code>'.html_safe,
codeClose: '</code>'.html_safe
},
required: false required: false
}, },
{ {
type: 'text', type: 'text',
name: 'api_url', name: 'api_url',
title: 'API URL', title: s_('DatadogIntegration|API URL'),
help: '(Advanced) Define the full URL for your Datadog site directly', help: s_('DatadogIntegration|(Advanced) The full URL for your Datadog site.'),
required: false required: false
}, },
{ {
...@@ -80,21 +87,34 @@ module Integrations ...@@ -80,21 +87,34 @@ module Integrations
title: _('API key'), title: _('API key'),
non_empty_password_title: s_('ProjectService|Enter new API key'), non_empty_password_title: s_('ProjectService|Enter new API key'),
non_empty_password_help: s_('ProjectService|Leave blank to use your current API key'), non_empty_password_help: s_('ProjectService|Leave blank to use your current API key'),
help: "<a href=\"#{api_keys_url}\" target=\"_blank\">API key</a> used for authentication with Datadog", help: ERB::Util.html_escape(
s_('DatadogIntegration|%{linkOpen}API key%{linkClose} used for authentication with Datadog.')
) % {
linkOpen: '<a href="%s" target="_blank" rel="noopener noreferrer">'.html_safe % api_keys_url,
linkClose: '</a>'.html_safe
},
required: true required: true
}, },
{ {
type: 'text', type: 'text',
name: 'datadog_service', name: 'datadog_service',
title: 'Service', title: s_('DatadogIntegration|Service'),
placeholder: 'gitlab-ci', placeholder: 'gitlab-ci',
help: 'Name of this GitLab instance that all data will be tagged with' help: s_('DatadogIntegration|Tag all data from this GitLab instance in Datadog. Useful when managing several self-managed deployments.')
}, },
{ {
type: 'text', type: 'text',
name: 'datadog_env', name: 'datadog_env',
title: 'Env', title: s_('DatadogIntegration|Environment'),
help: 'The environment tag that traces will be tagged with' placeholder: 'ci',
help: ERB::Util.html_escape(
s_('DatadogIntegration|For self-managed deployments, set the %{codeOpen}env%{codeClose} tag for all the data sent to Datadog. %{linkOpen}How do I use tags?%{linkClose}')
) % {
codeOpen: '<code>'.html_safe,
codeClose: '</code>'.html_safe,
linkOpen: '<a href="https://docs.datadoghq.com/getting_started/tagging/#using-tags" target="_blank" rel="noopener noreferrer">'.html_safe,
linkClose: '</a>'.html_safe
}
} }
] ]
end end
......
...@@ -10471,6 +10471,39 @@ msgstr "" ...@@ -10471,6 +10471,39 @@ msgstr ""
msgid "Database update failed" msgid "Database update failed"
msgstr "" msgstr ""
msgid "DatadogIntegration|%{linkOpen}API key%{linkClose} used for authentication with Datadog."
msgstr ""
msgid "DatadogIntegration|(Advanced) The full URL for your Datadog site."
msgstr ""
msgid "DatadogIntegration|API URL"
msgstr ""
msgid "DatadogIntegration|Environment"
msgstr ""
msgid "DatadogIntegration|For self-managed deployments, set the %{codeOpen}env%{codeClose} tag for all the data sent to Datadog. %{linkOpen}How do I use tags?%{linkClose}"
msgstr ""
msgid "DatadogIntegration|How do I set up this integration?"
msgstr ""
msgid "DatadogIntegration|Send CI/CD pipeline information to Datadog to monitor for job failures and troubleshoot performance issues. %{docs_link}"
msgstr ""
msgid "DatadogIntegration|Service"
msgstr ""
msgid "DatadogIntegration|Tag all data from this GitLab instance in Datadog. Useful when managing several self-managed deployments."
msgstr ""
msgid "DatadogIntegration|The Datadog site to send data to. To send data to the EU site, use %{codeOpen}datadoghq.eu%{codeClose}."
msgstr ""
msgid "DatadogIntegration|Trace your GitLab pipelines with Datadog."
msgstr ""
msgid "Datasource name not found" msgid "Datasource name not found"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment