From d9fb18289e14f374d64a3baae2aa93ad56bfa487 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Wed, 9 Sep 2020 09:43:13 +0200
Subject: [PATCH] [nancy][grappe] Fix power monitoring
---
.../sites/nancy/clusters/grappe/grappe.json | 23 ++++++-
.../nancy/clusters/grappe/nodes/grappe-1.json | 4 +-
.../clusters/grappe/nodes/grappe-10.json | 4 +-
.../clusters/grappe/nodes/grappe-11.json | 4 +-
.../clusters/grappe/nodes/grappe-12.json | 4 +-
.../clusters/grappe/nodes/grappe-13.json | 4 +-
.../clusters/grappe/nodes/grappe-14.json | 4 +-
.../clusters/grappe/nodes/grappe-15.json | 4 +-
.../clusters/grappe/nodes/grappe-16.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-2.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-3.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-4.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-5.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-6.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-7.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-8.json | 4 +-
.../nancy/clusters/grappe/nodes/grappe-9.json | 4 +-
.../nancy/network_equipments/sgrappe.json | 20 ++++++
.../sites/nancy/pdus/grappe-pdu1.json | 32 ++++-----
.../sites/nancy/pdus/grappe-pdu2.json | 32 ++++-----
.../nancy/clusters/grappe/grappe_pdu.yaml | 68 +++++++++----------
.../sites/nancy/networks/sgrappe.yaml | 13 ++++
22 files changed, 153 insertions(+), 99 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grappe/grappe.json b/data/grid5000/sites/nancy/clusters/grappe/grappe.json
index f6da287f00b..eeb8cf43b9a 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 ae29b8f649d..c6825d51f1c 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 28aae5204f5..c83fc62bcd4 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 b9c7e613f5f..32500317336 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 de4531114ca..8e4e689e7ae 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 57ea015841e..86519c4ae14 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 5ca4d64c9cd..045e8c262cc 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 05d56ad42f9..52f7ea92d79 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 38e0db623c5..ebacde563a5 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 1aaec1a2b4a..cc1a4b1afd3 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 45aba077d55..186e17a6bde 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 558ef8b4ae2..965d20b13c7 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 25853781975..2a1aab8a209 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 8f3d461625b..32f11a9fb20 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 ffa165df869..06981a43b6b 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 27d1e3f569b..0bba490e60d 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 bb4aefaec2f..423ce7a078f 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 0f9ca66487e..d12a5955c66 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 0afbc2ea8c2..e2edd7be59c 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 0390df66e16..ea4a039fb0b 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 613f3db806e..e7969808190 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 e55cc334b6a..252b7fc10f9 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:
--
GitLab