[kafka] backward compatibility + fix process/apm default behavior (#395)

* [kafka] make it backward compatible

* [metadata] updating metadata

* [apm][process] these are opt-in options dont want to force those on anyone

Author: truthbk

manifests/init.pp

@@ -159,13 +159,13 @@
 #       String. Default: empty
 #   $apm_enabled
 #       Boolean to enable or disable the trace agent
-#       Boolean. Default: true
+#       Boolean. Default: false
 #   $apm_env
 #       String defining the environment for the APM traces
 #       String. Default: empty
 #   $process_enabled
 #       String to enable the process/container agent
-#       Boolean. Default: true
+#       Boolean. Default: false
 #
 # Actions:
 #
@@ -262,7 +262,7 @@
   $apm_enabled = $datadog_agent::params::apm_default_enabled,
   $apm_env = '',
   $process_enabled = $datadog_agent::params::process_default_enabled,
-  Hash[String, Data] $agent6_extra_options = {},
+  Hash[String[1], Data] $agent6_extra_options = {},
   $agent5_repo_uri = $datadog_agent::params::agent5_default_repo,
   $agent6_repo_uri = $datadog_agent::params::agent6_default_repo,
   $apt_release = $datadog_agent::params::apt_default_release,
@@ -493,7 +493,7 @@
   } else {
 
     # lint:ignore:quoted_booleans
-    $process_enabled_str = $process_enabled ? { true => 'true' , default => 'false' }
+    $process_enabled_str = $process_enabled ? { true => 'true' , default => 'disabled' }
     # lint:endignore
     $base_extra_config = {
         'apm_config' => { 'apm_enabled' => $apm_enabled },

manifests/integrations/kafka.pp

@@ -53,11 +53,38 @@
 #  }
 #
 class datadog_agent::integrations::kafka(
-  $servers = [{'host' => 'localhost', 'port' => '9999'}]
+  $host = 'localhost',
+  Variant[String[1], Integer] $port = 9999,
+  Optional[String[1]] $username = undef,
+  Optional[String[1]] $password = undef,
+  Optional[String[1]] $process_name_regex = undef,
+  Optional[String[1]] $tools_jar_path = undef,
+  Optional[String[1]] $java_bin_path = undef,
+  Optional[String[1]] $trust_store_path = undef,
+  Optional[String[1]] $trust_store_password = undef,
+  Optional[Hash[String[1], String[1]]] $tags = undef,
+  Optional[Array[Hash[String[1], Data]]] $instances = undef,
 ) inherits datadog_agent::params {
   include datadog_agent
 
-  validate_array($servers)
+  if !$instances and $host and $port {
+    $servers = [{
+      'host'                      => $host,
+      'port'                      => $port,
+      'username'                  => $username,
+      'password'                  => $password,
+      'process_name_regex'        => $process_name_regex,
+      'tools_jar_path'            => $tools_jar_path,
+      'java_bin_path'             => $java_bin_path,
+      'trust_store_path'          => $trust_store_path,
+      'trust_store_password'      => $trust_store_password,
+      'tags'                      => $tags,
+    }]
+  } elsif !$instances{
+    $servers = []
+  } else {
+    $servers = $instances
+  }
 
   file { "${datadog_agent::params::conf_dir}/kafka.yaml":
     ensure  => file,
@@ -68,4 +95,4 @@
     require => Package[$datadog_agent::params::package_name],
     notify  => Service[$datadog_agent::params::service_name],
   }
-}
+}

manifests/params.pp

@@ -26,8 +26,8 @@
   $dogapi_version          = 'installed'
   $conf_dir_purge          = false
   $apt_default_release     = 'stable'
-  $apm_default_enabled     = true
-  $process_default_enabled = true
+  $apm_default_enabled     = false
+  $process_default_enabled = false
 
   case $::operatingsystem {
     'Ubuntu','Debian' : {

metadata.json

@@ -37,7 +37,7 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "2016.4.x"
+      "version_requirement": ">=2016.4.x"
     },
     {
       "name": "puppet",

spec/classes/datadog_agent_integrations_kafka_spec.rb

@@ -28,7 +28,7 @@
 
   context 'with one kafka broker' do
     let(:params) {{
-      servers: [
+      instances: [
         {
           'host' => 'localhost',
           'port' => '9997',
@@ -42,7 +42,7 @@
 
   context 'with two kafka brokers' do
     let(:params) {{
-      servers: [
+      instances: [
         {
           'host' => 'localhost',
           'port' => '9997',
@@ -63,7 +63,7 @@
 
   context 'one kafka broker all options' do
     let(:params) {{
-      servers: [
+      instances: [
         {
           'host' => 'localhost',
           'port' => '9997',
@@ -82,50 +82,4 @@
 
     it { should contain_file(conf_file).with_content(%r{host: localhost\s+port: 9997\s+tags:\s+- kafka:broker\s+- tag1:value1\s+user: username\s+password: password\s+process_name_regex: regex\s+tools_jar_path: tools.jar\s+name: kafka_instance\s+java_bin_path: /path/to/java\s+trust_store_path: /path/to/trustStore.jks\s+trust_store_password: password}) }
   end
-=begin
-  context 'with multiple mongos' do
-    let(:params) {{
-      servers: [
-        {
-          'host' => '127.0.0.1',
-          'port' => '34567',
-          'tags' => %w{foo bar},
-        },
-        {
-          'host' => '127.0.0.2',
-          'port' => '45678',
-          'tags' => %w{baz bat},
-        }
-      ]
-    }}
-    it { should contain_file(conf_file).with_content(%r{server: mongodb://127.0.0.1:34567/\s+tags:\s+- foo\s+- bar}) }
-    it { should contain_file(conf_file).with_content(%r{server: mongodb://127.0.0.2:45678/\s+tags:\s+- baz\s+- bat}) }
-    it { should contain_file(conf_file).with_content(%r{server:.*127.0.0.1.*server:.*127.0.0.2}m) }
-  end
-
-  context 'without tags' do
-    let(:params) {{
-      servers: [
-        {
-          'host' => '127.0.0.1',
-          'port' => '12345',
-        }
-      ]
-    }}
-
-  end
-
-  context 'weird tags' do
-    let(:params) {{
-      servers: [
-        {
-          'host' => '127.0.0.1',
-          'port' => '56789',
-          'tags' => 'word'
-        }
-      ]
-    }}
-    it { should_not compile }
-  end
-=end
 end

spec/classes/datadog_agent_spec.rb

@@ -210,7 +210,7 @@
 
                 context 'for APM' do
                     it { should contain_concat__fragment('datadog footer').with(
-                    'content' => /^apm_enabled: true\n/,
+                    'content' => /^apm_enabled: false\n/,
                     )}
                 end
 
@@ -840,13 +840,13 @@
               'content' => /^apm_config:\n/,
               )}
               it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
-              'content' => /^\ \ apm_enabled: true\n/,
+              'content' => /^\ \ apm_enabled: false\n/,
               )}
               it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
               'content' => /^process_config:\n/,
               )}
               it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
-              'content' => /^\ \ process_enabled: 'true'\n/,
+              'content' => /^\ \ process_enabled: disabled\n/,
               )}
             end
           end