Add additional rabbitmq parameters in rabbitmq.yaml.example#288
Merged
truthbk merged 2 commits intoDataDog:masterfrom Mar 3, 2017
Merged
Add additional rabbitmq parameters in rabbitmq.yaml.example#288truthbk merged 2 commits intoDataDog:masterfrom
truthbk merged 2 commits intoDataDog:masterfrom
Conversation
5128924 to
e0a939c
Compare
a37da35 to
1deb748
Compare
1deb748 to
ae093a1
Compare
Member
|
Thank a lot for this @alvin-huang! This looks pretty much ready at first glance, I'll take a closer look and hopefully merge soon! Thanks a bunch for updating the tests too! 🙇 |
|
Having the |
Member
|
I just took a look at this and it definitely doesn't look like it'll cause any breakage for older manifests. I'm merging this, will run a few tests to decide if there's any (unlikely) tweaking necessary. Thank you very much @alvin-huang, for the PR and the detailed explanation. |
cegeka-jenkins
pushed a commit
to cegeka/puppet-datadog_agent
that referenced
this pull request
Jan 31, 2018
This file contains hidden or 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
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.
In the Datadog integration examples, the RabbitMQ one (https://github.com/DataDog/dd-agent/blob/master/conf.d/rabbitmq.yaml.example) had some additional parameters not currently available in the Puppet module.
This PR covers a couple different changes:
Adds the following parameters to the RabbitMQ template:
Sets defaults according to the example file:
username = 'guest'
password = 'guest'
ssl_verify = true
tag_families = false
While these defaults are implicitly being set in the checks, I thought it would be clearer for users if they saw it in Puppet to reflect what the python scripts are doing in places like (https://github.com/DataDog/dd-agent/blob/master/checks.d/rabbitmq.py#L114-L115)
Additionally, because these defaults are set, we don't need to check them in the erb template.
Add parameter validation to fail fast