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.

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

[update] #357 Kafka, Linux_proc_extras, Directory, and many other small fixes or additions #376

Merged
merged 26 commits into from
Dec 12, 2017

Conversation

truthbk
Copy link
Member

@truthbk truthbk commented Dec 12, 2017

Most of the work here is by @alexfouche - introducing a few new integrations and several other fixes. I had to draft this superseding PR #357 to address a few thing in his PR.

alexfouche and others added 26 commits December 13, 2016 07:33
subrepo:
  subdir:   "modules/datadog_agent"
  merged:   "f1465c9"
upstream:
  origin:   "[email protected]:alexfouche/puppet-datadog-agent.git"
  branch:   "master"
  commit:   "7a2ed2f"
git-subrepo:
  version:  "0.4.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2e78d5d"
subrepo:
  subdir:   "modules/datadog_agent"
  merged:   "91cf4d8"
upstream:
  origin:   "[email protected]:alexfouche/puppet-datadog-agent.git"
  branch:   "master"
  commit:   "ebf34de"
git-subrepo:
  version:  "0.4.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2e78d5d"
…et to false. Yet Datadog defaults are not always set to true, and one must be able to write explicitely a false attribute in the configuration
@truthbk
Copy link
Member Author

truthbk commented Dec 12, 2017

@alexfouche this was some awesome stuff. I'm merging most of your work but I've had to change two things:

  • rolled back your disk changes
  • had to revert the directory stuff to something compatible with older puppets. Hopefully we can make all integrations behave the way you implemented it when we (very soon) move to a new major release that will only support current puppets.

Thanks again!

@truthbk truthbk merged commit 67d5834 into master Dec 12, 2017
@truthbk truthbk deleted the jaime/alexfouchefixes branch December 12, 2017 18:29
@truthbk truthbk added this to the 1.12.0 milestone Dec 13, 2017
cegeka-jenkins pushed a commit to cegeka/puppet-datadog_agent that referenced this pull request Jan 31, 2018
[update] DataDog#357 Kafka, Linux_proc_extras, Directory, and many other small fixes or additions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants