diff --git a/data/grid5000/sites/nancy/clusters/grouille/grouille.json b/data/grid5000/sites/nancy/clusters/grouille/grouille.json index 1ff9d15862194b8fd5d187426c4db98ccd383886..10bde3899d4334c76a5eb82854a857c62081ea99 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/grouille.json +++ b/data/grid5000/sites/nancy/clusters/grouille/grouille.json @@ -3,28 +3,7 @@ "exotic": false, "kavlan": false, "metrics": [ - { - "description": "Input byte counter for the network device port", - "labels": { - "interface": "eth2" - }, - "name": "network_ifacein_bytes_total", - "period": 1000, - "source": { - "protocol": "network_equipment" - } - }, - { - "description": "Output byte counter for the network device port", - "labels": { - "interface": "eth2" - }, - "name": "network_ifaceout_bytes_total", - "period": 1000, - "source": { - "protocol": "network_equipment" - } - } + ], "model": "Dell PowerEdge R7525", "queues": [ diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json index 143abfcaa519fa9fe774270198816cd9ca117ebb..8272053d8f352e1cac593b4106ff3803b7f8209e 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json +++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json @@ -92,8 +92,8 @@ "name": "eno33", "network_address": "grouille-1.nancy.grid5000.fr", "rate": 25000000000, - "switch": "sgrappe", - "switch_port": "ethernet1/1/17", + "switch": null, + "switch_port": null, "vendor": "Mellanox Technologies" }, { diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json index 8cd5c6d979804b6c3a940c9cc53216e69a03c593..c80deb0abe44cec6a00bac64869eade9788fe2f1 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json +++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json @@ -92,8 +92,8 @@ "name": "eno33", "network_address": "grouille-2.nancy.grid5000.fr", "rate": 25000000000, - "switch": "sgrappe", - "switch_port": "ethernet1/1/18", + "switch": null, + "switch_port": null, "vendor": "Mellanox Technologies" }, { diff --git a/data/grid5000/sites/nancy/network_equipments/sgrappe.json b/data/grid5000/sites/nancy/network_equipments/sgrappe.json index 41eef1678f04a61e46ac0a28f8ff890d987200ee..fcd5896d3460174623d59cb0b5967d39849009d0 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgrappe.json +++ b/data/grid5000/sites/nancy/network_equipments/sgrappe.json @@ -116,16 +116,8 @@ "uid": "grappe-16" }, { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/17", - "uid": "grouille-1" }, { - "kind": "node", - "port": "eth0", - "snmp_name": "ethernet1/1/18", - "uid": "grouille-2" }, { }, diff --git a/input/grid5000/sites/nancy/networks/sgrappe.yaml b/input/grid5000/sites/nancy/networks/sgrappe.yaml index 103c2c7048e136b50bf14ba0f01f167c655f7ff8..7b2ffcf96290d90b74e9ed5437eee569b360f1e8 100644 --- a/input/grid5000/sites/nancy/networks/sgrappe.yaml +++ b/input/grid5000/sites/nancy/networks/sgrappe.yaml @@ -60,10 +60,6 @@ sgrappe: uid: grappe-15 16: uid: grappe-16 - 17: - uid: grouille-1 - 18: - uid: grouille-2 25: snmp_pattern: "ethernet1/%LINECARD%/%PORT%:1" kind: node