From 28d8278724596477ff4b72b52bd3969673f8edf2 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Fri, 16 Sep 2022 15:05:36 +0200
Subject: [PATCH] [nancy/grat] Add network information
---
.../sites/nancy/clusters/grat/grat.json | 89 ++++++++++++++++++-
.../nancy/clusters/grat/nodes/grat-1.json | 4 +-
.../nancy/network_equipments/sgruss.json | 4 +
.../grid5000/sites/nancy/networks/sgruss.yaml | 2 +
4 files changed, 96 insertions(+), 3 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/grat/grat.json b/data/grid5000/sites/nancy/clusters/grat/grat.json
index dddb939f177..46df66a2c1e 100644
--- a/data/grid5000/sites/nancy/clusters/grat/grat.json
+++ b/data/grid5000/sites/nancy/clusters/grat/grat.json
@@ -4,7 +4,94 @@
"exotic": false,
"kavlan": false,
"metrics": [
-
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input packet counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output packet counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_packets_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of discarded packets for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output counter of packet errors for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_packets_error_total",
+ "period": 15000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ }
],
"model": "HPe Apollo 6500",
"queues": [
diff --git a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
index 3bbeb88f000..663df40f05a 100644
--- a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
+++ b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
@@ -211,8 +211,8 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 8,
- "switch": null,
- "switch_port": null,
+ "switch": "sgruss",
+ "switch_port": "ethernet1/1/16",
"vendor": "Mellanox Technologies"
},
{
diff --git a/data/grid5000/sites/nancy/network_equipments/sgruss.json b/data/grid5000/sites/nancy/network_equipments/sgruss.json
index e9acf6fe0d5..438f2a2992c 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgruss.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgruss.json
@@ -66,6 +66,10 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "ethernet1/1/16",
+ "uid": "grat-1"
},
{
},
diff --git a/input/grid5000/sites/nancy/networks/sgruss.yaml b/input/grid5000/sites/nancy/networks/sgruss.yaml
index 2c1762061d5..41056a2332f 100644
--- a/input/grid5000/sites/nancy/networks/sgruss.yaml
+++ b/input/grid5000/sites/nancy/networks/sgruss.yaml
@@ -71,6 +71,8 @@ sgruss:
uid: gruss-3-eth2
4:
uid: gruss-4-eth2
+ 16:
+ uid: grat-1-eth0
25:
snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1"
kind: node
--
GitLab