Add support for 'site' option. #582
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
remeh
force-pushed
the
remeh/site-option
branch
from
d3aaed9 to
c346b10
Compare
olivielpeau
reviewed
Feb 19, 2019
remeh
force-pushed
the
remeh/site-option
branch
from
bef1e43 to
9339625
Compare
olivielpeau
reviewed
Feb 25, 2019
For dd-handler: - Use node['datadog']['url'] - If nil, use https://app.datadoghq.com For Agent 5: - Use node['datadog']['url'] - If nil, use https://app.datadoghq.com For Agent 6 (additional endpoints): - Use node['datadog']['site'] value to infer an intake url - If nil, use node['datadog']['url'] - If nil, use https://app.datadoghq.com For Agent 6 (dd_url / site): - Let the Agent decide by not setting the value in datadog.yaml
remeh
force-pushed
the
remeh/site-option
branch
from
977ee66 to
500afa8
Compare
olivielpeau
reviewed
Apr 24, 2019
There was a problem hiding this comment.
Almost there! 😄
A few inline nits, and let's change the default value of the attribute node['datadog']['process_agent']['url'] to nil. When it's set, the attribute is only written for the Agent v6's datadog.yaml so there should be no need for additional changes.
|
also, can you add a short explanation in the PR description about why you can remove |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Agent 6.9.0 has a new option
siteto configure on which site (US/EU) the Agent data should be sent, simplifying the configuration process by avoiding to type complete URLs in theurlconfiguration field.This pull-requests adds the attribute
sitein the Chef cookbook in order to use this option by default instead of theurlone.Note that it doesn't remove anything about the
urlconfiguration field has it's still supported and has priority on thesitevalue.The use of
DATADOG_HOSThas been removed: it was used by the chef-handler-datadog recipe to set the datadog host to use, however, the ruby lib dogapi-rb used already has a correct default value ifDATADOG_HOSTwas not set and on top of that: DataDog/chef-handler-datadog#103 makes sure that a default value is set directly inside the recipe instead of in the ruby lib dogapi-rb.