diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index 50a487249ed6e5ffcb25fae7ab985e20e4dc09a9..6347667c153a317a09c816cc2425dd0accf0741d 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -2,22 +2,6 @@
   "created_at": "Thu, 22 Mar 2018 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -232,6 +216,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge C6420",
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index c26ad05694647a5329b1d3241d7d0fd89bdc1ed4..1ad44393b548fb05b96685587d38bc6c046d696a 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -11,22 +11,6 @@
         "protocol": "wattmetre"
       }
     },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -329,6 +313,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R640",
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index d7d4089ba84375500931e710df769f8d8b275334..cb97226eb492fadc202e87cd234a81591f254820 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -11,22 +11,6 @@
         "protocol": "wattmetre"
       }
     },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -280,6 +264,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R940",
diff --git a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
index f68bffab97780d5165e9e73f0b097a1ec96b9702..df4ba68e961dd04612f6bd69a3f298e7f6f688eb 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
@@ -2,22 +2,6 @@
   "created_at": "Thu, 01 Dec 2016 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -321,6 +305,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R630",
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 0213635ee33a79398868b64a8a9f05d00724c5c5..1e121ce832efba1c4900aae8c10d935bfced493b 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -2,22 +2,6 @@
   "created_at": "Mon, 06 Aug 2018 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -217,6 +201,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R7425",
diff --git a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
index 49edfa2f709dfd08ee7ab47544b435d756e10bfd..afaf945983094f05f8641c59b824d7c8d07700a7 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
@@ -2,22 +2,6 @@
   "created_at": "Thu, 01 Dec 2016 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -217,6 +201,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R730",
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index 3fb110b1b4af841786fcd5c5d45b79bd49fb8682..c78caf7b0cfc410a6a32a72576842d0e6ce3e120 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -2,22 +2,6 @@
   "created_at": "Wed, 01 Aug 2018 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -245,6 +229,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.6",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R740",
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json b/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
index e963c99e9ed8e1153748e665638d05f318f46c40..3ea344c66272d1268c5484e0508d80611f7b3a24 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json
@@ -2,22 +2,6 @@
   "created_at": "Thu, 01 Dec 2011 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index 72f9cf5c61a9801294dcf9871b05a6afbfd50261..694313d3fccc6489d28455feda516a309bb0e0fe 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 10 Sep 2013 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -74,6 +58,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge M620",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/gemini.json b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
index 150347b61c58bfacbf417d282fa993599ff06f4f..91d04686ec7ddb2908aa85aa2eb6d85d85f57b7c 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/gemini.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/gemini.json
@@ -11,22 +11,6 @@
         "protocol": "wattmetre"
       }
     },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambient_celsius",
@@ -912,6 +896,36 @@
         "id": 141,
         "protocol": "ipmisensor"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Nvidia DGX-1",
diff --git a/data/grid5000/sites/lyon/clusters/hercule/hercule.json b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
index b90f35cbc83d5064b3c1f4b3417950bc692015d6..b5e94437e8a9bdf3f016862a0179d2760b8250cf 100644
--- a/data/grid5000/sites/lyon/clusters/hercule/hercule.json
+++ b/data/grid5000/sites/lyon/clusters/hercule/hercule.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 02 Oct 2012 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -238,6 +222,36 @@
         "id": 99,
         "protocol": "ipmisensor"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge C6220",
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index 9f97c80afb0d8198fe92837bd510164b295dcc59..9aed36fe9d64506e364455b6bd82744cfbaafd35 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -11,22 +11,6 @@
         "protocol": "wattmetre"
       }
     },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -241,6 +225,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R430",
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index e33a8f1a04fea3dc548a1c6544709b67e4c0eff2..7e0b05072ee4abe5c9a84f96e3027dac4b5dabc3 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -11,22 +11,6 @@
         "protocol": "wattmetre"
       }
     },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -226,6 +210,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R720",
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
index fd206ec7ee5055a17b0beb76475e7fde406bf6ff..3a8942b4635513b7768cf2ef7afd445574e71229 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/pyxis.json
@@ -1,6 +1,38 @@
 {
   "created_at": "Mon, 06 Jan 2020 00:00:00 GMT",
   "kavlan": true,
+  "metrics": [
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    }
+  ],
   "model": "R181-T92-00",
   "queues": [
     "admin",
diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
index 3eecfe9d2cc0e3a625a2ab5365c21e91a0aaf14c..c8b68315d6a66c9c2fd126ffc948d4767e7bab86 100644
--- a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
+++ b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json
@@ -10,22 +10,6 @@
       "source": {
         "protocol": "wattmetre"
       }
-    },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
     }
   ],
   "model": "Sun Fire V20z",
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index 0d7d80f5f5126a728774670e8f5e7d013a265edc..d3a0e17fe78c162d9c601b8bbe055792b29b274f 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -11,22 +11,6 @@
         "protocol": "wattmetre"
       }
     },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -226,6 +210,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R720",
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index 7073d2391b6550b5acb1e943bebd198185b21f81..9aac6b0273cfded44b3ba09510f073260bc4e2be 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -2,22 +2,6 @@
   "created_at": "Fri, 07 Jun 2019 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -232,6 +216,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.2",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge T640",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/graoully.json b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
index 97fbce7627af17b6a25f403f2238dc2d864407a8..6b5b8ad3c6d3430f0ea640e4671ee6f3b2f22e0c 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/graoully.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
@@ -2,22 +2,6 @@
   "created_at": "Mon, 04 Jan 2016 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Power consumption of node reported by PDU, in watt",
       "name": "pdu_outlet_power_watt",
@@ -302,6 +286,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R630",
diff --git a/data/grid5000/sites/nancy/clusters/graphique/graphique.json b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
index 8b38e960bdce6a47b88a881e0b4e010d69b6bab5..2e4ae61ab4f803cba4b41dbf76f7984cfcc0160f 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/graphique.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 12 May 2015 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -217,6 +201,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R720",
diff --git a/data/grid5000/sites/nancy/clusters/graphite/graphite.json b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
index 2e3f1cf4acc51dfabb36b3037ce2411e93dac230..09bece5072942ac7962354bde62544e449f19c99 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/graphite.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
@@ -2,22 +2,6 @@
   "created_at": "Thu, 05 Dec 2013 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -217,6 +201,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R720",
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json b/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
index b971ac5ceb2caf9e3657de60fa47d0e1a96f33d3..6ecfac4da57e8d2a92d7986c8ad431c03847ea1c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/grcinq.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 09 Apr 2013 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -228,6 +212,36 @@
         "id": 30,
         "protocol": "ipmisensor"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge C6220",
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index aef608ce33a88cc50339078d71c462f3a612c73f..019346f3ea02f3e45f451175d329d610e573ff89 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -2,22 +2,6 @@
   "created_at": "Mon, 26 Jun 2017 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -217,6 +201,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R730",
diff --git a/data/grid5000/sites/nancy/clusters/grimani/grimani.json b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
index dffaa164eea994208f3b862af7a314d8eca8ad3f..92b03b47b522edee65a67e43b41feb4cad7e3c04 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/grimani.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 30 Aug 2016 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -217,6 +201,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R730",
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
index 4942e95a1b830c5d857f13666c9f5bf119b5fa55..1fd6ab00e8b3cc27d7a8947c97ab66b0f3cced2e 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
@@ -2,22 +2,6 @@
   "created_at": "Fri, 22 Jan 2016 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Power consumption of node reported by PDU, in watt",
       "name": "pdu_outlet_power_watt",
@@ -302,6 +286,126 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R630",
diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index 320a768046c387caf82d27b1a30789bc465b9717..3ab0c966e4ee458a3265eba7b6cdc65047d47349 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -2,22 +2,6 @@
   "created_at": "Mon, 04 Jan 2016 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Power consumption of node reported by PDU, in watt",
       "name": "pdu_outlet_power_watt",
@@ -302,6 +286,156 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth3"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth4"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth4"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R630",
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index f8da98413b3335ef8faf1ca4cc01928a0a447a77..80853a81640d9398def0290f7b7d479b81e8cd76 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -11,22 +11,6 @@
         "protocol": "wattmetre"
       }
     },
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -237,6 +221,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R640",
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 5bc0c57d549d5c8e2e9494312951b1d60f1e0a1e..8d47aa21f360ec1d065973fb7462bb2196edfeb5 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -2,22 +2,6 @@
   "created_at": "Mon, 25 Nov 2019 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -273,6 +257,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.8",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R7425",
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index 24f21484c75de7b9f9bb0b989c11b0257205eed0..2754361976bf67d9b6b605511fa97aff89db158d 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -2,22 +2,6 @@
   "created_at": "Wed, 11 Apr 2018 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -232,6 +216,36 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.3",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge C6420",
diff --git a/data/grid5000/sites/nantes/clusters/econome/econome.json b/data/grid5000/sites/nantes/clusters/econome/econome.json
index 7f3b682d6c6417b745dbd964100f3034474fa224..286488d931b54376d4c0df03dddea3be504917f4 100644
--- a/data/grid5000/sites/nantes/clusters/econome/econome.json
+++ b/data/grid5000/sites/nantes/clusters/econome/econome.json
@@ -2,22 +2,6 @@
   "created_at": "Wed, 16 Apr 2014 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -228,6 +212,36 @@
         "id": 29,
         "protocol": "ipmisensor"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge C6220",
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index bed43e42ae1b0bc7e59793a1689411ce6ef7b816..537c11d6759199809acfd817ff150d24bc1576e1 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -2,22 +2,6 @@
   "created_at": "Mon, 16 Oct 2017 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -321,6 +305,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R630",
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json b/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
index 3e500540a1ba39faf7a8e9982bf019b6016b0006..670763fd0f99fea35957301cd4607b8b70843e7b 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/paranoia.json
@@ -3,17 +3,91 @@
   "kavlan": true,
   "metrics": [
     {
-      "description": "Input byte counter for the network device port connected to the node",
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
       "name": "network_ifacein_bytes_total",
       "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
       "source": {
         "protocol": "network_equipment"
       }
     },
     {
-      "description": "Output byte counter for the network device port connected to the node",
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth2"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
       "source": {
         "protocol": "network_equipment"
       }
diff --git a/data/grid5000/sites/rennes/clusters/parapide/parapide.json b/data/grid5000/sites/rennes/clusters/parapide/parapide.json
index c447249468fb0a297dcf204e6b9b42e18fab440b..7313bba528b5a6a96c4b18514613a2a3ca22d2d1 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/parapide.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/parapide.json
@@ -3,27 +3,41 @@
   "kavlan": true,
   "metrics": [
     {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
+      "description": "Power consumption of node reported by PDU, in watt",
+      "name": "pdu_outlet_power_watt",
       "period": 1000,
       "source": {
-        "protocol": "network_equipment"
+        "protocol": "pdu"
       }
     },
     {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
       "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
       "source": {
         "protocol": "network_equipment"
       }
     },
     {
-      "description": "Power consumption of node reported by PDU, in watt",
-      "name": "pdu_outlet_power_watt",
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "protocol": "pdu"
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
       }
     }
   ],
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
index e8f258df368a0088525e0974af08af7e20ada41c..793e472aad53b5b217ec0317b2aac4c2a33e3084 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/parapluie.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 02 Nov 2010 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Voltage of PVCORE1 reported by BMC, in volt",
       "labels": {
@@ -813,6 +797,36 @@
         "id": 7232,
         "protocol": "ipmisensor"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "HP ProLiant DL165 G7",
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index 2b17ed49dac1762db5f7d50e74e8da98ba0795f3..d1f030ec5f7a50f92809de4f1527d8b636b2c4e3 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 13 Jan 2015 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Power consumption of node reported by PDU, in watt",
       "name": "pdu_outlet_power_watt",
@@ -302,6 +286,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R630",
diff --git a/data/grid5000/sites/rennes/clusters/paravance/paravance.json b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
index 4fd564e4e10dd53378e82000b88b98d4d3645d88..c9ca740f44d872d2e447504d1729d2eb8f854338 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/paravance.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 13 Jan 2015 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Power consumption of node reported by PDU, in watt",
       "name": "pdu_outlet_power_watt",
@@ -302,6 +286,66 @@
         "id": "1.3.6.1.4.1.674.10892.5.4.700.20.1.6.1.4",
         "protocol": "snmp"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth1"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R630",
diff --git a/data/grid5000/sites/sophia/clusters/suno/suno.json b/data/grid5000/sites/sophia/clusters/suno/suno.json
index d82c3a8d5cd71e289337bba210ef5ed43b07a3d0..51cb20428154d06c8a4c86609c55988e52b97a4a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/suno.json
+++ b/data/grid5000/sites/sophia/clusters/suno/suno.json
@@ -2,22 +2,6 @@
   "created_at": "Wed, 27 Jan 2010 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Front node ambiant temperature reported by BMC, in celsius",
       "name": "bmc_temp_ambiant_celsius",
@@ -130,6 +114,36 @@
         "id": 40,
         "protocol": "ipmisensor"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge R410",
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index f1d3e9a0365d572938a358cd447e07028cfcf607..deb1475b399d21d1663cbc68d3131b1c2dac8edd 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -2,22 +2,6 @@
   "created_at": "Tue, 04 Jan 2011 00:00:00 GMT",
   "kavlan": true,
   "metrics": [
-    {
-      "description": "Input byte counter for the network device port connected to the node",
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port connected to the node",
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
     {
       "description": "Voltage of PS 12V reported by BMC, in volt",
       "labels": {
@@ -157,6 +141,36 @@
         "id": 27,
         "protocol": "ipmisensor"
       }
+    },
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 1000,
+      "source": {
+        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "protocol": "snmp"
+      },
+      "source": {
+        "protocol": "network_equipment"
+      }
     }
   ],
   "model": "Dell PowerEdge C6100",