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

Make tags there own resourced, allow hiera created integrations, setup check_feq #261

Merged
merged 33 commits into from
Mar 23, 2017

Conversation

cwood
Copy link
Contributor

@cwood cwood commented Nov 18, 2016

These are a bunch of changes we have made to the puppet module.

  1. Make tags there own resources. This allows use to use hiera to define tags and look up the chain.
  2. Purge integrations that are not managed via puppet. We use this so we can make sure only the integrations we define are in use.
  3. I think the rest are just random stuff we have used to fix / setup better hiera flow.

@cwood
Copy link
Contributor Author

cwood commented Nov 18, 2016

@truthbk This is the new version. It should be fine. Please keep me posted. I dont want this to be like the integration PR where it sat for like 6 months. There are some usefull features in this PR. That I would think the community would like. The ability to define a tag as a resource makes it a lot more flexable for us.

@cwood cwood changed the title Cwood/bitbucket changes pr Make tags there own resourced, allow hiera created integrations, setup check_feq Nov 18, 2016
@truthbk truthbk force-pushed the cwood/bitbucket-changes-pr branch 2 times, most recently from ee0ab3d to dd043c1 Compare March 16, 2017 22:09
@cwood
Copy link
Contributor Author

cwood commented Mar 21, 2017

Thanks for taking over this. Hopefully the community finds this useful.

@truthbk truthbk force-pushed the cwood/bitbucket-changes-pr branch from 7cdf9a7 to 4e766bf Compare March 21, 2017 22:29
@truthbk
Copy link
Member

truthbk commented Mar 21, 2017

@cwood to the contrary, thank you for your constant contributions! 🙇
I'm trying to make this include a few new features that were merged, and ensure we don't break anything. Thanks again. I might ask for a review once we're done. Hopefully we can merge this soon.

@truthbk
Copy link
Member

truthbk commented Mar 21, 2017

Cool, I think we're green now. I'll have to run a few tests... I'm hoping we can merge this before Friday, and if no backward incompatibilities are found we'll have this in the next module release.

@cwood heads-up on a force push to your branch.

@truthbk truthbk force-pushed the cwood/bitbucket-changes-pr branch from 009f344 to 29d0847 Compare March 22, 2017 23:23
@sjenriquez
Copy link
Contributor

Left a comment about check_freq, but otherwise excellent changes here!

@truthbk
Copy link
Member

truthbk commented Mar 23, 2017

Thanks @sjenriquez, great catch on that one. Will merge if tests are green.

@@ -52,6 +52,8 @@
# $statsd_forward_port
# Set the value of the statsd_forward_port varable. Used to forward all
# statsd metrics to another host.
# $check_freq
# Sets how often checks should be run. By default, set to 15s
Copy link
Contributor

Choose a reason for hiding this comment

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

While this is valid, we don't recommend changing the check_freq. I think we should remove this parameter.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will break us if we dont have that. If its exposed by the dd-agent and documented why cant it be set by the module?

@@ -200,6 +204,7 @@
$statsd_forward_host = '',
$statsd_forward_port = '',
$statsd_histogram_percentiles = '0.95',
$check_freq = '',
Copy link
Contributor

Choose a reason for hiding this comment

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

See above

check_freq: <%= @check_freq %>
<% end -%>


Copy link
Contributor

Choose a reason for hiding this comment

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

See comment above regarding check_freq

@cwood
Copy link
Contributor Author

cwood commented Mar 23, 2017

I put in the comment that we do use check_freq so that isnt really great for us. Ill have to double check what we set it too. But id rather keep it then remove it.

@truthbk
Copy link
Member

truthbk commented Mar 23, 2017

@cwood going to merge this, as it's a pain to rebase, and looks pretty much ready to go. Can we revisit check_freq in a separate PR/issue? Thanks!

@truthbk truthbk merged commit d8f40d8 into DataDog:master Mar 23, 2017
@cwood
Copy link
Contributor Author

cwood commented Mar 23, 2017

Its no worries thanks for working on this. Glad this got merged in :)

@truthbk truthbk mentioned this pull request Mar 24, 2017
@truthbk truthbk added this to the 1.10.0 milestone Apr 20, 2017
@flyinprogrammer
Copy link
Contributor

This broke the extra_template parameter 😢

cegeka-jenkins pushed a commit to cegeka/puppet-datadog_agent that referenced this pull request Jan 31, 2018
…p check_feq (DataDog#261)

* Make a generic define for creating modules

There is one already but only allows one since its a class we can not do
a bunch of integrations and replace the class with this. Also this will
allow you to write ruby, or hiera and put it in the config you need.

* Remove unused template

* Add support for init_config if passed

* Update to remove the empty string.

* Adding logic to handle tags as arrays.

* Allow support for integrations from hiera

* Fix some typos

* Add check_freq setting

* Allow the ability to purge unsued configs

* Notify the service

* Setup a spec test

* Set recurse to true

* Set force to true if purge is true

* Allow tags to be there own define.

* Fix name

* Allow looking up facts to tags

* Fix unless issue

* If a array call itself and add the fragment

* Check if is_array

* Remove map and use map()

* Migrate tags to its own array

* Prefix everything with the tag

* Make tags its own thing

* Only run if not a tag

* Add a begining new line

* Only add if we have a value

* [service_discovery][dogstatsd] adding relevant SD and dogstatsd to the relevant fragments.

* [apm] adding apm tests.

* [datadog-agent][spec] check fragment contents instead.

* [spec] fix ports as integers for new concat templates.

* [templates] removing global template, we now use concat templates.

* [main] dogstatsd should also allow string and integer ports - like other params.

* [init] remove check_freq, undocumented.
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.

4 participants