summaryrefslogtreecommitdiff
path: root/lib/api/helpers/integrations_helpers.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-20 09:16:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-20 09:16:11 +0000
commitedaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch)
tree11f143effbfeba52329fb7afbd05e6e2a3790241 /lib/api/helpers/integrations_helpers.rb
parentd8a5691316400a0f7ec4f83832698f1988eb27c1 (diff)
downloadgitlab-ce-edaa33dee2ff2f7ea3fac488d41558eb5f86d68c.tar.gz
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'lib/api/helpers/integrations_helpers.rb')
-rw-r--r--lib/api/helpers/integrations_helpers.rb16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index e7fdb6645a5..3af0dd4c532 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -314,25 +314,33 @@ module API
required: false,
name: :datadog_site,
type: String,
- desc: 'Choose the Datadog site to send data to. Set to "datadoghq.eu" to send data to the EU site'
+ desc: 'The Datadog site to send data to. To send data to the EU site, use datadoghq.eu'
},
{
required: false,
name: :api_url,
type: String,
- desc: '(Advanced) Define the full URL for your Datadog site directly'
+ desc: '(Advanced) The full URL for your Datadog site'
},
+ # TODO: uncomment this field once :datadog_integration_logs_collection is rolled out
+ # https://gitlab.com/gitlab-org/gitlab/-/issues/346339
+ # {
+ # required: false,
+ # name: :archive_trace_events,
+ # type: Boolean,
+ # desc: 'When enabled, job logs will be collected by Datadog and shown along pipeline execution traces'
+ # },
{
required: false,
name: :datadog_service,
type: String,
- desc: 'Name of this GitLab instance that all data will be tagged with'
+ desc: 'Tag all data from this GitLab instance in Datadog. Useful when managing several self-managed deployments'
},
{
required: false,
name: :datadog_env,
type: String,
- desc: 'The environment tag that traces will be tagged with'
+ desc: 'For self-managed deployments, set the env tag for all the data sent to Datadog. How do I use tags?'
}
],
'discord' => [