Skip to content
Snippets Groups Projects
Verified Commit f9eefdd2 authored by James Nutt's avatar James Nutt Committed by GitLab
Browse files

Merge branch 'marjanovic/datadog-api-arguments' into 'master' 

Convert DataDog to use `api_arguments`

See merge request !171671



Merged-by: default avatarJames Nutt <jnutt@gitlab.com>
Approved-by: default avatarVlad Wolanyk <vwolanyk@gitlab.com>
Approved-by: default avatarAshraf Khamis <akhamis@gitlab.com>
Approved-by: default avatarJames Nutt <jnutt@gitlab.com>
Reviewed-by: default avatarAshraf Khamis <akhamis@gitlab.com>
Reviewed-by: default avatarJames Nutt <jnutt@gitlab.com>
Co-authored-by: default avatarbmarjanovic <bmarjanovic@gitlab.com>
parents dba14802 aefac475
No related branches found
No related tags found
1 merge request!171671Convert DataDog to use `api_arguments`
Pipeline #1530015240 passed
Stage: sync
Stage: preflight
Stage: prepare
Stage: build-images
Stage: fixtures
Stage: lint
Stage: test-frontend
Stage: test
Stage: post-test
Stage: pages
Stage: benchmark
Hide whitespace changes
Inline Side-by-side
app/models/integrations/datadog.rb
+ 5
− 3
View file @ f9eefdd2
......@@ -19,7 +19,7 @@ class Datadog < Integration
placeholder: DEFAULT_DOMAIN,
help: -> do
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}.')
s_('DatadogIntegration|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
......@@ -29,7 +29,7 @@ class Datadog < Integration
field :api_url,
exposes_secrets: true,
title: -> { s_('DatadogIntegration|API URL') },
help: -> { s_('DatadogIntegration|(Advanced) The full URL for your Datadog site.') }
help: -> { s_('DatadogIntegration|Full URL of your Datadog site.') }
field :api_key,
type: :password,
......@@ -54,11 +54,12 @@ class Datadog < Integration
field :datadog_service,
title: -> { s_('DatadogIntegration|Service') },
placeholder: 'gitlab-ci',
help: -> { s_('DatadogIntegration|Tag all data from this GitLab instance in Datadog. Useful when managing several self-managed deployments.') }
help: -> { s_('DatadogIntegration|GitLab instance to tag all data from in Datadog. Can be used when managing several self-managed deployments.') }
field :datadog_env,
title: -> { s_('DatadogIntegration|Environment') },
placeholder: 'ci',
description: -> { _('For self-managed deployments, `env` tag for all the data sent to Datadog.') },
help: -> do
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}')
......@@ -74,6 +75,7 @@ class Datadog < Integration
type: :textarea,
title: -> { s_('DatadogIntegration|Tags') },
placeholder: "tag:value\nanother_tag:value",
description: -> { _('Custom tags in Datadog. Specify one tag per line in the format `key:value\nkey2:value2`.') },
help: -> do
ERB::Util.html_escape(
s_('DatadogIntegration|Custom tags in Datadog. Enter one tag per line in the %{codeOpen}key:value%{codeClose} format. %{linkOpen}How do I use tags?%{linkClose}')
......
doc/api/integrations.md
+ 6
− 6
View file @ f9eefdd2
......@@ -486,12 +486,12 @@ Parameters:
| Parameter | Type | Required | Description |
|------------------------|---------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `api_key` | string | yes | API key used for authentication with Datadog. |
| `api_url` | string | no | (Advanced) The full URL for your Datadog site. |
| `datadog_env` | string | no | For self-managed deployments, set the `env%` tag for all the data sent to Datadog. |
| `datadog_service` | string | no | Tag all data from this GitLab instance in Datadog. Can be used when managing several self-managed deployments. |
| `datadog_site` | string | no | The Datadog site to send data to. To send data to the EU site, use `datadoghq.eu`. |
| `datadog_tags` | string | no | Custom tags in Datadog. Specify one tag per line in the format `key:value\nkey2:value2` |
| `api_key` | string | yes | [API key](https://docs.datadoghq.com/account_management/api-app-keys/) used for authentication with Datadog. |
| `api_url` | string | no | Full URL of your Datadog site. |
| `datadog_env` | string | no | For self-managed deployments, `env%` tag for all the data sent to Datadog. |
| `datadog_service` | string | no | GitLab instance to tag all data from in Datadog. Can be used when managing several self-managed deployments. |
| `datadog_site` | string | no | Datadog site to send data to. To send data to the EU site, use `datadoghq.eu`. |
| `datadog_tags` | string | no | Custom tags in Datadog. Specify one tag per line in the format `key:value\nkey2:value2`. |
| `archive_trace_events` | boolean | no | When enabled, job logs are collected by Datadog and displayed along with pipeline execution traces ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/346339) in GitLab 15.3). |
| `use_inherited_settings` | boolean | no | Indicates whether to inherit the default settings. Defaults to `false`. |
......
locale/gitlab.pot
+ 14
− 8
View file @ f9eefdd2
......@@ -16936,6 +16936,9 @@ msgstr ""
msgid "Custom role"
msgstr ""
 
msgid "Custom tags in Datadog. Specify one tag per line in the format `key:value\\nkey2:value2`."
msgstr ""
msgid "Customer experience improvement and third-party offers"
msgstr ""
 
......@@ -17918,34 +17921,34 @@ msgstr ""
msgid "DatadogIntegration|%{link_start}API key%{link_end} used for authentication with Datadog."
msgstr ""
 
msgid "DatadogIntegration|(Advanced) The full URL for your Datadog site."
msgstr ""
msgid "DatadogIntegration|API URL"
msgstr ""
 
msgid "DatadogIntegration|Custom tags in Datadog. Enter one tag per line in the %{codeOpen}key:value%{codeClose} format. %{linkOpen}How do I use tags?%{linkClose}"
msgstr ""
 
msgid "DatadogIntegration|Datadog site to send data to. To send data to the EU site, use %{codeOpen}datadoghq.eu%{codeClose}."
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|Send CI/CD pipeline information to Datadog to monitor for job failures and troubleshoot performance issues."
msgid "DatadogIntegration|Full URL of your Datadog site."
msgstr ""
 
msgid "DatadogIntegration|Service"
msgid "DatadogIntegration|GitLab instance to tag all data from in Datadog. Can be used when managing several self-managed deployments."
msgstr ""
 
msgid "DatadogIntegration|Tag all data from this GitLab instance in Datadog. Useful when managing several self-managed deployments."
msgid "DatadogIntegration|Send CI/CD pipeline information to Datadog to monitor for job failures and troubleshoot performance issues."
msgstr ""
 
msgid "DatadogIntegration|Tags"
msgid "DatadogIntegration|Service"
msgstr ""
 
msgid "DatadogIntegration|The Datadog site to send data to. To send data to the EU site, use %{codeOpen}datadoghq.eu%{codeClose}."
msgid "DatadogIntegration|Tags"
msgstr ""
 
msgid "DatadogIntegration|Trace your GitLab pipelines with Datadog."
......@@ -23830,6 +23833,9 @@ msgstr ""
msgid "For more information, see the file hooks documentation."
msgstr ""
 
msgid "For self-managed deployments, `env` tag for all the data sent to Datadog."
msgstr ""
msgid "For the GitLab Team to keep your subscription data up to date, this is a reminder to report your license usage on a monthly basis, or at the cadence set in your agreement with GitLab. This allows us to simplify the billing process for overages and renewals. To report your usage data, export your license usage file and email it to %{renewal_service_email}. If you need an updated license, GitLab will send the license to the email address registered in the %{customers_dot}, and you can upload this license to your instance."
msgstr ""
 
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