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

Set windows values for agent 6 #525

Merged
merged 3 commits into from
Mar 7, 2018
Merged

Conversation

rlaveycal
Copy link
Contributor

  • permission config file on windows
  • install checks yaml in sub dir of conf.d on agent 6

Closes #524

permission config file on windows
install checks yaml in sub dir of conf.d on agent 6

Signed-off-by: Richard Lavey <richard.lavey@calastone.com>
Signed-off-by: Richard Lavey <richard.lavey@calastone.com>
Copy link
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

Thanks @rlaveycal for updating this!

Looks good to me overall, I've made a comment on the change to the sub-dir of conf.d on Agent 6, which would slightly break things for existing Linux users, coul you have a look?


def yaml_dir
if node['datadog']['agent6']
::File.join(node['datadog']['agent6_config_dir'], 'conf.d', "#{new_resource.name}.d")
Copy link
Member

Choose a reason for hiding this comment

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

could you remove the "#{new_resource.name}.d" part to keep only ::File.join(node['datadog']['agent6_config_dir'], 'conf.d')? Agent 6 still supports that configuration scheme (and that's the scheme the cookbook currently uses for Linux Agent 6). Changing the scheme now would slightly break the cookbook for Linux Agent 6 users upgrading from previous versions of the cookbook.

I'm planning to switch to the new scheme in the next major version of the cookbook.

Signed-off-by: Richard Lavey <richard.lavey@calastone.com>
Copy link
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

👍 thanks @rlaveycal!

@olivielpeau olivielpeau added this to the 2.15.0 milestone Mar 7, 2018
@olivielpeau olivielpeau merged commit 1c1a713 into DataDog:master Mar 7, 2018
@rlaveycal rlaveycal deleted the Issue_524 branch March 7, 2018 13:19
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