Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5b4a9c39
Commit
5b4a9c39
authored
Sep 07, 2021
by
Adrian Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update intake DNS for datadog integration
parent
9287b27a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/integrations/datadog.rb
app/models/integrations/datadog.rb
+1
-1
spec/models/integrations/datadog_spec.rb
spec/models/integrations/datadog_spec.rb
+3
-3
No files found.
app/models/integrations/datadog.rb
View file @
5b4a9c39
...
...
@@ -7,7 +7,7 @@ module Integrations
extend
Gitlab
::
Utils
::
Override
DEFAULT_DOMAIN
=
'datadoghq.com'
URL_TEMPLATE
=
'https://webhook
s-http-intake.logs
.%{datadog_domain}/api/v2/webhook'
URL_TEMPLATE
=
'https://webhook
-intake
.%{datadog_domain}/api/v2/webhook'
URL_API_KEYS_DOCS
=
"https://docs.
#{
DEFAULT_DOMAIN
}
/account_management/api-app-keys/"
SUPPORTED_EVENTS
=
%w[
...
...
spec/models/integrations/datadog_spec.rb
View file @
5b4a9c39
...
...
@@ -11,7 +11,7 @@ RSpec.describe Integrations::Datadog do
let
(
:active
)
{
true
}
let
(
:dd_site
)
{
'datadoghq.com'
}
let
(
:default_url
)
{
'https://webhook
s-http-intake.logs
.datadoghq.com/api/v2/webhook'
}
let
(
:default_url
)
{
'https://webhook
-intake
.datadoghq.com/api/v2/webhook'
}
let
(
:api_url
)
{
''
}
let
(
:api_key
)
{
SecureRandom
.
hex
(
32
)
}
let
(
:dd_env
)
{
'ci'
}
...
...
@@ -66,7 +66,7 @@ RSpec.describe Integrations::Datadog do
context
'with custom api_url'
do
let
(
:dd_site
)
{
''
}
let
(
:api_url
)
{
'https://webhook
s-http-intake.logs
.datad0g.com/api/v2/webhook'
}
let
(
:api_url
)
{
'https://webhook
-intake
.datad0g.com/api/v2/webhook'
}
it
{
is_expected
.
not_to
validate_presence_of
(
:datadog_site
)
}
it
{
is_expected
.
to
validate_presence_of
(
:api_url
)
}
...
...
@@ -108,7 +108,7 @@ RSpec.describe Integrations::Datadog do
end
context
'with custom URL'
do
let
(
:api_url
)
{
'https://webhook
s-http-intake.logs
.datad0g.com/api/v2/webhook'
}
let
(
:api_url
)
{
'https://webhook
-intake
.datad0g.com/api/v2/webhook'
}
it
{
is_expected
.
to
eq
(
api_url
+
"?dd-api-key=
#{
api_key
}
&env=
#{
dd_env
}
&service=
#{
dd_service
}
"
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment