update cass/zk templates to accept arbitrary keys

also shortened one line by a few characters.

Author: miketheman

CHANGELOG.md

@@ -12,6 +12,7 @@ Changes
 * [FEATURE] Allow attribute control over whether Agent should be running, [#94][] [@jedi4ever][], [@miketheman][]
 * [FEATURE] Reintroduce attribute config for dogstatsd daemon, [#90][] [@jedi4ever][], [@miketheman][]
 * [FEATURE] Allow jmx template to accept arbitrary `key, value` statements, [#93][] [@clofresh][]
+* [FEATURE] Allow cassandra/zookeeper templates to accept arbitrary `key, value` statements, @miketheman
 * [FEATURE] Add name param to varnish recipe, [#86][] [@clofresh][]
 * [FEATURE] Allow attribute-driven settings for web proxy, [#82][]  [@antonio-osorio][]
 * [FEATURE] Allow override of Agent config for hostname via attribute, [#76][] [@ryandjurovich][]

recipes/network.rb

@@ -9,7 +9,7 @@
 #   },
 # ]
 
-Chef::Log.warn 'Datadog network check only supports a single `instance`, please check attribute assignments' if node['datadog']['network']['instances'].count > 1
+Chef::Log.warn 'Datadog network check only supports one `instance`, please check attribute assignments' if node['datadog']['network']['instances'].count > 1
 
 datadog_monitor "network" do
   instances node["datadog"]["network"]["instances"]

templates/default/cassandra.yaml.erb

@@ -1,3 +1,4 @@
+<% excluded_keys = ["host", "port", "user", "password", "name"] -%>
 instances:
     <% @instances.each do |i| -%>
     - host: <%= i['server'] %>
@@ -11,6 +12,9 @@ instances:
       <% if i['instance'] -%>
       name: <%= i['instance'] %>
       <% end -%>
+      <% (i.keys - excluded_keys).each do |key| -%>
+      <%= key %>: <%= i[key] %>
+      <% end -%>
     <% end -%>
 
 # List of metrics to be collected by the integration
@@ -49,7 +53,7 @@ init_config:
             - PendingTasks
         exclude:
           keyspace: system
-          attribute: 
+          attribute:
             - MinimumCompactionThreshold
             - MaximumCompactionThreshold
             - RowCacheKeysToSave

templates/default/zk.yaml.erb

@@ -1,3 +1,4 @@
+<% excluded_keys = ["host", "port", "timeout", "tags"] -%>
 instances:
   <% @instances.each do |instance| -%>
   - host: <%= instance["host"] %>
@@ -9,6 +10,9 @@ instances:
       - <%= tag %>
       <% end -%>
     <% end -%>
+    <% (instance.keys - excluded_keys).each do |key| -%>
+    <%= key %>: <%= instance[key] %>
+    <% end -%>
   <% end %>
 
 init_config: