bandwidth graphs for v6

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 9198330643a4190613f68c405a7ceaa16a8db4d7..dbb3430a5d56feed0c99a44f7b33e381b81e0807 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -26,6 +26,7 @@ class debian-org {
         "cron": ensure => installed;
         "csh": ensure => installed;
         "dnsutils": ensure => installed;
+        "dsa-munin-checks": ensure => installed;
         "ed": ensure => installed;
         "gnupg": ensure => installed;
         "klogd": ensure => purged;

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index a16e2c750220af57c23f120cadc023c4be09a7a0..8ce448ec5abcf27bd1cac5bc6069dbffca2ed4e4 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -62,6 +62,16 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
+    case $v6ips {
+        'no': {}
+        default: {
+            $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
+            activate_munin_check {
+                $munin6_ips: script => "ip6_";
+            }
+        }
+    }
+
     exec {
         "ferm restart":
             command     => "/etc/init.d/ferm restart",

diff --git a/modules/ferm/templates/interfaces.conf.erb b/modules/ferm/templates/interfaces.conf.erb
index 82bdb0925a4e6819810409c8043abf1f4435c239..18c5e9c0d6c7a8d74c86aac2c6100ef0e67c2465 100644 (file)
--- a/modules/ferm/templates/interfaces.conf.erb
+++ b/modules/ferm/templates/interfaces.conf.erb
@@ -1,4 +1,5 @@
 def $MUNIN_IPS = (<%= v4ips.split(',').join(' ') %>);
+def $MUNIN6_IPS = (<%= v6ips.split(',').join(' ') %>);
 
 domain ip {
         chain INPUT {
@@ -11,3 +12,15 @@ domain ip {
                saddr ($MUNIN_IPS) NOP;
         }
 }
+
+domain ip6 {
+        chain INPUT {
+               daddr ($MUNIN6_IPS) NOP;
+        }
+}
+
+domain ip6 {
+        chain OUTPUT {
+               saddr ($MUNIN6_IPS) NOP;
+        }
+}