Merge pull request jhoblitt#13 from xavpaice/master

Add IPv6 support for Debian based gmond
seattle-biomed · Apr 2, 2014 · 57fde5b · 57fde5b
2 parents 37252ad + bd53972
commit 57fde5b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/manifests/gmond.pp b/manifests/gmond.pp
@@ -39,6 +39,7 @@
 #   -mcast_join
 #   -port
 #   -bind
+#   -family
 #
 #   defaults to:
 #   [ { mcast_join => '239.2.11.71', port => 8649, ttl => 1 } ]
@@ -47,6 +48,7 @@
 #   array of hashes.  Valid keys are:
 #
 #   -port
+#   -family
 #
 #   defaults to:
 #   [ { port => 8659 } ]

diff --git a/templates/gmond.conf.debian.erb b/templates/gmond.conf.debian.erb
@@ -11,7 +11,7 @@ globals {
   host_dmax = 0 /*secs */ 
   cleanup_threshold = 300 /*secs */ 
   gexec = no             
-  send_metadata_interval = 0     
+  send_metadata_interval = 300 /*secs */
 } 
 
 /* If a cluster attribute is specified, then all gmond hosts are wrapped inside 
@@ -63,6 +63,9 @@ udp_recv_channel {
   <%- if channel['bind'] then -%>
   bind       = <%= channel['bind'] %> 
   <%- end -%>
+  <%- if channel['family'] then -%>
+  family     = <%= channel['family'] %> 
+  <%- end -%>
 } 
 
 <% end -%>
@@ -75,6 +78,9 @@ tcp_accept_channel {
   <%- if channel['port'] then -%>
   port       = <%= channel['port'] %>
   <%- end -%>
+  <%- if channel['family'] then -%>
+  family     = <%= channel['family'] %> 
+  <%- end -%>
 } 
 
 <% end -%>

diff --git a/templates/gmond.conf.el5.erb b/templates/gmond.conf.el5.erb
@@ -62,6 +62,9 @@ udp_recv_channel {
   <%- if channel['bind'] then -%>
   bind       = <%= channel['bind'] %> 
   <%- end -%>
+  <%- if channel['family'] then -%>
+  family     = <%= channel['family'] %> 
+  <%- end -%>
 } 
 
 <% end -%>
@@ -74,6 +77,9 @@ tcp_accept_channel {
   <%- if channel['port'] then -%>
   port       = <%= channel['port'] %>
   <%- end -%>
+  <%- if channel['family'] then -%>
+  family     = <%= channel['family'] %> 
+  <%- end -%>
 } 
 
 <% end -%>

diff --git a/templates/gmond.conf.el6.erb b/templates/gmond.conf.el6.erb
@@ -65,6 +65,9 @@ udp_recv_channel {
   <%- if channel['bind'] then -%>
   bind       = <%= channel['bind'] %>
   <%- end -%>
+  <%- if channel['family'] then -%>
+  family     = <%= channel['family'] %> 
+  <%- end -%>
 }
 
 <% end -%>
@@ -77,6 +80,9 @@ tcp_accept_channel {
   <%- if channel['port'] then -%>
   port       = <%= channel['port'] %>
   <%- end -%>
+  <%- if channel['family'] then -%>
+  family     = <%= channel['family'] %> 
+  <%- end -%>
 }
 
 <% end -%>