-
Notifications
You must be signed in to change notification settings - Fork 261
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Accept instances hashes on apache and http_check integrations #691
base: main
Are you sure you want to change the base?
Conversation
Looking at the tests, there's something in this PR that Puppet 4.6 doesn't like. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I spent a bit of time trying to debug the crash on Puppet 4.6 and I managed to track it down to this change which was added in Puppet 4.9.4: puppetlabs/puppet@6bc88d1
Without this change, it fails with undefined method
instance?' for nil:NilClass` but I'm not sure why. Maybe it's a good excuse to drop support for Puppet 4.6? :)
# Conflicts: # manifests/integrations/http_check.pp # templates/agent-conf.d/http_check.yaml.erb
@asenci I see some activity in your branch :) Do you think you could fix the failing tests on puppet 4.6? Then we could merge this to |
Sorry for the lack of feedback, we were down a team member for a while and I didn't have much time to work on this. |
3a72b27
to
da09c61
Compare
8bbabcb
to
0e1ec57
Compare
2ce39af
to
f06b9d4
Compare
f06b9d4
to
2fff883
Compare
Hi @albertvaka, I tried everything I could think of, but I couldn't make it work with Puppet 4.6. It seems to be some weird interaction with the test cases when spec_helper tries to check the resulting file. It passes the tests if you disable some specific checks on Not sure if there is anything else you would like to try, or if you'd prefer to close the PR? |
A thousand thanks for all the tests you made, I could see the commits on my Github notifications 🙇 🙇 🙇 I think this change is good and important, so if that's fine for you, let's keep the PR open until either we drop support for 4.6 or someone can help solve the problem on that version. |
# Conflicts: # .circleci/config.yml
What does this PR do?
This allows more options to be passed directly to the configuration template, without needing to update the module every time a new option is implemented while keeping it backwards compatible with the current style of parameters.
This also removes one test case from http_check:
with headers parameter array
(I couldn't find a use case for this on the Datadog integration documentation or code).Motivation
Using the current method of passing options as parameters to the Puppet module requires a module update every time a new option is added to the Datadog agent integration.
Additional Notes
Describe your test plan
Test cases included on the respective spec files