Merge pull request #256 from sethcleveland/support_cassandra_integration_tags

Support cassandra integration tags

Author: truthbk

manifests/integrations/cassandra.pp

@@ -19,6 +19,9 @@
 #
 #  class { 'datadog_agent::integrations::cassandra' :
 #    host     => 'localhost',
+#    tags     => {
+#      environment => "production",
+#    },
 #  }
 #
 #
@@ -27,10 +30,10 @@
   $port = 7199,
   $user = undef,
   $password = undef,
-  $tags = [],
+  $tags = {},
 ) inherits datadog_agent::params {
   require ::datadog_agent
-  validate_array($tags)
+  validate_hash($tags)
 
   file { "${datadog_agent::params::conf_dir}/cassandra.yaml":
     ensure  => file,

spec/classes/datadog_agent_integrations_cassandra_spec.rb

@@ -46,15 +46,18 @@
       it { should contain_file(conf_file).with_content(%r{user: baz}) }
     end
 
-    context 'with tags parameter array' do
+    context 'with tags parameter hash' do
       let(:params) {{
         password: 'foobar',
-        tags: %w{ foo bar baz },
+        tags: {
+                'foo'=> 'bar',
+                'baz'=> 'ama',
+        }
       }}
-      it { should contain_file(conf_file).with_content(/tags:[^-]+- foo\s+- bar\s+- baz\s*?[^-]/m) }
+      it { should contain_file(conf_file).with_content(/tags:\s+foo: bar\s+baz: ama\s*?[^-]/m) }
     end
 
-    context 'tags not array' do
+    context 'tags not hash' do
       let(:params) {{
         password: 'foobar',
         tags: 'aoeu',

templates/agent-conf.d/cassandra.yaml.erb

@@ -12,8 +12,8 @@ instances:
 <% end -%>
 <% if @tags.length > 0 -%>
     tags:
-<% @tags.each do |tag| -%>
-      - <%= tag %>
+<%- @tags.each do |tag_name, tag_value| -%>
+      <%= tag_name %>: <%= tag_value %>
 <% end -%>
 <% end -%>