From e1fd0b2457487963e594c4b5e88506f947be9ed3 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Wed, 20 May 2020 13:05:51 +0200
Subject: [PATCH] [allsites] kwollect - Update clusters network metrics with
 labels

---
 .../sites/grenoble/clusters/dahu/dahu.json    |  46 +++--
 .../sites/grenoble/clusters/troll/troll.json  |  46 +++--
 .../sites/grenoble/clusters/yeti/yeti.json    |  46 +++--
 .../sites/lille/clusters/chetemi/chetemi.json |  76 ++++++--
 .../sites/lille/clusters/chiclet/chiclet.json |  76 ++++++--
 .../lille/clusters/chifflet/chifflet.json     |  76 ++++++--
 .../lille/clusters/chifflot/chifflot.json     |  76 ++++++--
 .../luxembourg/clusters/granduc/granduc.json  |  16 --
 .../clusters/petitprince/petitprince.json     |  76 ++++++--
 .../sites/lyon/clusters/gemini/gemini.json    |  46 +++--
 .../sites/lyon/clusters/hercule/hercule.json  |  46 +++--
 .../sites/lyon/clusters/nova/nova.json        |  46 +++--
 .../sites/lyon/clusters/orion/orion.json      |  46 +++--
 .../sites/lyon/clusters/pyxis/pyxis.json      |  32 ++++
 .../lyon/clusters/sagittaire/sagittaire.json  |  16 --
 .../sites/lyon/clusters/taurus/taurus.json    |  46 +++--
 .../nancy/clusters/graffiti/graffiti.json     |  46 +++--
 .../nancy/clusters/graoully/graoully.json     |  46 +++--
 .../nancy/clusters/graphique/graphique.json   |  46 +++--
 .../nancy/clusters/graphite/graphite.json     |  46 +++--
 .../sites/nancy/clusters/grcinq/grcinq.json   |  46 +++--
 .../sites/nancy/clusters/grele/grele.json     |  46 +++--
 .../sites/nancy/clusters/grimani/grimani.json |  46 +++--
 .../nancy/clusters/grimoire/grimoire.json     | 136 ++++++++++++--
 .../sites/nancy/clusters/grisou/grisou.json   | 166 ++++++++++++++++--
 .../sites/nancy/clusters/gros/gros.json       |  76 ++++++--
 .../sites/nancy/clusters/grue/grue.json       |  46 +++--
 .../sites/nancy/clusters/grvingt/grvingt.json |  46 +++--
 .../nantes/clusters/econome/econome.json      |  46 +++--
 .../nantes/clusters/ecotype/ecotype.json      |  76 ++++++--
 .../rennes/clusters/paranoia/paranoia.json    |  78 +++++++-
 .../rennes/clusters/parapide/parapide.json    |  30 +++-
 .../rennes/clusters/parapluie/parapluie.json  |  46 +++--
 .../rennes/clusters/parasilo/parasilo.json    |  76 ++++++--
 .../rennes/clusters/paravance/paravance.json  |  76 ++++++--
 .../sites/sophia/clusters/suno/suno.json      |  46 +++--
 .../sites/sophia/clusters/uvb/uvb.json        |  46 +++--
 37 files changed, 1570 insertions(+), 554 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index 50a487249ed..6347667c153 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 c26ad056946..1ad44393b54 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 d7d4089ba84..cb97226eb49 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 f68bffab977..df4ba68e961 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 0213635ee33..1e121ce832e 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 49edfa2f709..afaf9459830 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 3fb110b1b4a..c78caf7b0cf 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 e963c99e9ed..3ea344c6627 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 72f9cf5c61a..694313d3fcc 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 150347b61c5..91d04686ec7 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 b90f35cbc83..b5e94437e8a 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 9f97c80afb0..9aed36fe9d6 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 e33a8f1a04f..7e0b05072ee 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 fd206ec7ee5..3a8942b4635 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 3eecfe9d2cc..c8b68315d6a 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 0d7d80f5f51..d3a0e17fe78 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 7073d2391b6..9aac6b0273c 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 97fbce7627a..6b5b8ad3c6d 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 8b38e960bdc..2e4ae61ab4f 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 2e3f1cf4acc..09bece50729 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 b971ac5ceb2..6ecfac4da57 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 aef608ce33a..019346f3ea0 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 dffaa164eea..92b03b47b52 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 4942e95a1b8..1fd6ab00e8b 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 320a768046c..3ab0c966e4e 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 f8da98413b3..80853a81640 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 5bc0c57d549..8d47aa21f36 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 24f21484c75..2754361976b 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 7f3b682d6c6..286488d931b 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 bed43e42ae1..537c11d6759 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 3e500540a1b..670763fd0f9 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 c447249468f..7313bba528b 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 e8f258df368..793e472aad5 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 2b17ed49dac..d1f030ec5f7 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 4fd564e4e10..c9ca740f44d 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 d82c3a8d5cd..51cb2042815 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 f1d3e9a0365..deb1475b399 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",
-- 
GitLab