From e674cd9f3e5fb790d5f299e7f8b90abc966e3738 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Thu, 23 Jan 2025 15:34:11 +0100
Subject: [PATCH] [nancy][network][gratouille] add network link to gw
---
.../nancy/clusters/gratouille/gratouille.json | 88 +++++++++++++++++++
.../gratouille/nodes/gratouille-1.json | 4 +-
.../sites/nancy/network_equipments/gw.json | 4 +
.../sites/nancy/networks/gw-nancy.yaml | 2 +
4 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json b/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
index 1c805d71332..073227b29c9 100644
--- a/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
+++ b/data/grid5000/sites/nancy/clusters/gratouille/gratouille.json
@@ -276,6 +276,94 @@
"port": 9400,
"protocol": "prometheus"
}
+ },
+ {
+ "description": "Input byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_bytes_total",
+ "period": 10000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_bytes_total",
+ "period": 10000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Input packet counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifacein_packets_total",
+ "period": 10000,
+ "source": {
+ "protocol": "network_equipment"
+ }
+ },
+ {
+ "description": "Output packet counter for the network device port",
+ "labels": {
+ "interface": "eth0"
+ },
+ "name": "network_ifaceout_packets_total",
+ "period": 10000,
+ "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": 10000,
+ "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": 10000,
+ "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": 10000,
+ "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": 10000,
+ "source": {
+ "protocol": "network_equipment"
+ }
}
],
"model": "Dell PowerEdge R730",
diff --git a/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json b/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json
index be97f9409fd..ae6d8483154 100644
--- a/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json
+++ b/data/grid5000/sites/nancy/clusters/gratouille/nodes/gratouille-1.json
@@ -110,8 +110,8 @@
"rate": 10000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": null,
- "switch_port": null,
+ "switch": "gw",
+ "switch_port": "Ethernet7/14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index cc73ff00e87..bd2fd5b74b1 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -354,6 +354,10 @@
"uid": "grele-13"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Ethernet7/14",
+ "uid": "gratouille-1"
},
{
"kind": "server",
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index 9ac1e01c94a..108233390a7 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -189,6 +189,8 @@ gw:
uid: grele-12
13:
uid: grele-13
+ 14:
+ uid: gratouille-1
15:
uid: talc-data
kind: server
--
GitLab