Skip to content
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.

Sign up for GitHub

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

Jump to bottom

support for instances and http_host #299

Merged
merged 4 commits into from
Mar 10, 2017
Merged

support for instances and http_host #299

merged 4 commits into from
Mar 10, 2017

Conversation

obi11235
Copy link
Contributor

This will allow datadog's agent to monitor more than one instance of phpfpm on a machine as well as adding support for the http_host parameter to the check.

@truthbk
Copy link
Member

truthbk commented Mar 3, 2017

Nice @obi11235! It's so great to see the contributions making many of the integrations multi-instance. Very much appreciated. Could you please rebase to the latest master? There was a problem in the CI that prevented our tests from running (due to an inadverted upgrade to nokogiri), that has since been fixed here #298 and we'll need that rebase for the tests to run.

Thanks! 🙇

@truthbk truthbk added this to the 1.10.0 milestone Mar 3, 2017
@truthbk truthbk self-assigned this Mar 3, 2017
@obi11235
Copy link
Contributor Author

obi11235 commented Mar 8, 2017

Merged master in, all tests passing now.

truthbk
truthbk approved these changes Mar 10, 2017
View reviewed changes
Copy link
Member

@truthbk truthbk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the small nit, this looks good to go. If you could make that small change, that'd be great. @obi11235 if you don't have the time let me know and I'll fix it myself.

manifests/integrations/php_fpm.pp
@@ -21,12 +21,25 @@
#

class datadog_agent::integrations::php_fpm(
$http_host = undef,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit (since all parameters are essentially optional, it doesn't make much of a difference), we probably want to http_host to be placed after ping_url, just to resemble the YAML structure and the fact that it really can be undef whereas the other two are a must.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, it's such a small change I don't want to bother you with it. I'll take care of it! Thanks!

@truthbk truthbk merged commit 1abb3ca into DataDog:master Mar 10, 2017
cegeka-jenkins pushed a commit to cegeka/puppet-datadog_agent that referenced this pull request Jan 31, 2018
@obi11235 @truthbk
support for instances and http_host (DataDog#299)
a16c97d 
* support for instances and http_host

* cleanup

* cleanup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@truthbk truthbk truthbk approved these changes

Assignees

@truthbk truthbk

Labels
community Feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@obi11235 @truthbk