[agent6] adding support for the agent beta #356

truthbk · 2017-10-12T14:17:14Z

This PR aims to provide a means to install the agent 6 (currently in beta) via the puppet module. It should allow for a seamless upgrade/downgrade experience as the integration configurations should be dropped in the right location in either case.

Please note the subset of configuration features for agent6 is still limited, with more to come in the coming days/weeks.

fix lint issues

[spec] fix for older rubies. [agent6] consistent YAML experience across puppets [spec][agent6] cover old puppet ZAML regex

… both beta and stable.

hush-hush

I left a few questions/comments (event if I'm not a puppet expert). Only real point is for the docker.yaml file in agent6.

hush-hush · 2017-10-23T15:53:18Z

manifests/init.pp

  $conf_dir = $datadog_agent::params::conf_dir,
+  $conf6_dir = $datadog_agent::params::conf6_dir,


Would it be possible to overwrite $conf_dir if agent6 is enable ? It would avoid adding a if/else statement in every integration .pp.

variables are actually constants in puppet, so unfortunately no dice.

I first tried just adding agent6_enable but then that forced the customer to override conf_dir manually, that would result in a ton of issues and most customers would just expect the agent6_enable tag to work.

hush-hush · 2017-10-23T15:57:53Z

manifests/integrations/docker_daemon.pp

@@ -33,11 +33,23 @@
    notify  => Service[$datadog_agent::params::service_name]
  }

-  file { "${datadog_agent::params::conf_dir}/docker.yaml":
+  if $::datadog_agent::agent6_enable {
+    $legacy_conf = "${datadog_agent::conf6_dir}/docker.yaml"


The old docker.yaml configuration file was remove from agent6 but the new docker check (the one in Go) is named docker. The docker_daemon.yaml configuration is not supported anymore.

I guess we should ensure:

for agent5: ensure docker.yaml is absent and docker_daemon.yaml present

for agent6: ensure docker.yaml is present and docker_daemon.yaml absent

What do you think ?

hush-hush · 2017-10-23T17:41:02Z

manifests/ubuntu.pp

@@ -46,6 +49,7 @@
    refreshonly => true,
    tries       => 2, # https://bugs.launchpad.net/launchpad/+bug/1430011 won't get fixed until 16.04 xenial
    try_sleep   => 30,
+    require     => File['/etc/apt/sources.list.d/datadog-beta.list'],


Why do we require the beta list to update the agent ?

Because the resource ensures the file will be absent - the file resource is required, and then the file is ensure => absent.

hush-hush · 2017-10-23T17:42:10Z

manifests/ubuntu/agent6.pp

+    refreshonly => true,
+    tries       => 2, # https://bugs.launchpad.net/launchpad/+bug/1430011 won't get fixed until 16.04 xenial
+    try_sleep   => 30,
+    require     => File['/etc/apt/sources.list.d/datadog.list'],


Same here: why do we need agent5 list ?

hush-hush · 2017-10-23T17:46:04Z

spec/classes/datadog_agent_reports_spec.rb

@@ -46,7 +46,7 @@
        end

        it do
-          should contain_file('/etc/dd-agent/datadog.yaml')\
+          should contain_file('/etc/datadog-agent/datadog-reports.yaml')\


So no matter the agent version we use /etc/datadog-agent for report ? Won't it be confusing for people update the puppet classes but not the agent ?

Yeah, this sucks a bit... I guess maybe /etc/datadog/ is better. What I don't want to do is keep dd-agent around, because that will eventually be even more confusing for customers moving away from agent5.

Indeed. I guess /etc/datadog-agent is the best choice then.

hush-hush · 2017-10-24T17:18:01Z

spec/classes/datadog_agent_reports_spec.rb

@@ -46,7 +46,7 @@
        end

        it do
-          should contain_file('/etc/dd-agent/datadog.yaml')\
+          should contain_file('/etc/datadog-agent/datadog-reports.yaml')\


Indeed. I guess /etc/datadog-agent is the best choice then.

[agent6] adding support for the agent beta (DataDog#356)

* [agent6] add support for agent6 config locations. * [agent6] adding agent6 repos. * [agent6] adding datadog.yaml config template. * [agent6] preparing main manifest for agent6 support. fix lint issues * [agent6][spec] fixes + spec test work [spec] fix for older rubies. [agent6] consistent YAML experience across puppets [spec][agent6] cover old puppet ZAML regex * [agent6][repo] remove beta if on stable and viceversa * [agent6][spec] adding RHEL and Ubuntu repo tests * [agent6][yum] no ensure on yumrepo -> use datadog repo definition for both beta and stable. * [docker_daemon] agent6 goes back to docker.yaml for config * [gemfile] pin jwt to 1.5.6

truthbk added 7 commits October 9, 2017 16:44

[agent6] add support for agent6 config locations.

3c190e1

[agent6] adding agent6 repos.

1f67d73

[agent6] adding datadog.yaml config template.

bb05402

[agent6] preparing main manifest for agent6 support.

a68bcd6

fix lint issues

[agent6][spec] fixes + spec test work

07a6b98

[spec] fix for older rubies. [agent6] consistent YAML experience across puppets [spec][agent6] cover old puppet ZAML regex

[agent6][repo] remove beta if on stable and viceversa

883f762

[agent6][spec] adding RHEL and Ubuntu repo tests

5afc6e2

truthbk force-pushed the jaime/agent6 branch from 84ed931 to 5afc6e2 Compare October 12, 2017 22:29

[agent6][yum] no ensure on yumrepo -> use datadog repo definition for…

03cf2c7

… both beta and stable.

truthbk changed the title ~~[agent6] adding support for the agent beta [WIP]~~ [agent6] adding support for the agent beta Oct 18, 2017

hush-hush requested changes Oct 23, 2017

View reviewed changes

truthbk added 2 commits October 24, 2017 18:07

[docker_daemon] agent6 goes back to docker.yaml for config

9347fb5

[gemfile] pin jwt to 1.5.6

4923d33

truthbk force-pushed the jaime/agent6 branch from d2d5eda to 4923d33 Compare October 24, 2017 16:21

hush-hush approved these changes Oct 24, 2017

View reviewed changes

truthbk merged commit 73fe2f4 into master Oct 26, 2017

truthbk deleted the jaime/agent6 branch October 26, 2017 08:34

Dan70402 added a commit to Dan70402/puppet-datadog-agent that referenced this pull request Nov 18, 2017

Merge pull request #1 from DataDog/master

e4690d8

[agent6] adding support for the agent beta (DataDog#356)

ardrigh mentioned this pull request Dec 12, 2017

Puppet v4 upgrade #362

Closed

truthbk added this to the 1.12.0 milestone Dec 13, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[agent6] adding support for the agent beta #356

[agent6] adding support for the agent beta #356

truthbk commented Oct 12, 2017 •

edited

Loading

hush-hush left a comment

hush-hush Oct 23, 2017

truthbk Oct 24, 2017 •

edited

Loading

hush-hush Oct 23, 2017

hush-hush Oct 23, 2017

truthbk Oct 24, 2017 •

edited

Loading

hush-hush Oct 23, 2017

truthbk Oct 24, 2017

hush-hush Oct 23, 2017

truthbk Oct 24, 2017

hush-hush Oct 24, 2017

hush-hush Oct 24, 2017

		$conf_dir = $datadog_agent::params::conf_dir,
		$conf6_dir = $datadog_agent::params::conf6_dir,

[agent6] adding support for the agent beta #356

[agent6] adding support for the agent beta #356

Conversation

truthbk commented Oct 12, 2017 • edited Loading

hush-hush left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

truthbk Oct 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

truthbk Oct 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

truthbk commented Oct 12, 2017 •

edited

Loading

truthbk Oct 24, 2017 •

edited

Loading

truthbk Oct 24, 2017 •

edited

Loading