From 2965d8e1943562dd202e3450cd11a2a80ddf2431 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Thu, 6 Apr 2023 15:04:36 +0200
Subject: [PATCH] [all_sites] network equipment metrics: Use 64bits counter
 when available

---
 data/grid5000/sites/grenoble/network_equipments/gw.json       | 4 ++--
 .../grid5000/sites/lille/network_equipments/sw-chiclet-1.json | 4 ++--
 .../grid5000/sites/lille/network_equipments/sw-chiclet-2.json | 4 ++--
 .../grid5000/sites/lille/network_equipments/sw-chiclet-3.json | 4 ++--
 data/grid5000/sites/luxembourg/network_equipments/gw.json     | 4 ++--
 data/grid5000/sites/luxembourg/network_equipments/mxl1.json   | 4 ++--
 data/grid5000/sites/luxembourg/network_equipments/mxl2.json   | 4 ++--
 .../sites/luxembourg/network_equipments/ul-grid5000-sw02.json | 4 ++--
 data/grid5000/sites/lyon/network_equipments/force10.json      | 4 ++--
 data/grid5000/sites/lyon/network_equipments/gw.json           | 4 ++--
 data/grid5000/sites/lyon/network_equipments/salome.json       | 4 ++--
 data/grid5000/sites/nancy/network_equipments/gw.json          | 4 ++--
 data/grid5000/sites/nancy/network_equipments/sgrappe.json     | 4 ++--
 data/grid5000/sites/nancy/network_equipments/sgrcinq.json     | 4 ++--
 data/grid5000/sites/nancy/network_equipments/sgrisou1.json    | 4 ++--
 data/grid5000/sites/nancy/network_equipments/sgros1.json      | 4 ++--
 data/grid5000/sites/nancy/network_equipments/sgros2.json      | 4 ++--
 data/grid5000/sites/nancy/network_equipments/sgruss.json      | 4 ++--
 data/grid5000/sites/nancy/network_equipments/sgrvingt.json    | 4 ++--
 .../sites/nantes/network_equipments/ecotype-prod1.json        | 4 ++--
 .../sites/nantes/network_equipments/ecotype-prod2.json        | 4 ++--
 data/grid5000/sites/nantes/network_equipments/gw.json         | 4 ++--
 data/grid5000/sites/rennes/network_equipments/bigdata-sw.json | 4 ++--
 data/grid5000/sites/rennes/network_equipments/c6509.json      | 4 ++--
 data/grid5000/sites/rennes/network_equipments/gw.json         | 4 ++--
 .../sites/rennes/network_equipments/paravance-sw-1.json       | 4 ++--
 .../sites/rennes/network_equipments/paravance-sw-2.json       | 4 ++--
 data/grid5000/sites/sophia/network_equipments/gw.json         | 4 ++--
 input/grid5000/sites/grenoble/networks/gw-grenoble.yaml       | 4 ++--
 input/grid5000/sites/lille/networks/sw-chiclet-1.yaml         | 4 ++--
 input/grid5000/sites/lille/networks/sw-chiclet-2.yaml         | 4 ++--
 input/grid5000/sites/lille/networks/sw-chiclet-3.yaml         | 4 ++--
 input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml   | 4 ++--
 input/grid5000/sites/luxembourg/networks/mxl1.yaml            | 4 ++--
 input/grid5000/sites/luxembourg/networks/mxl2.yaml            | 4 ++--
 .../grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml  | 4 ++--
 input/grid5000/sites/lyon/networks/force10.yaml               | 4 ++--
 input/grid5000/sites/lyon/networks/gw-lyon.yaml               | 4 ++--
 input/grid5000/sites/lyon/networks/salome.yaml                | 4 ++--
 input/grid5000/sites/nancy/networks/gw-nancy.yaml             | 4 ++--
 input/grid5000/sites/nancy/networks/sgrappe.yaml              | 4 ++--
 input/grid5000/sites/nancy/networks/sgrcinq.yaml              | 4 ++--
 input/grid5000/sites/nancy/networks/sgrisou1.yaml             | 4 ++--
 input/grid5000/sites/nancy/networks/sgros1.yaml               | 4 ++--
 input/grid5000/sites/nancy/networks/sgros2.yaml               | 4 ++--
 input/grid5000/sites/nancy/networks/sgruss.yaml               | 4 ++--
 input/grid5000/sites/nancy/networks/sgrvingt.yaml             | 4 ++--
 input/grid5000/sites/nantes/networks/ecotype-prod1.yaml       | 4 ++--
 input/grid5000/sites/nantes/networks/ecotype-prod2.yaml       | 4 ++--
 input/grid5000/sites/nantes/networks/gw-nantes.yaml           | 4 ++--
 input/grid5000/sites/rennes/networks/bigdata-sw.yaml          | 4 ++--
 input/grid5000/sites/rennes/networks/c6509.yaml               | 4 ++--
 input/grid5000/sites/rennes/networks/gw-rennes.yaml           | 4 ++--
 input/grid5000/sites/rennes/networks/paravance-sw-1.yaml      | 4 ++--
 input/grid5000/sites/rennes/networks/paravance-sw-2.yaml      | 4 ++--
 input/grid5000/sites/sophia/networks/gw-sophia.yaml           | 4 ++--
 56 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 8b22a5a6642..0a6c038570f 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 31b3602510b..a19820e0487 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 22700dd54b5..2e54c4219ba 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 a706fb4c322..d253e94d25b 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 cda22e3e356..4307cd4d54a 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 b9ec9239665..beb42389669 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 14997fa7483..3e22457f5b2 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 f1fb3a93c04..a007705cad3 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 b8b5ff56aeb..c830661e37e 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 78cbbf272dc..086c22fa638 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 9c47b08aff8..3aedd448e47 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 44f38a5398f..0637a779ad5 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 74bb6d15390..6aa7eb84194 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 a6046ea106e..46602ab51e0 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 d1fb7ef9812..e8614c0a6fe 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 a15f69c5ed5..6e60d9e9781 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 e42055bd990..530b9c3e978 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 438f2a2992c..4fc17d704f5 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 d95b474d0c6..18ed02bafe6 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 1a10e447b64..37014f107c3 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 af4125013a3..20ee71dc49f 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 aaf3a045e0c..63dd8d9e2ae 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 38ff974ba1f..249b5398414 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 a651c14aafe..124e93ff883 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 5e11089e2a1..fe592f78c43 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 7389d959ef5..7642620f7a7 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 970ccbbfed4..b14bc91d4ef 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 fdad402adc1..d34a1096c6e 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 c0ee77b4647..6edb1a3bd9a 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 a6cdfccaf64..9376afafb54 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 144e8231fdc..05e3a7b0047 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 28466b26ac3..f8542acb462 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 a4db24e030c..039a54427e8 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 d7d89435ac3..3d8bb2b57da 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 7f2593abc32..0cd9e70987e 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 627ee0c12e5..7c051e7aea0 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 ad5c6b501c0..cd26f8ff33e 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 6d306c05b45..e17b7d1467e 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 6a61bee35fe..0440ed12487 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 0055e18cd5d..664f5488540 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 82f1ba462e2..249d4b7a7a5 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 a935e74eb77..1ae8e9f6691 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 6e2f90e2b55..a8a5ab682fa 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 8249d4a3ceb..48e3ceaac83 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 9225125e4fe..badb5a612f5 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 41056a2332f..5d0a950a37d 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 c8dea1c3032..b1d435f62f6 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 bf19a517feb..bc8119ef3ea 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 0ed24af76f8..3be515e7e35 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 8c4647b0419..1dc534af898 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 eef5344271c..48a982f2874 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 3c126173f3f..8746721980e 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 10c95e44427..0c3cec16d29 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 0095fc46b5e..b37e995c6d8 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 94b530a8f8e..fe10431ddf6 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 3a1b3551233..a4f83d19190 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
-- 
GitLab