diff --git a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
index 677c8cdba117d48a0d785bca2fe508b409553c2f..b497a35d5236a0204ca1ce8abb580c016197cf1a 100644
--- a/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
+++ b/data/grid5000/sites/grenoble/clusters/dahu/dahu.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/grenoble/clusters/troll/troll.json b/data/grid5000/sites/grenoble/clusters/troll/troll.json
index 528ad8940d5d369a3948cc34304ebc3dd5b960c8..1ce821adcf3d9ac7b0d8b8be8333d6986a543f92 100644
--- a/data/grid5000/sites/grenoble/clusters/troll/troll.json
+++ b/data/grid5000/sites/grenoble/clusters/troll/troll.json
@@ -26,7 +26,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -53,7 +53,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
index a22a920c728bd3babb8dbaa835ced69d3ba2e887..0c99b1df39991530d0ad23d3f43f7b86582ee273 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/yeti.json
@@ -26,7 +26,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -66,7 +66,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -80,7 +80,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 4b7f7d8dc7c455db131d07a6cc1e12b36912eab5..8bc138f6d083a445a97b3252822db17ac35435fe 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -299,7 +299,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -308,7 +308,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
index c68ddffd6190b97403f521a5ae5d0522422c6c44..ce3f436770365f26d4853adff9201c6950eec8a3 100644
--- a/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
+++ b/data/grid5000/sites/lille/clusters/chetemi/chetemi.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
index 2a0906adc7c445d8b76019086d55f83f89f6aa53..3c464287db82d6a5519a101b84f40c8ce085e0ed 100644
--- a/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
+++ b/data/grid5000/sites/lille/clusters/chiclet/chiclet.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
index 90785f1c30135fa7e705847bc74f6a750a15d6e2..36ab02a613fe2106d418d32b2969186d57f8f141 100644
--- a/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
+++ b/data/grid5000/sites/lille/clusters/chifflet/chifflet.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
index 9fa458b7fb3c45f91c8925a03aa49a5bbb77fea7..7b8647bf6de02f102b4bbf3d9ceb3c3107d8393f 100644
--- a/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
+++ b/data/grid5000/sites/lille/clusters/chifflot/chifflot.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "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 968fbefdcdaadf7d465eac6b48777bd52f771df8..b5dede04792e2d8bdab0da92d100bf782b2d24d8 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": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -284,7 +284,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 df120f84353ee19467c73ee34b036dc6bd793977..8aafbac2d15cc267a569c5bb4a569897532c1309 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -178,7 +178,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -187,7 +187,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 d4cb18f44529148149e321a10e013666f0b94694..f8d55f97183046b031a29118972fe67b3bddd9cd 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -331,7 +331,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -340,7 +340,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
index eac298a054e4ab3d83bd5a20a3860dcbfe46b8ca..f00aec342742561a77a83607b280adc33f5cc301 100644
--- a/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
+++ b/data/grid5000/sites/luxembourg/clusters/petitprince/petitprince.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw.json b/data/grid5000/sites/luxembourg/network_equipments/gw.json
index 6564a20825ff19995881698c9442983847c42338..5aed749520f9e61830a9c73bfaf97413a9752dfd 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw.json
@@ -386,7 +386,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -395,7 +395,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 1b7310c4b933af10c8125cd9579194aab8b16587..9b1ccb65c29d29a4dfb2bf71fe01eb57883455a6 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
@@ -175,7 +175,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -184,7 +184,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 fa5bc5b9bcc4420a36538db6b9f0c0ac67b223d0..9d5c0e0fbd722731be2089dedb05f5fc3385a7a7 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
@@ -175,7 +175,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -184,7 +184,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 6b82d3cbf66f52a61b37e664009ca8e6a854f25e..d2502cc6e76254b36f7b4aae62b0b349968583aa 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -208,7 +208,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -217,7 +217,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/data/grid5000/sites/lyon/clusters/nova/nova.json b/data/grid5000/sites/lyon/clusters/nova/nova.json
index bf64530a9ffb16b8c5e9f9cb0009e0995b76e258..150f669cae9a879a96d2224b8fe1b0e2007b372f 100644
--- a/data/grid5000/sites/lyon/clusters/nova/nova.json
+++ b/data/grid5000/sites/lyon/clusters/nova/nova.json
@@ -26,7 +26,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lyon/clusters/orion/orion.json b/data/grid5000/sites/lyon/clusters/orion/orion.json
index 558dad38b4ad9a39c9662a7208772088d0de49b6..e65d690659b85db09c71c36c1faca5391089fc4f 100644
--- a/data/grid5000/sites/lyon/clusters/orion/orion.json
+++ b/data/grid5000/sites/lyon/clusters/orion/orion.json
@@ -26,7 +26,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -53,7 +53,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lyon/clusters/taurus/taurus.json b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
index 06b0ae29b46c5bdc34b2e73653b207c1952f206f..8e5bf3bafe9081a19dece69f53c307f9a166ceb4 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/taurus.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/taurus.json
@@ -26,7 +26,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -53,7 +53,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index 159984e25eec96c63ecba8da3aa107a39e51e55d..9b02e1ac4fb0a32252cce33cdab51bf284c39bbe 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -333,7 +333,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -342,7 +342,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 91c882bab47462323f4088196175bbe69a7e8461..867531da5b6aeabdbe8539b62ecc3b89e878be60 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -131,7 +131,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -140,7 +140,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 e02ca8ce80fc19d69d0acc8d7788814e9ae4e8cb..2211402feef24d3517688a5ebce50703cc5c85fb 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -200,7 +200,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -209,7 +209,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
index 6401bfb207ddf701e15fbac1dca83d5c7a8f99a0..989a7129db850fdde525147dd2c7a32147aad072 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/graffiti.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/graoully.json b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
index 44a84dea87af49567ce394de1fc3d2c40a28aab6..ba1875e6d0810ba78caf0ae6775bc3ef78a0a760 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/graoully.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/graoully.json
@@ -25,7 +25,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -52,7 +52,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphique/graphique.json b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
index fa82731477d9c039d92a64695b291aa4c98ca047..06ba8db5d5787892dfe88a4eb75e5eca96393581 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/graphique.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/graphique.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphite/graphite.json b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
index 3424815d7d4a80a524f8dc315a4d51de10e419e0..c01dba635333d5d58368d739aedf2baa91e3eb4b 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/graphite.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/graphite.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/grele.json b/data/grid5000/sites/nancy/clusters/grele/grele.json
index 36046921094e61215ae96295362055b0979af87a..c041e0cd0358b3d3e13719e5e39bb750f1015d34 100644
--- a/data/grid5000/sites/nancy/clusters/grele/grele.json
+++ b/data/grid5000/sites/nancy/clusters/grele/grele.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimani/grimani.json b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
index 479414e7431be2a45dca2a223b710f5778b0a4b6..2a55475d337cc6bc6c25c817ed01840ebed89300 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/grimani.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/grimani.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
index 6fa108d7b954260382488244a457671c3fe71492..24e081da6c869c91b1b4c75d526d0d94515016f0 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/grimoire.json
@@ -25,7 +25,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -52,7 +52,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/grisou.json b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
index 405476de52a173c31e3f361a4192976e76cb0ba1..4949dabb6576725a80b28c284ee59c680571b423 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/grisou.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/grisou.json
@@ -25,7 +25,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -52,7 +52,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/gros/gros.json b/data/grid5000/sites/nancy/clusters/gros/gros.json
index 06ddff23766160edfaba795a57bf7dfbeb613754..8bea83aed018f2e7b3748a927213caadedecb617 100644
--- a/data/grid5000/sites/nancy/clusters/gros/gros.json
+++ b/data/grid5000/sites/nancy/clusters/gros/gros.json
@@ -26,7 +26,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -53,7 +53,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/grue/grue.json b/data/grid5000/sites/nancy/clusters/grue/grue.json
index 5e1ec2402c6a9265b76f6deaf4fb87ff1e6162eb..4fe830932d69d0e48cff24cc0ca2fc561a05b8a5 100644
--- a/data/grid5000/sites/nancy/clusters/grue/grue.json
+++ b/data/grid5000/sites/nancy/clusters/grue/grue.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
index 3006d4ade36362ae870ed22fa22e44ede07699ed..a76fb6677c7020a110349d28c1fa6e7a540a5757 100644
--- a/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
+++ b/data/grid5000/sites/nancy/clusters/grvingt/grvingt.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index d49d56aee63acd738ec956074d9d7ae2b382db11..3cb12eac73c2d980e1c903b3d452db532d40afdf 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -2042,7 +2042,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 3000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -2051,7 +2051,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 3000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
index 118667bbafeeeafc56041e190aed1f69bfa253eb..49978671f43f09d7fd668636081b2a688d518b56 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -131,7 +131,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -140,7 +140,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 9ee5698c6f06ab7aa1e79979d68fb053ba9d63ba..6eab1fd0785bbbe51a116eaf93e7de791d2395cd 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
@@ -323,7 +323,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -332,7 +332,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 3a807aea9753507c5cdc3eabea4abd5156898014..bc135bc702754785e1f3b50c89319685afe53527 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
@@ -427,7 +427,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -436,7 +436,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 505c82ba488b6db29b6b976450fcdd5d4a24d19e..b122e55233e138fb406abdc0771ece6a7905ef18 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": 3000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 7ba9643765c8bb1c6f89dc44ec61ae850135dd5b..88050be1a188542c4a826188b3304739df8d106a 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.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 cd5eaba53d149bd94abdc8cb20350ba03ab88eb1..f9b8573dde5bb267c56cca7a544b5c62356952a5 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -597,7 +597,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -606,7 +606,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
index 6d255513fd23d0eb2d34b97aec5d3fd42c95bd84..c82931d2fe5852177bdbf994df46eaad1449abde 100644
--- a/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
+++ b/data/grid5000/sites/nantes/clusters/ecotype/ecotype.json
@@ -17,7 +17,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -57,7 +57,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
@@ -71,7 +71,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "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 9dade55afd630f7e465cb3b3246a09934c2662d3..fde40205ae2b10d7aff102cf45ca5cc2cbf0066e 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.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 0bdbfdfc974264467b79be311da21b2588c9c993..7dda5f00dd11a705bf9c0c0e7c3ae785d55f3c62 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.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 708bb520f325318ac344514bf6776e21441dd5dd..17f93f2e126bdfa3537d97a3de00871e22050b50 100644
--- a/data/grid5000/sites/nantes/network_equipments/gw.json
+++ b/data/grid5000/sites/nantes/network_equipments/gw.json
@@ -264,7 +264,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -273,7 +273,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
index 328361030f4394cc3c2797e98568a0e18523a49b..69fae18cda7f42880e7e85a5b68f608762b2a469 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/parasilo.json
@@ -25,7 +25,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}",
         "protocol": "snmp"
       }
     },
@@ -52,7 +52,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "protocol": "snmp"
       }
     },
diff --git a/data/grid5000/sites/rennes/clusters/paravance/paravance.json b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
index 19680fad2742d338889950bb8be9d3c373c2ea63..85d1121d1b06c6d1c56ecc671486a923710c4f87 100644
--- a/data/grid5000/sites/rennes/clusters/paravance/paravance.json
+++ b/data/grid5000/sites/rennes/clusters/paravance/paravance.json
@@ -25,7 +25,7 @@
       "name": "bmc_node_power_watt",
       "period": 5000,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}",
         "protocol": "snmp"
       }
     },
@@ -52,7 +52,7 @@
       "period": 0,
       "scale_factor": 0.1,
       "source": {
-        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1",
+        "id": "1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}",
         "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 94f55996aa8ba40a9833f8e5d8eae6b040028c3e..b1dc4258a655201a33b29b70b900f4fefc103939 100644
--- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
@@ -197,7 +197,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -206,7 +206,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 364a052ae2351a6d914aee2473f54f3c6e5fd204..29d51eca695bccd332fc560340ef4d86275f83c7 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -431,7 +431,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -440,7 +440,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 769e2a8aa990c91a8d5bb0057db9551ac61c0a29..f8c7342099dea03c3910efb36263b7670648f0d6 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -452,7 +452,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -461,7 +461,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 b458f5801c9698997f237f85f35bef0bad806e9d..0741558751ed17b6bd80bf8b95047a61d262f194 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": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -493,7 +493,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 de3534c6a2b5eb4beebef6b462e552495d42951d..2c5c14bdea2c3cc2c92d7564164008b4d3e2b4b9 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": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -497,7 +497,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 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 8cfcc001811930ff37787b8643e08d92cb36ab41..9b348dff4d31dd86804ad075dde30a0564f4c075 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -471,7 +471,7 @@
       "name": "network_ifacein_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     },
@@ -480,7 +480,7 @@
       "name": "network_ifaceout_bytes_total",
       "period": 1000,
       "source": {
-        "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+        "id": "1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
         "protocol": "snmp"
       }
     }
diff --git a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
index ab788f6ec30aba0ec5aacd87614080188007ab66..f9090fad9cbe91de0445ff6dcdb88e93614c9a85 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/dahu_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
index 9a369b3dff20ac169f63092cc9a96b3e3985ebe6..2ee2e18c282481ffc5845f1b8ecaa105de760fd3 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/troll_metrics.yaml
@@ -33,7 +33,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -52,7 +52,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
index e66f3e8c5e744cb288880983a7b8a85010baaa76..1d76d2b9d82200d4b8c8c81a4f4e4fbfa134b32d 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti_metrics.yaml
@@ -33,7 +33,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -61,7 +61,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -71,7 +71,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
index 6ca2b54c239a1b81c02f81708bc9484c24fb2dd5..4d53a0919a9f7f6b34ab0b3ba1ff3bf0826b92fa 100644
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw.yaml
@@ -16,13 +16,13 @@ gw:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.16.31.254
   vlans:
     "vlan100":
diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
index 38b684ea655c54a9b13c55395b72630535550a63..e0eeca8b64539723f7e209dc28159069c22cfd5b 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
index e34964db534bc0885e8c98a0ab2ae23890340e32..fc845c942d0cc5d25da33dcbfdbe696b2a7a946e 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
index 6ad2c0c4ca1115d6434200aee8259d9e34ac1a87..b770338d7e752fca74e20203037793c74af64f7a 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
index 6abdb4f9d6d916555598b7ec010a8c104d3cb2bb..4ddc835f9c49500ae6724ecd9b0fed50dab9daa0 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index a61a41bc5a42cc6c3efe541de21d55de44d2cf0a..32ead9eeff91586443b6c2fa43da363daf6bf117 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: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       kind: node
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index a61ab91a4d5b9bc5ed371894199d358228ca6384..5edef7cab15ca924476649504721168424714f0e 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -19,13 +19,13 @@ sw-chiclet-2:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index 36cdb28a49688a2268dc8cda62dcb89c0f60a9a9..8dab86e72535fb591917ec5b5294a5cf61d7c7a7 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: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       kind: node
diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
index 7455a262ea612b9456951ea641937b852031eeab..528f586490d44c5fb437ba60ac36bf325d5df922 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index a5e8218219ed84bb9e9139b2753314aff9f28d23..3b541ca43364dc2135d0d1c17763503234adb026 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: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan50":
       addresses:
diff --git a/input/grid5000/sites/luxembourg/networks/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
index 138c5090d1afe5ee88a2e6753135b2045e7ab105..86a1fbd86e2fc6fcd5eb70a44fc6249ed6c7664b 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl1.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
@@ -16,13 +16,13 @@ mxl1:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/luxembourg/networks/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
index f63199578453a96f19ebeb60e5d4b32f11267dc5..d10c78b0de0bce3746e105c494d01d16d192f444 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl2.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
@@ -16,13 +16,13 @@ mxl2:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
index 2d92fb5a2e6e40cea0049d8cbc1be5cb1057ccbf..548792c67b5243e0a7e14db777db943b013d1795 100644
--- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
+++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
@@ -14,13 +14,13 @@ ul-grid5000-sw02:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
 #    0:
 #      naming_pattern: "mgmt%PORT%"
diff --git a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
index e6bef925768f340347c49aeb8131199fb401352c..2c376836e7002475210bfd45f8bc11118b36add9 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nova_metrics.yaml
@@ -33,7 +33,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 # SNMP error: No Such Instance currently exists at this OID
 # - name: bmc_psu_current_amp
@@ -44,7 +44,7 @@ metrics:
 #   scale_factor: 0.1
 #   source:
 #     protocol: snmp
-#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 # SNMP error: No Such Instance currently exists at this OID
 # - name: bmc_psu_current_amp
@@ -55,7 +55,7 @@ metrics:
 #   scale_factor: 0.1
 #   source:
 #     protocol: snmp
-#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
index c8944d9716fdfa639ea1a635d4fe086438bb164c..5b28c4990e1fd789e99faf5dd23ed6f25bafcef3 100644
--- a/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/orion_metrics.yaml
@@ -32,7 +32,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -61,7 +61,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 # PSU2 not plugged
 # - name: bmc_psu_current_amp
@@ -72,7 +72,7 @@ metrics:
 #   scale_factor: 0.1
 #   source:
 #     protocol: snmp
-#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
index 5b57fbfe423e4fa6ddb6f0e47e71eca0eed7d971..c83e454fedb372ba243ef3e82bea44ab8d4c973e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus_metrics.yaml
@@ -33,7 +33,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -62,7 +62,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 # PSU2 not plugged
 # - name: bmc_psu_current_amp
@@ -73,7 +73,7 @@ metrics:
 #   scale_factor: 0.1
 #   source:
 #     protocol: snmp
-#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+#     id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index 7050255ea39a1e7934df444bd5ce9515cb2e3af8..df2fc37c7da823ec00e679359c144561d3e6420c 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -19,13 +19,13 @@ force10:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   backplane_bps: 1280000000000
   linecards:
     0:
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index 22fef317ada96f004f2c9af482933b78fb82197f..efb5b8e590688844748e82cdb9b25353926e651b 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: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index bf1c2162040e687142dec5d0649d19c3bb75c3a1..e5bb236e1c3fd2737ea68cdb178f0ca04f3a177c 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -16,13 +16,13 @@ salome:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   backplane_bps: 136000000000
   linecards:
     0:
diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
index e714a26a65c8c7321d35903b0bdbe49598cac205..72fb2186f5e596cd85fe789bde190dfaf854a649 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
index 1f2af08836fe23c43b051d0a2aa5fea4c17afa42..8ae6b457a70f4f9c9bdc91b06db2c9455455fbe1 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_metrics.yaml
@@ -32,7 +32,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -51,7 +51,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
index 6ad2c0c4ca1115d6434200aee8259d9e34ac1a87..b770338d7e752fca74e20203037793c74af64f7a 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
index 6ad2c0c4ca1115d6434200aee8259d9e34ac1a87..b770338d7e752fca74e20203037793c74af64f7a 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
index 6ad2c0c4ca1115d6434200aee8259d9e34ac1a87..b770338d7e752fca74e20203037793c74af64f7a 100644
--- a/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/grele_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
index 6ad2c0c4ca1115d6434200aee8259d9e34ac1a87..b770338d7e752fca74e20203037793c74af64f7a 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
index 1f2af08836fe23c43b051d0a2aa5fea4c17afa42..8ae6b457a70f4f9c9bdc91b06db2c9455455fbe1 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_metrics.yaml
@@ -32,7 +32,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -51,7 +51,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
index 1f2af08836fe23c43b051d0a2aa5fea4c17afa42..8ae6b457a70f4f9c9bdc91b06db2c9455455fbe1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_metrics.yaml
@@ -32,7 +32,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -51,7 +51,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
index 8138b841a3501ef5315ff4d4101f630309e070a9..47bbb8056fc739f9545f79310def7e15cb1f1ddb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/gros_metrics.yaml
@@ -33,7 +33,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -52,7 +52,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
index 6d1c8f52aaea09ac8e9fb20b621d81f0bdd8cae9..81a48a2e817df76b6fa7c0fee16a8bc76dc955bf 100644
--- a/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/grue_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
index ab788f6ec30aba0ec5aacd87614080188007ab66..f9090fad9cbe91de0445ff6dcdb88e93614c9a85 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index db2c47b551c6f28566cbb84148690a820cedce58..8b41f78c46a7a48c3688544b39b9294802395fb0 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -33,13 +33,13 @@ gw:
     period: 3000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
index 7dd853b83437fa7a9e51660df5ebba15e6302fa5..2cf4f7ad4582f1c0364f970e285ff60d84c636ca 100644
--- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
+++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
@@ -23,13 +23,13 @@ sgraoullyib:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.223
   linecards:
     12:
diff --git a/input/grid5000/sites/nancy/networks/sgrcinq.yaml b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
index 2078583b3575842f71bd495244dd4ae6207f523c..b63d99a03d1e5950d5859175232683df1f9b4ee9 100644
--- a/input/grid5000/sites/nancy/networks/sgrcinq.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
@@ -12,13 +12,13 @@ sgrcinq:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.230
   backplane_bps: 100000000000
   linecards:
diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
index 8cc0b5c10d51e63af5b92e94e25ee74d5ec5f19d..44c1ceef183cdc49a2a3f14aa93e6fe690e1717d 100644
--- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
@@ -23,13 +23,13 @@ sgrisou1:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.206
   backplane_bps: 260000000000
   linecards:
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index 701386737e095787b8db7b2ef7f7727a7de73151..6e4848ff1916652837c94070e1986d4b0a60a2df 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -14,13 +14,13 @@ sgros1:
     period: 3000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "ethernet1/1/%PORT%:1"
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 010424ba13b5910df59fc8e9e9cd9a95bccc3778..971d0eb533e36cc4a074d52c91a980f22df736c0 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -12,13 +12,13 @@ sgros2:
     period: 3000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.209
   backplane_bps: 6400000000000
   linecards:
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index f0979c45fd1e36384afa0c0a8f9d0b2c845db928..9d728956a33e911147451d8625cd5d3bd4ce194d 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -12,13 +12,13 @@ sgrvingt:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   ip: 172.17.79.207
   backplane_bps: 1440000000000
   linecards:
diff --git a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
index 38b684ea655c54a9b13c55395b72630535550a63..e0eeca8b64539723f7e209dc28159069c22cfd5b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/ecotype_metrics.yaml
@@ -26,7 +26,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -54,7 +54,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_psu_current_amp
   labels: {"psu": "2"}
@@ -64,7 +64,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
index 03b5da9494b0988f51faec4e7d62749681f572d0..70350af10168e8514ef6900b97406d28936318e2 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
@@ -14,13 +14,13 @@ ecotype-prod1:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
index d180e0d9f5d2bfb8411b760d8a0799dd5ba73ce4..9699191e60e024aeff323f2fe59a8c58358e9555 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
@@ -14,13 +14,13 @@ ecotype-prod2:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/nantes/networks/gw-nantes.yaml b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
index 2aa93406de06ecee20bfb7779ae58f13c8c748c1..d5cc3a547c8bfc01138259c0ded93fa14f4b7cf9 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: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
index cab6fcf5de123b3cbb45a40264f4450f4740cc73..2899d2ca52aa7262211cb3e4e0d80738b91a8426 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/parasilo_metrics.yaml
@@ -32,7 +32,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.3
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == System Board Pwr Consumption }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -51,7 +51,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
index 1f2af08836fe23c43b051d0a2aa5fea4c17afa42..8ae6b457a70f4f9c9bdc91b06db2c9455455fbe1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/paravance_metrics.yaml
@@ -32,7 +32,7 @@ metrics:
   period: 5000
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.2
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS2 Current 2 }}
 
 - name: bmc_psu_voltage_volt
   labels: {"psu": "1"}
@@ -51,7 +51,7 @@ metrics:
   scale_factor: 0.1
   source:
     protocol: snmp
-    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.1
+    id: 1.3.6.1.4.1.674.10892.5.4.600.30.1.6.1.{{ 1.3.6.1.4.1.674.10892.5.4.600.30.1.8.1 == PS1 Current 1 }}
 
 - name: bmc_node_power_watt_total
   description: Cumulated power consumption of node reported by BMC, in watt
diff --git a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
index dd2c90dbcaeb5053956227f26a5ac0d72a57add0..060cce46a769ada14336dc65e76e82311fc844ce 100644
--- a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
@@ -14,13 +14,13 @@ bigdata-sw:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index 8922dd2b9936f223bc48b09acf0c1e30c0605d79..9d4a71058416f979dc941f299e3dfaf996e5685e 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -14,13 +14,13 @@ c6509:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       kind: virtual
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index 699379960ac92c0a1ea4f59c22491f189521a63c..551b94b862b541311e3d0512a4e6f0f24f1c9791 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: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   vlans:
     "vlan100":
       administrative: yes
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
index 99139fb1a5d120112a3ffeecd979340d158862c1..8741c1a0aa16d26b2b8288a978e93574d507232d 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
@@ -14,13 +14,13 @@ paravance-sw-1:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
index 2b399895ff657c48a28977acf081d596363a419a..bb29cd7661ab5f695fcd3fb0d98ebb00d31d670f 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
@@ -14,13 +14,13 @@ paravance-sw-2:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 11ce21274d169aef253732e8b2901c51866a1d5a..7dcf04c2c0b7e879f6679c784747ef2e88e82e31 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -12,13 +12,13 @@ gw:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
   alias:
     - gw-sophia
   ip: 172.16.143.254
@@ -217,10 +217,10 @@ gw:
     period: 1000
     source:
       protocol: snmp
-      id: 1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.10.{{ 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.%SNMP_IFACE%
+      id: 1.3.6.1.2.1.2.2.1.16.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}