diff --git a/data/grid5000/sites/nancy/clusters/grappe/grappe.json b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
index f6da287f00b9220f3b2bfbb89097ad55507a4a8e..eeb8cf43b9adbe836cf3af44ed7782d615e33c16 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/grappe.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
@@ -3,7 +3,28 @@
"exotic": false,
"kavlan": true,
"metrics": [
-
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 1000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 1000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ }
],
"model": "Dell PowerEdge R640",
"queues": [
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
index ae29b8f649ddec746ec5043e3ef911d526184234..c6825d51f1c02844c5ba26204f91135fb0feb198 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 2,
+ "port": 4,
"uid": "grappe-pdu1"
},
{
- "port": 2,
+ "port": 4,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
index 28aae5204f52a2aa15b912e4d9f258c51120b68e..c83fc62bcd481cdf58bf8fe6cd4ba708821429e4 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 11,
+ "port": 15,
"uid": "grappe-pdu1"
},
{
- "port": 11,
+ "port": 15,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
index b9c7e613f5f42e602d2bd377b2855adf128628af..32500317336bed0a213bb08d47d49b3b529b6b8d 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 12,
+ "port": 16,
"uid": "grappe-pdu1"
},
{
- "port": 12,
+ "port": 16,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
index de4531114ca4818800b1759f02f383856768a34d..8e4e689e7ae2b60589964e87b36a9e6faa61f0b7 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 13,
+ "port": 17,
"uid": "grappe-pdu1"
},
{
- "port": 13,
+ "port": 17,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
index 57ea015841e76cd38c2a63f39f9f89bd471f0a57..86519c4ae1441cf3c7831179fbba99237637e0aa 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 14,
+ "port": 18,
"uid": "grappe-pdu1"
},
{
- "port": 14,
+ "port": 18,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
index 5ca4d64c9cd664e1682366ccb5e844742efc5b43..045e8c262cc762f665dbf55858ff449679c0dd15 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 15,
+ "port": 19,
"uid": "grappe-pdu1"
},
{
- "port": 15,
+ "port": 19,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
index 05d56ad42f998d29e6802b270c75aeba7b3b04c7..52f7ea92d79a6ab6aa89defbed9a7c23079ecb58 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 16,
+ "port": 20,
"uid": "grappe-pdu1"
},
{
- "port": 16,
+ "port": 20,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
index 38e0db623c523c363c6a924be0e0efb3ab5c401c..ebacde563a5189a24f9602876ad1d17ec80201fa 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 17,
+ "port": 21,
"uid": "grappe-pdu1"
},
{
- "port": 17,
+ "port": 22,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
index 1aaec1a2b4adc61eb43d888f831b4e6255a2b8a2..cc1a4b1afd36d5bc1545bf0bc5e617f4e8d83b59 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 3,
+ "port": 5,
"uid": "grappe-pdu1"
},
{
- "port": 3,
+ "port": 5,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
index 45aba077d55668675c5f0932b8d0799989d8151b..186e17a6bde98a754680ca65dd27549ee5e0c9bb 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 4,
+ "port": 7,
"uid": "grappe-pdu1"
},
{
- "port": 4,
+ "port": 7,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
index 558ef8b4ae295768b18e1377045e89369ba78206..965d20b13c776cabe8f824f4655554dd4afe8fea 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 5,
+ "port": 8,
"uid": "grappe-pdu1"
},
{
- "port": 5,
+ "port": 8,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
index 258537819759a64499239cc57d1a43962835a1e6..2a1aab8a209e4e2591f85fa5535d74218ea3fc56 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 6,
+ "port": 9,
"uid": "grappe-pdu1"
},
{
- "port": 6,
+ "port": 9,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
index 8f3d461625b0398bceeb84fa365f7806f5bac448..32f11a9fb2099e0ade521ec2afc942d72e433dcb 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 7,
+ "port": 10,
"uid": "grappe-pdu1"
},
{
- "port": 7,
+ "port": 10,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
index ffa165df8691bf77105e8f2b1a7baaca4644e0a1..06981a43b6b7d2d54f9b6e9fcc743028b6260980 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 8,
+ "port": 11,
"uid": "grappe-pdu1"
},
{
- "port": 8,
+ "port": 11,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
index 27d1e3f569b2e6a241a86df81cbd620b4b8b1c8a..0bba490e60d2e27999df49bcfc1b208553cc99fd 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 9,
+ "port": 12,
"uid": "grappe-pdu1"
},
{
- "port": 9,
+ "port": 12,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
index bb4aefaec2fee1dc61f1a2d3a6d6c34c1db85f22..423ce7a078faba6327230584be27e009c6a04502 100644
--- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
+++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json
@@ -214,11 +214,11 @@
},
"pdu": [
{
- "port": 10,
+ "port": 14,
"uid": "grappe-pdu1"
},
{
- "port": 10,
+ "port": 14,
"uid": "grappe-pdu2"
}
],
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
index 0f9ca66487e5ea0823d534958e9964c59f6a6a69..d12a5955c667a90d1601c900fe3aa9ba48787b2c 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json
@@ -146,6 +146,26 @@
"snmp_pattern": "Ethernet1/%LINECARD%/%PORT%"
}
],
+ "metrics": [
+ {
+ "description": "Input byte counter for the network device port",
+ "name": "network_ifacein_bytes_total",
+ "period": 1000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.10.%SNMP_IFACE%",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "name": "network_ifaceout_bytes_total",
+ "period": 1000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.16.%SNMP_IFACE%",
+ "protocol": "snmp"
+ }
+ }
+ ],
"model": "Dell S5224F-ON",
"role": "production",
"site": "nancy",
diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json b/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
index 0afbc2ea8c227f49424232011092374f0ef3c784..e2edd7be59c26bd09104f63257cfed71b697bd03 100644
--- a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
+++ b/data/grid5000/sites/nancy/pdus/grappe-pdu1.json
@@ -14,22 +14,22 @@
],
"model": "AP8653",
"ports": {
- "10": "grappe-9",
- "11": "grappe-10",
- "12": "grappe-11",
- "13": "grappe-12",
- "14": "grappe-13",
- "15": "grappe-14",
- "16": "grappe-15",
- "17": "grappe-16",
- "2": "grappe-1",
- "3": "grappe-2",
- "4": "grappe-3",
- "5": "grappe-4",
- "6": "grappe-5",
- "7": "grappe-6",
- "8": "grappe-7",
- "9": "grappe-8"
+ "10": "grappe-6",
+ "11": "grappe-7",
+ "12": "grappe-8",
+ "14": "grappe-9",
+ "15": "grappe-10",
+ "16": "grappe-11",
+ "17": "grappe-12",
+ "18": "grappe-13",
+ "19": "grappe-14",
+ "20": "grappe-15",
+ "21": "grappe-16",
+ "4": "grappe-1",
+ "5": "grappe-2",
+ "7": "grappe-3",
+ "8": "grappe-4",
+ "9": "grappe-5"
},
"sensors": [
{
diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json b/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
index 0390df66e16458335a93ad9a33688181705573a8..ea4a039fb0be05527910a551baf3165b01667ced 100644
--- a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
+++ b/data/grid5000/sites/nancy/pdus/grappe-pdu2.json
@@ -14,22 +14,22 @@
],
"model": "AP8653",
"ports": {
- "10": "grappe-9",
- "11": "grappe-10",
- "12": "grappe-11",
- "13": "grappe-12",
- "14": "grappe-13",
- "15": "grappe-14",
- "16": "grappe-15",
- "17": "grappe-16",
- "2": "grappe-1",
- "3": "grappe-2",
- "4": "grappe-3",
- "5": "grappe-4",
- "6": "grappe-5",
- "7": "grappe-6",
- "8": "grappe-7",
- "9": "grappe-8"
+ "10": "grappe-6",
+ "11": "grappe-7",
+ "12": "grappe-8",
+ "14": "grappe-9",
+ "15": "grappe-10",
+ "16": "grappe-11",
+ "17": "grappe-12",
+ "18": "grappe-13",
+ "19": "grappe-14",
+ "20": "grappe-15",
+ "22": "grappe-16",
+ "4": "grappe-1",
+ "5": "grappe-2",
+ "7": "grappe-3",
+ "8": "grappe-4",
+ "9": "grappe-5"
},
"sensors": [
{
diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml
index 613f3db806ed065b4862cdc5037979dbb30c44ee..e7969808190c5dd17a24a892a4d9a474ea5911d6 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml
@@ -7,102 +7,102 @@ nodes:
grappe-1:
pdu:
- uid: grappe-pdu1
- port: 2
+ port: 4
- uid: grappe-pdu2
- port: 2
+ port: 4
grappe-2:
pdu:
- uid: grappe-pdu1
- port: 3
+ port: 5
- uid: grappe-pdu2
- port: 3
+ port: 5
grappe-3:
pdu:
- uid: grappe-pdu1
- port: 4
+ port: 6
- uid: grappe-pdu2
- port: 4
+ port: 6
grappe-3:
pdu:
- uid: grappe-pdu1
- port: 4
+ port: 7
- uid: grappe-pdu2
- port: 4
+ port: 7
grappe-4:
pdu:
- uid: grappe-pdu1
- port: 5
+ port: 8
- uid: grappe-pdu2
- port: 5
+ port: 8
grappe-5:
pdu:
- uid: grappe-pdu1
- port: 6
+ port: 9
- uid: grappe-pdu2
- port: 6
+ port: 9
grappe-6:
pdu:
- uid: grappe-pdu1
- port: 7
+ port: 10
- uid: grappe-pdu2
- port: 7
+ port: 10
grappe-7:
pdu:
- uid: grappe-pdu1
- port: 8
+ port: 11
- uid: grappe-pdu2
- port: 8
+ port: 11
grappe-8:
pdu:
- uid: grappe-pdu1
- port: 9
+ port: 12
- uid: grappe-pdu2
- port: 9
+ port: 12
grappe-9:
pdu:
- uid: grappe-pdu1
- port: 10
+ port: 14
- uid: grappe-pdu2
- port: 10
+ port: 14
grappe-10:
pdu:
- uid: grappe-pdu1
- port: 11
+ port: 15
- uid: grappe-pdu2
- port: 11
+ port: 15
grappe-11:
pdu:
- uid: grappe-pdu1
- port: 12
+ port: 16
- uid: grappe-pdu2
- port: 12
+ port: 16
grappe-12:
pdu:
- uid: grappe-pdu1
- port: 13
+ port: 17
- uid: grappe-pdu2
- port: 13
+ port: 17
grappe-13:
pdu:
- uid: grappe-pdu1
- port: 14
+ port: 18
- uid: grappe-pdu2
- port: 14
+ port: 18
grappe-14:
pdu:
- uid: grappe-pdu1
- port: 15
+ port: 19
- uid: grappe-pdu2
- port: 15
+ port: 19
grappe-15:
pdu:
- uid: grappe-pdu1
- port: 16
+ port: 20
- uid: grappe-pdu2
- port: 16
+ port: 20
grappe-16:
pdu:
- uid: grappe-pdu1
- port: 17
+ port: 21
- uid: grappe-pdu2
- port: 17
+ port: 22
diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml
index e55cc334b6ace9f6deb2c3bf58fbc23e40fb2b67..252b7fc10f9e41c6e1f79bb8d6d526b5f9c57143 100644
--- a/input/grid5000/sites/nancy/networks/sgrappe.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml
@@ -6,6 +6,19 @@ sgrappe:
kind: switch
site: nancy
snmp_community: public
+ metrics:
+ - name: network_ifacein_bytes_total
+ description: Input byte counter for the network device port
+ period: 1000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.10.%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%
ip: 172.17.79.205
backplane_bps: 2160000000000
linecards: