From 9b84864b4dfd5eba0579646541211bb4694242aa Mon Sep 17 00:00:00 2001
From: Xav Paice <xav@catalyst.net.nz>
Date: Mon, 10 Mar 2014 13:51:45 +1300
Subject: [PATCH 1/4] Add IPv6 support for gmond listener

This commit adds the 'family' parameter for udp and tcp listeners
for the gmond config, for Debian based systems.
---
 templates/gmond.conf.debian.erb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/gmond.conf.debian.erb b/templates/gmond.conf.debian.erb
index c86e1b3..d5fcb60 100644
--- a/templates/gmond.conf.debian.erb
+++ b/templates/gmond.conf.debian.erb
@@ -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 -%>

From d21f12ea0c89a7c8924d791ef625afdb2def49d5 Mon Sep 17 00:00:00 2001
From: Xav Paice <xav@catalyst.net.nz>
Date: Mon, 10 Mar 2014 13:51:45 +1300
Subject: [PATCH 2/4] Add IPv6 support for gmond listener

This commit adds the 'family' parameter for udp and tcp listeners
for the gmond config, for Debian based systems.
---
 manifests/gmond.pp              | 2 ++
 templates/gmond.conf.debian.erb | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/manifests/gmond.pp b/manifests/gmond.pp
index bd3a532..a6c5f84 100644
--- 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
index c86e1b3..d5fcb60 100644
--- a/templates/gmond.conf.debian.erb
+++ b/templates/gmond.conf.debian.erb
@@ -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 -%>

From d88c38317f69ed76ed621af3ded2cbd853b4309b Mon Sep 17 00:00:00 2001
From: Xav Paice <xav@catalyst.net.nz>
Date: Tue, 11 Mar 2014 20:39:01 +1300
Subject: [PATCH 3/4] Add IPv6 capability for RHEL/CentOS

For gmond.conf, add same capability as for Debian systems.
---
 templates/gmond.conf.el5.erb | 6 ++++++
 templates/gmond.conf.el6.erb | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/templates/gmond.conf.el5.erb b/templates/gmond.conf.el5.erb
index 1abee3f..18bb123 100644
--- 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
index 9a6e2cf..f9fc76a 100644
--- 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 -%>

From bd539726406c825bf69463e5192cc5f9b97e9846 Mon Sep 17 00:00:00 2001
From: Xav Paice <xav@catalyst.net.nz>
Date: Wed, 2 Apr 2014 17:27:11 +1300
Subject: [PATCH 4/4] Add send_metadata_interval at 300s to debian

Previously, the send_metadata_interval for gmond was set at 0 for
Debian based systems, and 300 for Red Hat based systems.  This change
synchronizes the setting such that Debian is now 300s as well.
---
 templates/gmond.conf.debian.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/gmond.conf.debian.erb b/templates/gmond.conf.debian.erb
index d5fcb60..d90086e 100644
--- 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