Merge remote-tracking branch 'upstream/master' into add-client-configuration-info

unixorn · unixorn · commit 13cf46fb28ab · 2016-06-22T10:42:47.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,9 @@ before_install: rm -f Gemfile.lock
 sudo: false
 cache: bundler
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.3
 script:
   - bundle exec rake spec
   - bundle exec rake test
@@ -25,10 +25,6 @@ env:
   - PUPPET_VERSION="~> 4.2.1" STRICT_VARIABLES=yes
 matrix:
   exclude:
-  # Ruby 1.9.3
-  - rvm: 1.9.3
-    env: PUPPET_VERSION="~> 2.7.0"
-
   # Ruby 2.0.0
   - rvm: 2.0.0
     env: PUPPET_VERSION="~> 2.7.0"
@@ -42,3 +38,13 @@ matrix:
     env: PUPPET_VERSION="~> 3.3.0"
   - rvm: 2.1.0
     env: PUPPET_VERSION="~> 3.4.0"
+
+  # Ruby 2.2.3
+  - rvm: 2.2.3
+    env: PUPPET_VERSION="~> 2.7.0"
+  - rvm: 2.2.3
+    env: PUPPET_VERSION="~> 3.2.0"
+  - rvm: 2.2.3
+    env: PUPPET_VERSION="~> 3.3.0"
+  - rvm: 2.2.3
+    env: PUPPET_VERSION="~> 3.4.0"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changes
 =======
 
+# 1.7.1 / 2016-06-22
+
+### Notes
+
+* [BUFIX] Fix reversed logic in `hostname_extraction` option.. See [#189][]. (Thanks [@davejrt][]).
+* [BUFIX] Fix reporting on PE and POSS. Dogapi gem required in JRuby Env. See [#188][].
+* [BUFIX] On ubuntu manifest, agent version should be explicitly configurable. See [#187][].
+* [BUFIX] HTTP check, name is a compulsory field. See [#186][].
+* [BUFIX] Dogstatsd should be enabled by default. See [#183][].
+
 # 1.7.0 / 2016-04-12
 
 ### Notes
@@ -150,6 +160,11 @@ Changes
 [#174]: https://github.com/DataDog/puppet-datadog-agent/issues/174
 [#175]: https://github.com/DataDog/puppet-datadog-agent/issues/175
 [#176]: https://github.com/DataDog/puppet-datadog-agent/issues/176
+[#183]: https://github.com/DataDog/puppet-datadog-agent/pull/183
+[#186]: https://github.com/DataDog/puppet-datadog-agent/pull/186
+[#187]: https://github.com/DataDog/puppet-datadog-agent/pull/187
+[#188]: https://github.com/DataDog/puppet-datadog-agent/pull/188
+[#189]: https://github.com/DataDog/puppet-datadog-agent/pull/189
 [@BIAndrews]: https://github.com/BIAndrews
 [@LeoCavaille]: https://github.com/LeoCavaille
 [@MartinDelta]: https://github.com/MartinDelta
@@ -167,3 +182,4 @@ Changes
 [@obowersa]: https://github.com/obowersa
 [@rtyler]: https://github.com/rtyler
 [@tuxinaut]: https://github.com/tuxinaut
+[@davejrt]: https://github.com/davejrt
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,9 @@
 source "https://rubygems.org"
 
 group :test do
+  gem "syck"
+  gem "safe_yaml", "~> 1.0.4"
+  gem "listen", "~> 3.0.0"
   gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.2.0'
   gem "puppet-lint"
   gem "puppet-syntax"
diff --git a/README.md b/README.md
@@ -59,7 +59,8 @@ that needs to be done.
           puppet_run_reports => true,
         }
 
-  __To support reporting, your Puppet master needs to have the [dogapi](https://github.com/DataDog/dogapi-rb) gem installed, to do that either run the puppet agent on your master with this configuration or install it manually with `gem`__
+  __To support reporting, your Puppet master needs to have the [dogapi](https://github.com/DataDog/dogapi-rb) gem installed, to do that either run the puppet agent on your master with this configuration or install it manually with `gem`.__
+  _Please note if on Puppet Enterprise or POSS (ie. >=3.7.0) there is a soft dependency for reporting on the `puppetserver_gem` module. Install with `puppet module install puppetlabs-puppetserver_gem` - installing manually with `gem` will *not* work._
 
 3. Include any other integrations you want the agent to use, e.g.
 
@@ -97,6 +98,7 @@ And on all of your Puppet client nodes add:
     # ...
     report=true
 
+
 If you get
 
     err: Could not send report:
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -104,7 +104,7 @@
 #       String. Default: empty
 #   $use_dogstatsd
 #       Enables the dogstatsd server
-#       Boolean. Default: false
+#       Boolean. Default: true
 #   $dogstatsd_port
 #       Specifies the port to be used by dogstatsd. Must have use_dogstatsd set
 #       String. Default: empty
@@ -216,7 +216,7 @@
   $pup_port = '',
   $pup_interface = '',
   $pup_url = '',
-  $use_dogstatsd = false,
+  $use_dogstatsd = true,
   $dogstatsd_target = '',
   $dogstatsd_interval = '',
   $dogstatsd_normalize = true,
diff --git a/manifests/integrations/http_check.pp b/manifests/integrations/http_check.pp
@@ -52,16 +52,19 @@
 # Sample Usage:
 #
 # class { 'datadog_agent::integrations::http_check':
-#   url     => 'http://www.google.com/',
+#   sitename  => 'google',
+#   url       => 'http://www.google.com/',
 # }
 #
 # class { 'datadog_agent::integrations::http_check':
-#   url     => 'http://localhost/',
-#   headers => ['Host: stan.borbat.com', 'DNT: true'],
-#   tags    => ['production', 'wordpress'],
+#   sitename => 'local',
+#   url      => 'http://localhost/',
+#   headers  => ['Host: stan.borbat.com', 'DNT: true'],
+#   tags     => ['production', 'wordpress'],
 # }
 #
 # class { 'datadog_agent::integrations::http_check':
+#   sitename              => 'localhost-9001',
 #   url                   => 'http://localhost:9001/',
 #   timeout               => 5,
 #   threshold             => 1,
@@ -74,6 +77,7 @@
 #
 #
 class datadog_agent::integrations::http_check (
+  $sitename  = undef,
   $url       = undef,
   $username  = undef,
   $password  = undef,
@@ -92,6 +96,7 @@
 
   if !$instances and $url {
     $_instances = [{
+      'sitename'                 => $sitename,
       'url'                      => $url,
       'username'                 => $username,
       'password'                 => $password,
diff --git a/manifests/reports.pp b/manifests/reports.pp
@@ -21,6 +21,14 @@
 
   include datadog_agent::params
   $rubydev_package = $datadog_agent::params::rubydev_package
+  $gemprovider = 'puppetserver_gem'
+
+  # set the right provider
+  if (!defined('$::serverversion') or versioncmp($::serverversion, '3.7.0') < 0) {
+      $_gemprovider = 'gem'
+  } else {
+      $_gemprovider = $gemprovider
+  }
 
   # check to make sure that you're not installing rubydev somewhere else
   if ! defined(Package[$rubydev_package]) {
@@ -48,7 +56,7 @@
 
   package{'dogapi':
     ensure   => 'installed',
-    provider => 'gem',
+    provider => $_gemprovider,
   }
 
 }
diff --git a/manifests/ubuntu.pp b/manifests/ubuntu.pp
@@ -11,7 +11,8 @@
 # Sample Usage:
 #
 class datadog_agent::ubuntu(
-  $apt_key = 'C7A7DA52'
+  $apt_key = 'C7A7DA52',
+  $agent_version = 'latest'
 ) {
 
   ensure_packages(['apt-transport-https'])
@@ -43,7 +44,7 @@
   }
 
   package { 'datadog-agent':
-    ensure  => latest,
+    ensure  => $agent_version,
     require => [File['/etc/apt/sources.list.d/datadog.list'],
                 Exec['datadog_apt-get_update']],
   }
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "datadog-datadog_agent",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "author": "James Turnbull (<james@lovedthanlost.net>) and Rob Terhaar (<rob@atlanticdynamic>) for Datadog Inc.",
   "summary": "Install the Datadog monitoring agent and report Puppet runs to Datadog",
   "license": "Apache License, Version 2.0",
diff --git a/spec/classes/datadog_agent_integrations_http_check_spec.rb b/spec/classes/datadog_agent_integrations_http_check_spec.rb
@@ -21,6 +21,7 @@
   it { should contain_file(conf_file).that_notifies("Service[#{dd_service}]") }
 
   context 'with default parameters' do
+    it { should contain_file(conf_file).without_content(%r{name: }) }
     it { should contain_file(conf_file).without_content(%r{url: }) }
     it { should contain_file(conf_file).without_content(%r{username: }) }
     it { should contain_file(conf_file).without_content(%r{password: }) }
@@ -36,6 +37,7 @@
 
   context 'with parameters set' do
     let(:params) {{
+      sitename: 'foo.bar.baz',
       url: 'http://foo.bar.baz:4096',
       username: 'foouser',
       password: 'barpassword',
@@ -47,6 +49,7 @@
       disable_ssl_validation: true,
     }}
 
+    it { should contain_file(conf_file).with_content(%r{name: foo.bar.baz}) }
     it { should contain_file(conf_file).with_content(%r{url: http://foo.bar.baz:4096}) }
     it { should contain_file(conf_file).with_content(%r{username: foouser}) }
     it { should contain_file(conf_file).with_content(%r{password: barpassword}) }
@@ -60,6 +63,7 @@
 
   context 'with headers parameter array' do
     let(:params) {{
+      sitename: 'foo.bar.baz',
       url: 'http://foo.bar.baz:4096',
       headers: %w{ foo bar baz },
     }}
@@ -69,6 +73,7 @@
   context 'with headers parameter empty values' do
     context 'mixed in with other headers' do
       let(:params) {{
+      sitename: 'foo.bar.baz',
         url: 'http://foo.bar.baz:4096',
         headers: [ 'foo', '', 'baz' ]
       }}
@@ -96,6 +101,7 @@
 
   context 'with tags parameter array' do
     let(:params) {{
+      sitename: 'foo.bar.baz',
       url: 'http://foo.bar.baz:4096',
       tags: %w{ foo bar baz },
     }}
@@ -105,6 +111,7 @@
   context 'with tags parameter empty values' do
     context 'mixed in with other tags' do
       let(:params) {{
+        sitename: 'foo.bar.baz',
         url: 'http://foo.bar.baz:4096',
         tags: [ 'foo', '', 'baz' ]
       }}
diff --git a/spec/classes/datadog_agent_spec.rb b/spec/classes/datadog_agent_spec.rb
@@ -122,7 +122,7 @@
                     'content' => /^# bind_host: localhost\n/,
                     )}
                     it { should contain_file('/etc/dd-agent/datadog.conf').with(
-                    'content' => /^use_dogstatsd: no\n/,
+                    'content' => /^use_dogstatsd: yes\n/,
                     )}
                     it { should contain_file('/etc/dd-agent/datadog.conf').with(
                     'content' => /^dogstatsd_port: 8125\n/,
@@ -341,10 +341,10 @@
                 )}
             end
 
-            context 'with use_dogstatsd set to yes' do
-                let(:params) {{:use_dogstatsd => true}}
+            context 'with use_dogstatsd set to no' do
+                let(:params) {{:use_dogstatsd => false}}
                 it { should contain_file('/etc/dd-agent/datadog.conf').with(
-                    'content' => /^use_dogstatsd: yes\n/,
+                    'content' => /^use_dogstatsd: no\n/,
                 )}
             end
             context 'with dogstatsd_port set to 8126' do
diff --git a/templates/agent-conf.d/http_check.yaml.erb b/templates/agent-conf.d/http_check.yaml.erb
@@ -2,7 +2,7 @@ init_config:
 
 instances:
 <%- (Array(@_instances)).each do |instance| -%>
-  - name: <%= instance['name'] %>
+  - name: <%= instance['sitename'] %>
     url: <%= instance['url'] %>
 <% if instance['timeout'] -%>
     timeout: <%= instance['timeout'] %>
diff --git a/templates/datadog.yaml.erb b/templates/datadog.yaml.erb
@@ -3,6 +3,6 @@
 #
 ---
 :datadog_api_key: '<%= @api_key %>'
-<% if @hostname_extraction_regex.nil? -%>
+<% if !@hostname_extraction_regex.nil? -%>
 :hostname_extraction_regex: '<%= @hostname_extraction_regex %>'
 <% end -%>

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`# Sample Usage:`
`12`	`12`	`#`
`13`	`13`	`class datadog_agent::ubuntu(`
`14`		`- $apt_key = 'C7A7DA52'`
	`14`	`+ $apt_key = 'C7A7DA52',`
	`15`	`+ $agent_version = 'latest'`
`15`	`16`	`) {`
`16`	`17`
`17`	`18`	`ensure_packages(['apt-transport-https'])`
`@@ -43,7 +44,7 @@`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`package { 'datadog-agent':`
`46`		`- ensure => latest,`
	`47`	`+ ensure => $agent_version,`
`47`	`48`	`require => [File['/etc/apt/sources.list.d/datadog.list'],`
`48`	`49`	`Exec['datadog_apt-get_update']],`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "datadog-datadog_agent",`
`3`		`- "version": "1.7.0",`
	`3`	`+ "version": "1.7.1",`
`4`	`4`	`"author": "James Turnbull (<james@lovedthanlost.net>) and Rob Terhaar (<rob@atlanticdynamic>) for Datadog Inc.",`
`5`	`5`	`"summary": "Install the Datadog monitoring agent and report Puppet runs to Datadog",`
`6`	`6`	`"license": "Apache License, Version 2.0",`