Use underlying interfaces for uplink monitoring

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 2ee472f0d534677b98a1326a3e771e67a689b35f..7c14764ace285d4091f7c69ee40de1e52998f4b5 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -51,7 +51,7 @@ default_attributes(
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
-        :labels => { :site => "dublin", :name => "ae50|ae60" }
+        :labels => { :site => "dublin", :name => "xe[01]/2/[01]|ge-[01]/2/2" }
       }
     }
   }

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 91edefceb4f2cd90f9e35f463d450f8b242084dd..6cf1f9e79b90e34a795f72897ea478542f3e0694 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -60,7 +60,7 @@ default_attributes(
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0|ae60" }
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/[02]" }
       }
     }
   },