Merge branch 'master' into tristan/log-agent

Author: olivielpeau

.kitchen.docker.yml

@@ -20,5 +20,5 @@ suites:
     - recipe[datadog::dd-agent]
   attributes:
     datadog:
-      api_key: somethingnotnil
+      api_key: somenonnullapikeythats32charlong
       application_key: alsonotnil

.kitchen.yml

@@ -62,15 +62,15 @@ suites:
     - recipe[datadog::dd-agent]
   attributes:
     datadog: &DATADOG
-      api_key: somethingnotnil
+      api_key: somenonnullapikeythats32charlong
       application_key: alsonotnil
 
 - name: dd-handler
   run_list:
     - recipe[datadog::dd-handler]
   attributes:
     datadog: &DATADOG
-      api_key: somethingnotnil
+      api_key: somenonnullapikeythats32charlong
       application_key: alsonotnil
 
 - name: datadog_apache

test/integration/dd-agent/serverspec/dd-agent_spec.rb

@@ -8,7 +8,7 @@
   it { should be_running }
 end
 
-describe command('/etc/init.d/datadog-agent info'), :if => os[:family] != 'windows' do
+describe command('/etc/init.d/datadog-agent info | grep -v "API Key is invalid"'), :if => os[:family] != 'windows' do
   its(:exit_status) { should eq 0 }
   its(:stdout) { should contain 'OK' }
   its(:stdout) { should_not contain 'ERROR' }