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

Kafka, Linux_proc_extras, Directory, and many other small fixes or additions #357

Merged
merged 19 commits into from
Dec 12, 2017
Merged

Kafka, Linux_proc_extras, Directory, and many other small fixes or additions #357

merged 19 commits into from
Dec 12, 2017

Conversation

alexfouche
Copy link
Contributor

No description provided.

alexfouche and others added 19 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 truthbk merged commit 5c24757 into DataDog:master Dec 12, 2017
truthbk added a commit that referenced this pull request Dec 12, 2017
[update] #357 Kafka, Linux_proc_extras, Directory, and many other small fixes or additions
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.

This was a really awesome piece of work @alexfouche - I was able to use most of it. There were some changes that needed to be made to accomodate for old puppets. I am aware that this review took a lot longer than it should've so I felt bad asking you to make changes and keep this work in backburner longer. I drafted a separate PR #376 with most of your work here, and some minor changes. Let me know if you have any feedback.

) inherits datadog_agent::params {
include datadog_agent

file { "${datadog_agent::params::conf_dir}/linux_proc_extras.yaml":
Copy link
Member

Choose a reason for hiding this comment

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

should be datadog_agent::conf_dir, as conf_dir is overridable.

@@ -32,7 +32,7 @@
# excluded_disk_re => '/dev/sd[e-z]*'
# }
class datadog_agent::integrations::disk (
$use_mount = 'no',
$use_mount = false,
Copy link
Member

Choose a reason for hiding this comment

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

This is exactly what should've been from day one, and I we'll make sure some of this stuff is fixed in the upcoming major release. Unfortunately this would break manifests for current users. I don't think this was currently broken... if it is, please open an issue and I'll tackle it ASAP in the bugfix release.

$tag_name = '',
$pattern = '*',
$recursive = false
Array[Struct[{
Copy link
Member

Choose a reason for hiding this comment

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

This isn't supported in older puppets, so we're going to have to something suboptimal like we do with haproxy or postgres. I know, its unfortunate thay we have to prescind of a clean elegant solution like this one to accomodate for older puppets. This sort of thing should become the norm soon.

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