diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 8b22a5a6642a7646b806e11922361f336123f604..0a6c038570f5e8c15571c73d72302647a15b0d22 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -538,7 +538,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -547,7 +547,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index 31b3602510b2e109bb4987655af828a7251f96f0..a19820e0487e3f9141016fdbbe3c1b974fa0e7b6 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -275,7 +275,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -284,7 +284,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index 22700dd54b5f2f481d2132fb68a8b3a7dcf258ce..2e54c4219baece3631e8a66afaafbb2e74992851 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -179,7 +179,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -188,7 +188,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
index a706fb4c3229f8fa991a25b159a1eff5c094693f..d253e94d25b9b713440df44fea81a8f91865f6b0 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -323,7 +323,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -332,7 +332,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw.json b/data/grid5000/sites/luxembourg/network_equipments/gw.json
index cda22e3e356761af47becd13aead759efae0b2fa..4307cd4d54ad5a151fae9a3efa0cc47c800ca6a2 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw.json
@@ -293,7 +293,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -302,7 +302,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
index b9ec92396650935c6d067e00940924c2338c8f83..beb42389669c6c4c5d6b0ecec9c03b5700cbda8d 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
@@ -163,7 +163,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -172,7 +172,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
index 14997fa7483c3c72beb638de863ea0fbedbdac0e..3e22457f5b21909532d949bd87650eeb88a9fbb7 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
@@ -163,7 +163,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -172,7 +172,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
index f1fb3a93c040428ee298c37b3004edda2e44da4d..a007705cad34df3e57cf45045bc0e0f66d0c5296 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -164,7 +164,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 20000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -173,7 +173,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 20000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index b8b5ff56aeb843dd418ca9dd4a26973a329c8eda..c830661e37ed7caec20bdd9fef56f9c77213e022 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -317,7 +317,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -326,7 +326,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lyon/network_equipments/gw.json b/data/grid5000/sites/lyon/network_equipments/gw.json
index 78cbbf272dc86871cdc3a5f348671de091c55933..086c22fa6384888cab45b7603cd7753afafc2bdf 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -183,7 +183,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -192,7 +192,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index 9c47b08aff85fb4634742f94a26fbbfb2490d722..3aedd448e471435a7e3722f24ba84659d8fec5ac 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -134,7 +134,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -143,7 +143,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index 44f38a5398f325fe46b1341f0d662851c921812c..0637a779ad56add54c4616b7144d1e9d481c0718 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -2039,7 +2039,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -2048,7 +2048,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 74bb6d15390226cb61ffdbe1669613bf14ff87bb..6aa7eb841941e62e7acc829d6cbc56c05e779cd0 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -162,7 +162,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -171,7 +171,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
index a6046ea106eff9d56d036cb117cca5756d2a465d..46602ab51e0ed95ff85a3338aa2111997e46dc08 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
@@ -295,7 +295,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -304,7 +304,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
index d1fb7ef98126f35e4d6d338f4647d98ce9d01882..e8614c0a6fe7a4cec61bfd42b20c8c01a7ec7c13 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
@@ -419,7 +419,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -428,7 +428,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
index a15f69c5ed5df0706cc2869d8512c1f3dde2dd85..6e60d9e97816a8618951e6899077f96c2c334adf 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -1155,7 +1155,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -1164,7 +1164,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index e42055bd9904202cc61369e246dc9590e2597a31..530b9c3e978ec8744fcc9e9036ef229a60048bee 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -1155,7 +1155,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 3000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -1164,7 +1164,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 3000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgruss.json b/data/grid5000/sites/nancy/network_equipments/sgruss.json
index 438f2a2992c75f02e724bdf363a4c6709906b45c..4fc17d704f574f513dd6c2657b9ac2e33eaedd3e 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgruss.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgruss.json
@@ -110,7 +110,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -119,7 +119,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index d95b474d0c641627c8abf4a5b3732860af4b0a04..18ed02bafe629fc9267b4cb81a7334eabdf99e31 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -588,7 +588,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -597,7 +597,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
index 1a10e447b649ce734dcff9c170178aa494d886b4..37014f107c330a95d82194a0dd3721f2b3bb09ed 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
@@ -330,7 +330,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -339,7 +339,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
index af4125013a3949ee94b376af405687361debf2ed..20ee71dc49fe06e00378fc23582c08a92feaa3ae 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
@@ -332,7 +332,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -341,7 +341,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nantes/network_equipments/gw.json b/data/grid5000/sites/nantes/network_equipments/gw.json
index aaf3a045e0cef39a1ba7aa1fdef663b7e12d6453..63dd8d9e2ae1725daaf012c2ab819494ea93eb36 100644
--- a/data/grid5000/sites/nantes/network_equipments/gw.json
+++ b/data/grid5000/sites/nantes/network_equipments/gw.json
@@ -292,7 +292,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -301,7 +301,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
index 38ff974ba1f96f0aa9697c97329bed12371bb827..249b539841403f8b5e1125d08a54c3a71898d40c 100644
--- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
@@ -189,7 +189,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -198,7 +198,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
index a651c14aafe529afe9d8e277e405b9c5c7cba8c8..124e93ff883fae627b5b811dd2690018f3b0f2fa 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -195,7 +195,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -204,7 +204,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 10000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/rennes/network_equipments/gw.json b/data/grid5000/sites/rennes/network_equipments/gw.json
index 5e11089e2a13c404abbbaa4daf9a7a74075c74f8..fe592f78c437e4d47c1089f51266f492353355ab 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -445,7 +445,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -454,7 +454,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
index 7389d959ef5d027d22b35a0fe735b5fd5942a5f2..7642620f7a76a0ea643a7478318566cd8310b10c 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
@@ -484,7 +484,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -493,7 +493,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
index 970ccbbfed4d23bf3d7cf6f700bd8b3294be037d..b14bc91d4ef020d29ba46f0cc2b436d9dd17d1ab 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
@@ -488,7 +488,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -497,7 +497,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 15000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index fdad402adc1c71ee116c4ff2febca258d1188cdf..d34a1096c6ed3a699305f6395fd3ccac5b771b59 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -357,7 +357,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -366,7 +366,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+        "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index c0ee77b4647b06d975bfded1ad5e85f9d0e73e9e..6edb1a3bd9ae70ff08a2a3c13541e9abc5b7a895 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -16,13 +16,13 @@ gw:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index a6cdfccaf64ea67e02c8358ee4b86865a00a3fd1..9376afafb54742bccce3f215596b26a14bc02c04 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -14,13 +14,13 @@ sw-chiclet-1:
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 10000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 144e8231fdce3ee658beb889a32b8fb398a14572..05e3a7b00479b95c166379351dd8587e94039326 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -20,13 +20,13 @@ sw-chiclet-2:
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 10000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index 28466b26ac3e5c3f63347dbce4a6561a757a459e..f8542acb462246e1c84aaadc4b320f18d24e83b2 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -14,13 +14,13 @@ sw-chiclet-3:
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 10000
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index a4db24e030c58c4dd510db139bfc54810db91e8c..039a54427e8aada207302fff510450327528cd4c 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -16,13 +16,13 @@ gw:
       period: 5000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 5000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 5000
diff --git a/input/grid5000/sites/luxembourg/networks/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
index d7d89435ac3bf5ea525a6451346a27f39c0024e6..3d8bb2b57da1c6360b068bc891ca32785ddf66e0 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl1.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
@@ -15,13 +15,13 @@ mxl1:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/luxembourg/networks/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
index 7f2593abc3268d0db5752f65d546a3df9232c6a4..0cd9e70987e391fc3503e59b6afa4ed634179b28 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl2.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
@@ -15,13 +15,13 @@ mxl2:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
index 627ee0c12e5c43ac3d19f1e992f77a775f36f43d..7c051e7aea0204ad5311ff893372583fe9090ca3 100644
--- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
+++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
@@ -13,13 +13,13 @@ ul-grid5000-sw02:
       period: 20000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 20000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 20000
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index ad5c6b501c03810a49e212b6094443eb38d4d2e4..cd26f8ff33e02b835731c018ee18273220d9a558 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -18,13 +18,13 @@ force10:
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 10000
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index 6d306c05b45524d23cce90ac1117202da62f6f77..e17b7d1467eb04ce8fdfb50bb8b6613e86771f9a 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -18,13 +18,13 @@ gw:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index 6a61bee35fe0772825cb86b44224bbcce25e686b..0440ed12487487108bbcaf8be4d551ccc37d20a4 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -15,13 +15,13 @@ salome:
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 1000
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 0055e18cd5de0fb711b320acd2f95f29289799c1..664f5488540b210707562b89de6ea080e307da6c 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -25,13 +25,13 @@ gw:
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 10000
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index 82f1ba462e2a7ec9675e3443f0dd9a06e466d54f..249d4b7a7a587bfd1e055acfb68b86c775b52260 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -11,13 +11,13 @@ sgrappe:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/nancy/networks/sgrcinq.yaml b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
index a935e74eb770a927ae997e05e04161119cf59eae..1ae8e9f66914f4a2f9efac5cd7f8250caa860c22 100644
--- a/input/grid5000/sites/nancy/networks/sgrcinq.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
@@ -11,13 +11,13 @@ sgrcinq:
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 1000
diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
index 6e2f90e2b556087211921e5c688636a5b4dfe3ea..a8a5ab682fa3fc410a34169239ac0eed442e8b13 100644
--- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
@@ -14,13 +14,13 @@ sgrisou1:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index 8249d4a3cebd343dfa6767e398603640fbb40df4..48e3ceaac830bed7c232f83c389a83aca6add39b 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -13,13 +13,13 @@ sgros1:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 9225125e4fef5008378d22fa486c46ddda292a8f..badb5a612f50129035a141acb7648f94aa6d1420 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -11,13 +11,13 @@ sgros2:
       period: 3000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 3000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 3000
diff --git a/input/grid5000/sites/nancy/networks/sgruss.yaml b/input/grid5000/sites/nancy/networks/sgruss.yaml
index 41056a2332f4079bd710be728411fe8920d46dd0..5d0a950a37d544ea0c484225f1a5403d0a75cf4b 100644
--- a/input/grid5000/sites/nancy/networks/sgruss.yaml
+++ b/input/grid5000/sites/nancy/networks/sgruss.yaml
@@ -11,13 +11,13 @@ sgruss:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index c8dea1c30329884878f90b93eb0e682d3fad714e..b1d435f62f634786590af7eded92b40f16c871be 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -11,13 +11,13 @@ sgrvingt:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
index bf19a517febae6d93fba43e224ae906d4c25006c..bc8119ef3ea7497e769a47b393c036906ad62f86 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
@@ -13,13 +13,13 @@ ecotype-prod1:
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 1000
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
index 0ed24af76f8ef79aeb873967aa5a30ba80c70e46..3be515e7e35ef5ed77d56f93cae94fb7e9d79568 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
@@ -13,13 +13,13 @@ ecotype-prod2:
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 1000
diff --git a/input/grid5000/sites/nantes/networks/gw-nantes.yaml b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
index 8c4647b0419516d1152f4297fbbe3dc29478f388..1dc534af898b108d299c04ab7a53159c9ea2876c 100644
--- a/input/grid5000/sites/nantes/networks/gw-nantes.yaml
+++ b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
@@ -15,13 +15,13 @@ gw:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
index eef5344271c5c18e166ec82f4e6957788d1c6c4f..48a982f28741ea19d7249a91b7b937e305e130ed 100644
--- a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
@@ -13,13 +13,13 @@ bigdata-sw:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index 3c126173f3f2a9cc3f2a4818da2abc44e49ee072..8746721980ee26aa88b6c8f327039d21d277f860 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -13,13 +13,13 @@ c6509:
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 10000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 10000
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index 10c95e444277cdcb8c81064cb47190af48708f55..0c3cec16d299890b86fdfea00f1f23bccdb175b8 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -18,13 +18,13 @@ gw:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
index 0095fc46b5e26aea9ccf6d75979591e74eb8e467..b37e995c6d832400caa264a3c42fa8911d32bcae 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
@@ -13,13 +13,13 @@ paravance-sw-1:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
index 94b530a8f8e57343dd0994530082e3b486c4b618..fe10431ddf6e9f38dc0f9ffb0b3ed53168123ee8 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
@@ -13,13 +13,13 @@ paravance-sw-2:
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 15000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 15000
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 3a1b3551233db41286bdb142ac89dfd5022efa87..a4f83d191906bb6848cf42337034d5697e85a112 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -11,13 +11,13 @@ gw:
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifaceout_bytes_total
       description: Output byte counter for the network device port
       period: 1000
       source:
         protocol: snmp
-        id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+        id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
     - name: network_ifacein_packets_total
       description: Input packet counter for the network device port
       period: 1000