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

[Integrations] Add logic to install extra_packages agent checks #271

Merged
merged 2 commits into from Aug 4, 2016

Conversation

Projects
None yet
5 participants
@tmichelet
Copy link
Contributor

tmichelet commented Jan 29, 2016

  • Let the datadog:dd-agent recipe install any package found in the
    extra_packages attribute, and configure it
  • add some tests with the twemproxy integration

cc @miketheman

@tmichelet

This comment has been minimized.

Copy link
Contributor Author

tmichelet commented Jan 29, 2016

@miketheman it appears that travis is failing on

FC034: Unused template variables: /home/travis/build/DataDog/chef-datadog/templates/default/integration.yaml.erb:1

I'm not sure why, as both instances and init_config are used.
Is that a known issue?

@tmichelet

This comment has been minimized.

Copy link
Contributor Author

tmichelet commented Jan 29, 2016

also I'm not sure to see the difference with this other template

@tmichelet tmichelet force-pushed the tristan/integrations-recipe branch from 8b1d486 to 340c7d0 Feb 3, 2016

@tmichelet

This comment has been minimized.

Copy link
Contributor Author

tmichelet commented Feb 3, 2016

@miketheman travis fixed, thanks for your help! this is ready for review

@miketheman miketheman added the feature label Mar 12, 2016

@@ -0,0 +1,43 @@
#
# Cookbook Name:: datadog
# Recipe:: dd-agent

This comment has been minimized.

Copy link
@olivielpeau

olivielpeau Mar 16, 2016

Member

nitpick: should be integrations instead of dd-agent

end

if @agent_check_dir
AGENT_CHECK = File.join(@agent_check_dir, 'twemproxy.py')

This comment has been minimized.

Copy link
@olivielpeau

olivielpeau Mar 16, 2016

Member

This should be updated to /opt/datadog-agent/3rd-party/twemproxy/check.py

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented Mar 16, 2016

Looks good to me apart from my small comments.

@tmichelet tmichelet force-pushed the tristan/integrations-recipe branch from 340c7d0 to 557232a Mar 24, 2016

@olivielpeau olivielpeau force-pushed the tristan/integrations-recipe branch from 557232a to f3b788f Jun 7, 2016

tmichelet and others added some commits Jan 28, 2016

[Integrations] Add logic to install extra_packages agent checks
- Let the datadog:dd-agent recipe install any package found in the
  `extra_packages` attribute, and configure it
- add some tests with the twemproxy integration

@olivielpeau olivielpeau force-pushed the tristan/integrations-recipe branch from f3b788f to 9bfa20f Jun 7, 2016

@olivielpeau olivielpeau added this to the 2.5.0 milestone Jun 7, 2016

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented Jun 7, 2016

Rebased and added specs. This should be ready for a final review/merge.

@degemer

This comment has been minimized.

Copy link
Member

degemer commented Jun 7, 2016

LGTM

@olivielpeau olivielpeau added the ready label Jul 8, 2016

@olivielpeau olivielpeau merged commit 7f6ea48 into master Aug 4, 2016

3 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@olivielpeau olivielpeau deleted the tristan/integrations-recipe branch Aug 4, 2016

end

if @agent_check_dir
describe file('/opt/datadog-agent/3rd-party/twemproxy/check.py') do

This comment has been minimized.

Copy link
@remh

remh Aug 5, 2016

Member

it's not called 3rd party anymore

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.