diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json b/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json index 3ea344c66272d1268c5484e0508d80611f7b3a24..ab44dd56cb6197ac7d85e2cbb4b35817ba4af640 100644 --- a/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json +++ b/data/grid5000/sites/luxembourg/clusters/granduc/granduc.json @@ -218,6 +218,72 @@ "id": 37, "protocol": "ipmisensor" } + }, + { + "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" + } + }, + { + "description": "Input byte counter for the network device port", + "labels": { + "interface": "eth1" + }, + "name": "network_ifacein_bytes_total", + "period": 1000, + "source": { + "protocol": "network_equipment" + } + }, + { + "description": "Output byte counter for the network device port", + "labels": { + "interface": "eth1" + }, + "name": "network_ifaceout_bytes_total", + "period": 1000, + "source": { + "protocol": "network_equipment" + } + }, + { + "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 1950", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json index c8b68315d6a66c9c2fd126ffc948d4767e7bab86..f7ab6d694f0c47b7a2920a61f7a1519a568b9281 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/sagittaire.json @@ -10,6 +10,28 @@ "source": { "protocol": "wattmetre" } + }, + { + "description": "Input byte counter for the network device port", + "labels": { + "interface": "eth1" + }, + "name": "network_ifacein_bytes_total", + "period": 1000, + "source": { + "protocol": "network_equipment" + } + }, + { + "description": "Output byte counter for the network device port", + "labels": { + "interface": "eth1" + }, + "name": "network_ifaceout_bytes_total", + "period": 1000, + "source": { + "protocol": "network_equipment" + } } ], "model": "Sun Fire V20z", diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb index 891f13d4bbcba4c81efb342823e9d124164016c1..c1c24c151fbf1a54f44b152b74c6e8151565b68d 100644 --- a/lib/refrepo/input_loader.rb +++ b/lib/refrepo/input_loader.rb @@ -235,7 +235,7 @@ def add_network_metrics(h) cluster['metrics'] = cluster.fetch('metrics', []).reject {|m| m['name'] =~ /network_.*_bytes_total/} # for each interface of a cluster's node - node_uid, node = cluster['nodes'].first + node_uid, node = cluster['nodes'].select { |k, v| v['status'] != 'retired' }.first node["network_adapters"].each do |iface_uid, iface| # get switch attached to interface