From 4f1f19fb028df8d99881f98ac807af8174d8b83e Mon Sep 17 00:00:00 2001 From: Simon Delamare <simon.delamare@ens-lyon.fr> Date: Mon, 12 Apr 2021 16:27:52 +0200 Subject: [PATCH] [all_sites] Clean old sensors and monitoring descriptions --- .../grenoble/clusters/dahu/nodes/dahu-1.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-10.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-11.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-12.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-13.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-14.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-15.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-16.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-17.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-18.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-19.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-2.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-20.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-21.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-22.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-23.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-24.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-25.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-26.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-27.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-28.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-29.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-3.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-30.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-31.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-32.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-4.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-5.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-6.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-7.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-8.json | 5 - .../grenoble/clusters/dahu/nodes/dahu-9.json | 5 - .../grenoble/clusters/drac/nodes/drac-1.json | 5 - .../grenoble/clusters/drac/nodes/drac-10.json | 5 - .../grenoble/clusters/drac/nodes/drac-11.json | 5 - .../grenoble/clusters/drac/nodes/drac-12.json | 5 - .../grenoble/clusters/drac/nodes/drac-2.json | 5 - .../grenoble/clusters/drac/nodes/drac-3.json | 5 - .../grenoble/clusters/drac/nodes/drac-4.json | 5 - .../grenoble/clusters/drac/nodes/drac-5.json | 5 - .../grenoble/clusters/drac/nodes/drac-6.json | 5 - .../grenoble/clusters/drac/nodes/drac-7.json | 5 - .../grenoble/clusters/drac/nodes/drac-8.json | 5 - .../grenoble/clusters/drac/nodes/drac-9.json | 5 - .../clusters/troll/nodes/troll-1.json | 29 +- .../clusters/troll/nodes/troll-2.json | 29 +- .../clusters/troll/nodes/troll-3.json | 29 +- .../clusters/troll/nodes/troll-4.json | 29 +- .../grenoble/clusters/yeti/nodes/yeti-1.json | 37 +-- .../grenoble/clusters/yeti/nodes/yeti-2.json | 37 +-- .../grenoble/clusters/yeti/nodes/yeti-3.json | 37 +-- .../grenoble/clusters/yeti/nodes/yeti-4.json | 37 +-- .../sites/grenoble/pdus/wattmetre1.json | 15 -- .../clusters/chetemi/nodes/chetemi-1.json | 29 +- .../clusters/chetemi/nodes/chetemi-10.json | 29 +- .../clusters/chetemi/nodes/chetemi-11.json | 29 +- .../clusters/chetemi/nodes/chetemi-12.json | 29 +- .../clusters/chetemi/nodes/chetemi-13.json | 29 +- .../clusters/chetemi/nodes/chetemi-14.json | 29 +- .../clusters/chetemi/nodes/chetemi-15.json | 29 +- .../clusters/chetemi/nodes/chetemi-2.json | 29 +- .../clusters/chetemi/nodes/chetemi-3.json | 29 +- .../clusters/chetemi/nodes/chetemi-4.json | 29 +- .../clusters/chetemi/nodes/chetemi-5.json | 29 +- .../clusters/chetemi/nodes/chetemi-6.json | 29 +- .../clusters/chetemi/nodes/chetemi-7.json | 29 +- .../clusters/chetemi/nodes/chetemi-8.json | 29 +- .../clusters/chetemi/nodes/chetemi-9.json | 29 +- .../clusters/chiclet/nodes/chiclet-1.json | 29 +- .../clusters/chiclet/nodes/chiclet-2.json | 29 +- .../clusters/chiclet/nodes/chiclet-3.json | 29 +- .../clusters/chiclet/nodes/chiclet-4.json | 29 +- .../clusters/chiclet/nodes/chiclet-5.json | 29 +- .../clusters/chiclet/nodes/chiclet-6.json | 29 +- .../clusters/chiclet/nodes/chiclet-7.json | 29 +- .../clusters/chiclet/nodes/chiclet-8.json | 29 +- .../clusters/chifflet/nodes/chifflet-1.json | 29 +- .../clusters/chifflet/nodes/chifflet-2.json | 29 +- .../clusters/chifflet/nodes/chifflet-3.json | 29 +- .../clusters/chifflet/nodes/chifflet-4.json | 29 +- .../clusters/chifflet/nodes/chifflet-5.json | 29 +- .../clusters/chifflet/nodes/chifflet-6.json | 29 +- .../clusters/chifflet/nodes/chifflet-7.json | 29 +- .../clusters/chifflet/nodes/chifflet-8.json | 29 +- .../clusters/chifflot/nodes/chifflot-1.json | 29 +- .../clusters/chifflot/nodes/chifflot-2.json | 29 +- .../clusters/chifflot/nodes/chifflot-3.json | 29 +- .../clusters/chifflot/nodes/chifflot-4.json | 29 +- .../clusters/chifflot/nodes/chifflot-5.json | 29 +- .../clusters/chifflot/nodes/chifflot-6.json | 29 +- .../clusters/chifflot/nodes/chifflot-7.json | 29 +- .../clusters/chifflot/nodes/chifflot-8.json | 29 +- data/grid5000/sites/lille/pdus/pdu-b1p1.json | 16 -- data/grid5000/sites/lille/pdus/pdu-b1p2.json | 16 -- .../grid5000/sites/lille/pdus/pdu-b1p3-2.json | 16 -- data/grid5000/sites/lille/pdus/pdu-b1p3.json | 16 -- data/grid5000/sites/lille/pdus/pdu-b2p1.json | 16 -- data/grid5000/sites/lille/pdus/pdu-b2p2.json | 16 -- data/grid5000/sites/lille/pdus/pdu-b3p1.json | 16 -- .../grid5000/sites/lille/pdus/pdu-b3p2-1.json | 16 -- .../grid5000/sites/lille/pdus/pdu-b3p2-2.json | 16 -- data/grid5000/sites/lille/pdus/pdu-b3p3.json | 7 - .../sites/lille/servers/carbonade.json | 32 +-- .../grid5000/sites/lille/servers/caulier.json | 32 +-- .../sites/lille/servers/chimint-srv2.json | 32 +-- .../sites/lille/servers/chiterne.json | 32 +-- data/grid5000/sites/lille/servers/fives.json | 32 +-- .../sites/lille/servers/flandres.json | 32 +-- data/grid5000/sites/lille/servers/gardin.json | 32 +-- .../sites/lille/servers/granche-srv1.json | 32 +-- .../sites/lille/servers/granche-srv2.json | 32 +-- .../sites/lille/servers/gwol-north.json | 32 +-- .../sites/lille/servers/srv-data.json | 32 +-- data/grid5000/sites/lille/servers/welsh.json | 32 +-- .../petitprince/nodes/petitprince-1.json | 5 - .../petitprince/nodes/petitprince-10.json | 5 - .../petitprince/nodes/petitprince-11.json | 5 - .../petitprince/nodes/petitprince-13.json | 5 - .../petitprince/nodes/petitprince-14.json | 5 - .../petitprince/nodes/petitprince-15.json | 5 - .../petitprince/nodes/petitprince-16.json | 5 - .../petitprince/nodes/petitprince-2.json | 5 - .../petitprince/nodes/petitprince-3.json | 5 - .../petitprince/nodes/petitprince-4.json | 5 - .../petitprince/nodes/petitprince-5.json | 5 - .../petitprince/nodes/petitprince-6.json | 5 - .../petitprince/nodes/petitprince-7.json | 5 - .../petitprince/nodes/petitprince-8.json | 5 - .../petitprince/nodes/petitprince-9.json | 5 - .../lyon/clusters/gemini/nodes/gemini-1.json | 53 ++-- .../lyon/clusters/gemini/nodes/gemini-2.json | 53 ++-- .../clusters/hercule/nodes/hercule-1.json | 17 -- .../clusters/hercule/nodes/hercule-2.json | 17 -- .../clusters/hercule/nodes/hercule-3.json | 17 -- .../clusters/hercule/nodes/hercule-4.json | 17 -- .../lyon/clusters/nova/nodes/nova-1.json | 9 - .../lyon/clusters/nova/nodes/nova-10.json | 9 - .../lyon/clusters/nova/nodes/nova-11.json | 9 - .../lyon/clusters/nova/nodes/nova-12.json | 9 - .../lyon/clusters/nova/nodes/nova-13.json | 9 - .../lyon/clusters/nova/nodes/nova-14.json | 9 - .../lyon/clusters/nova/nodes/nova-15.json | 9 - .../lyon/clusters/nova/nodes/nova-16.json | 9 - .../lyon/clusters/nova/nodes/nova-17.json | 9 - .../lyon/clusters/nova/nodes/nova-18.json | 9 - .../lyon/clusters/nova/nodes/nova-19.json | 9 - .../lyon/clusters/nova/nodes/nova-2.json | 9 - .../lyon/clusters/nova/nodes/nova-20.json | 9 - .../lyon/clusters/nova/nodes/nova-21.json | 9 - .../lyon/clusters/nova/nodes/nova-22.json | 9 - .../lyon/clusters/nova/nodes/nova-23.json | 9 - .../lyon/clusters/nova/nodes/nova-3.json | 9 - .../lyon/clusters/nova/nodes/nova-4.json | 9 - .../lyon/clusters/nova/nodes/nova-5.json | 9 - .../lyon/clusters/nova/nodes/nova-6.json | 9 - .../lyon/clusters/nova/nodes/nova-7.json | 9 - .../lyon/clusters/nova/nodes/nova-8.json | 9 - .../lyon/clusters/nova/nodes/nova-9.json | 9 - .../lyon/clusters/orion/nodes/orion-1.json | 29 +- .../lyon/clusters/orion/nodes/orion-2.json | 29 +- .../lyon/clusters/orion/nodes/orion-3.json | 29 +- .../lyon/clusters/orion/nodes/orion-4.json | 29 +- .../lyon/clusters/pyxis/nodes/pyxis-1.json | 29 +- .../lyon/clusters/pyxis/nodes/pyxis-2.json | 29 +- .../lyon/clusters/pyxis/nodes/pyxis-3.json | 29 +- .../lyon/clusters/pyxis/nodes/pyxis-4.json | 29 +- .../sagittaire/nodes/sagittaire-11.json | 29 +- .../sagittaire/nodes/sagittaire-12.json | 29 +- .../sagittaire/nodes/sagittaire-13.json | 29 +- .../sagittaire/nodes/sagittaire-14.json | 29 +- .../sagittaire/nodes/sagittaire-15.json | 29 +- .../sagittaire/nodes/sagittaire-16.json | 29 +- .../sagittaire/nodes/sagittaire-17.json | 29 +- .../sagittaire/nodes/sagittaire-18.json | 29 +- .../sagittaire/nodes/sagittaire-2.json | 29 +- .../sagittaire/nodes/sagittaire-20.json | 29 +- .../sagittaire/nodes/sagittaire-24.json | 29 +- .../sagittaire/nodes/sagittaire-27.json | 29 +- .../sagittaire/nodes/sagittaire-29.json | 29 +- .../sagittaire/nodes/sagittaire-3.json | 29 +- .../sagittaire/nodes/sagittaire-30.json | 29 +- .../sagittaire/nodes/sagittaire-4.json | 29 +- .../sagittaire/nodes/sagittaire-5.json | 29 +- .../sagittaire/nodes/sagittaire-6.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-1.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-10.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-11.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-12.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-13.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-15.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-3.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-4.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-5.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-6.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-7.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-8.json | 29 +- .../lyon/clusters/taurus/nodes/taurus-9.json | 29 +- data/grid5000/sites/lyon/pdus/wattmetre1.json | 15 -- data/grid5000/sites/lyon/pdus/wattmetre4.json | 15 -- .../clusters/graffiti/nodes/graffiti-1.json | 33 +-- .../clusters/graffiti/nodes/graffiti-10.json | 33 +-- .../clusters/graffiti/nodes/graffiti-11.json | 33 +-- .../clusters/graffiti/nodes/graffiti-12.json | 33 +-- .../clusters/graffiti/nodes/graffiti-13.json | 33 +-- .../clusters/graffiti/nodes/graffiti-2.json | 33 +-- .../clusters/graffiti/nodes/graffiti-3.json | 33 +-- .../clusters/graffiti/nodes/graffiti-4.json | 33 +-- .../clusters/graffiti/nodes/graffiti-5.json | 33 +-- .../clusters/graffiti/nodes/graffiti-6.json | 33 +-- .../clusters/graffiti/nodes/graffiti-7.json | 33 +-- .../clusters/graffiti/nodes/graffiti-8.json | 33 +-- .../clusters/graffiti/nodes/graffiti-9.json | 33 +-- .../clusters/graoully/nodes/graoully-1.json | 25 +- .../clusters/graoully/nodes/graoully-10.json | 25 +- .../clusters/graoully/nodes/graoully-11.json | 25 +- .../clusters/graoully/nodes/graoully-12.json | 25 +- .../clusters/graoully/nodes/graoully-13.json | 25 +- .../clusters/graoully/nodes/graoully-14.json | 25 +- .../clusters/graoully/nodes/graoully-15.json | 25 +- .../clusters/graoully/nodes/graoully-16.json | 25 +- .../clusters/graoully/nodes/graoully-2.json | 25 +- .../clusters/graoully/nodes/graoully-3.json | 25 +- .../clusters/graoully/nodes/graoully-4.json | 25 +- .../clusters/graoully/nodes/graoully-5.json | 25 +- .../clusters/graoully/nodes/graoully-6.json | 25 +- .../clusters/graoully/nodes/graoully-7.json | 25 +- .../clusters/graoully/nodes/graoully-8.json | 25 +- .../clusters/graoully/nodes/graoully-9.json | 25 +- .../clusters/graphique/nodes/graphique-1.json | 33 +-- .../clusters/graphique/nodes/graphique-2.json | 33 +-- .../clusters/graphique/nodes/graphique-3.json | 33 +-- .../clusters/graphique/nodes/graphique-4.json | 33 +-- .../clusters/graphique/nodes/graphique-5.json | 33 +-- .../clusters/graphique/nodes/graphique-6.json | 33 +-- .../clusters/graphite/nodes/graphite-1.json | 33 +-- .../clusters/graphite/nodes/graphite-2.json | 33 +-- .../clusters/graphite/nodes/graphite-3.json | 33 +-- .../clusters/graphite/nodes/graphite-4.json | 33 +-- .../nancy/clusters/grappe/nodes/grappe-1.json | 37 +-- .../clusters/grappe/nodes/grappe-10.json | 37 +-- .../clusters/grappe/nodes/grappe-11.json | 37 +-- .../clusters/grappe/nodes/grappe-12.json | 37 +-- .../clusters/grappe/nodes/grappe-13.json | 37 +-- .../clusters/grappe/nodes/grappe-14.json | 37 +-- .../clusters/grappe/nodes/grappe-15.json | 37 +-- .../clusters/grappe/nodes/grappe-16.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-2.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-3.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-4.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-5.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-6.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-7.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-8.json | 37 +-- .../nancy/clusters/grappe/nodes/grappe-9.json | 37 +-- .../nancy/clusters/grcinq/nodes/grcinq-1.json | 14 - .../clusters/grcinq/nodes/grcinq-10.json | 14 - .../clusters/grcinq/nodes/grcinq-11.json | 14 - .../clusters/grcinq/nodes/grcinq-12.json | 14 - .../clusters/grcinq/nodes/grcinq-13.json | 14 - .../clusters/grcinq/nodes/grcinq-14.json | 14 - .../clusters/grcinq/nodes/grcinq-15.json | 14 - .../clusters/grcinq/nodes/grcinq-16.json | 14 - .../clusters/grcinq/nodes/grcinq-17.json | 14 - .../clusters/grcinq/nodes/grcinq-18.json | 14 - .../clusters/grcinq/nodes/grcinq-19.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-2.json | 14 - .../clusters/grcinq/nodes/grcinq-20.json | 14 - .../clusters/grcinq/nodes/grcinq-21.json | 14 - .../clusters/grcinq/nodes/grcinq-22.json | 14 - .../clusters/grcinq/nodes/grcinq-23.json | 14 - .../clusters/grcinq/nodes/grcinq-24.json | 14 - .../clusters/grcinq/nodes/grcinq-25.json | 14 - .../clusters/grcinq/nodes/grcinq-26.json | 14 - .../clusters/grcinq/nodes/grcinq-27.json | 14 - .../clusters/grcinq/nodes/grcinq-28.json | 14 - .../clusters/grcinq/nodes/grcinq-29.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-3.json | 14 - .../clusters/grcinq/nodes/grcinq-30.json | 14 - .../clusters/grcinq/nodes/grcinq-31.json | 14 - .../clusters/grcinq/nodes/grcinq-32.json | 14 - .../clusters/grcinq/nodes/grcinq-33.json | 14 - .../clusters/grcinq/nodes/grcinq-34.json | 14 - .../clusters/grcinq/nodes/grcinq-35.json | 14 - .../clusters/grcinq/nodes/grcinq-36.json | 14 - .../clusters/grcinq/nodes/grcinq-37.json | 14 - .../clusters/grcinq/nodes/grcinq-38.json | 14 - .../clusters/grcinq/nodes/grcinq-39.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-4.json | 14 - .../clusters/grcinq/nodes/grcinq-40.json | 14 - .../clusters/grcinq/nodes/grcinq-41.json | 14 - .../clusters/grcinq/nodes/grcinq-42.json | 14 - .../clusters/grcinq/nodes/grcinq-43.json | 14 - .../clusters/grcinq/nodes/grcinq-44.json | 14 - .../clusters/grcinq/nodes/grcinq-45.json | 14 - .../clusters/grcinq/nodes/grcinq-46.json | 14 - .../clusters/grcinq/nodes/grcinq-47.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-5.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-6.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-7.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-8.json | 14 - .../nancy/clusters/grcinq/nodes/grcinq-9.json | 14 - .../nancy/clusters/grele/nodes/grele-1.json | 33 +-- .../nancy/clusters/grele/nodes/grele-10.json | 33 +-- .../nancy/clusters/grele/nodes/grele-11.json | 33 +-- .../nancy/clusters/grele/nodes/grele-12.json | 33 +-- .../nancy/clusters/grele/nodes/grele-13.json | 33 +-- .../nancy/clusters/grele/nodes/grele-14.json | 33 +-- .../nancy/clusters/grele/nodes/grele-2.json | 33 +-- .../nancy/clusters/grele/nodes/grele-3.json | 33 +-- .../nancy/clusters/grele/nodes/grele-4.json | 33 +-- .../nancy/clusters/grele/nodes/grele-5.json | 33 +-- .../nancy/clusters/grele/nodes/grele-6.json | 33 +-- .../nancy/clusters/grele/nodes/grele-7.json | 33 +-- .../nancy/clusters/grele/nodes/grele-8.json | 33 +-- .../nancy/clusters/grele/nodes/grele-9.json | 33 +-- .../clusters/grimani/nodes/grimani-1.json | 33 +-- .../clusters/grimani/nodes/grimani-2.json | 33 +-- .../clusters/grimani/nodes/grimani-3.json | 33 +-- .../clusters/grimani/nodes/grimani-4.json | 33 +-- .../clusters/grimani/nodes/grimani-5.json | 33 +-- .../clusters/grimani/nodes/grimani-6.json | 33 +-- .../clusters/grimoire/nodes/grimoire-1.json | 25 +- .../clusters/grimoire/nodes/grimoire-2.json | 25 +- .../clusters/grimoire/nodes/grimoire-3.json | 25 +- .../clusters/grimoire/nodes/grimoire-4.json | 25 +- .../clusters/grimoire/nodes/grimoire-5.json | 25 +- .../clusters/grimoire/nodes/grimoire-6.json | 25 +- .../clusters/grimoire/nodes/grimoire-7.json | 25 +- .../clusters/grimoire/nodes/grimoire-8.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-1.json | 25 +- .../clusters/grisou/nodes/grisou-10.json | 25 +- .../clusters/grisou/nodes/grisou-11.json | 25 +- .../clusters/grisou/nodes/grisou-12.json | 25 +- .../clusters/grisou/nodes/grisou-13.json | 25 +- .../clusters/grisou/nodes/grisou-14.json | 25 +- .../clusters/grisou/nodes/grisou-15.json | 25 +- .../clusters/grisou/nodes/grisou-16.json | 25 +- .../clusters/grisou/nodes/grisou-17.json | 25 +- .../clusters/grisou/nodes/grisou-18.json | 25 +- .../clusters/grisou/nodes/grisou-19.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-2.json | 25 +- .../clusters/grisou/nodes/grisou-20.json | 25 +- .../clusters/grisou/nodes/grisou-21.json | 25 +- .../clusters/grisou/nodes/grisou-22.json | 25 +- .../clusters/grisou/nodes/grisou-23.json | 25 +- .../clusters/grisou/nodes/grisou-24.json | 25 +- .../clusters/grisou/nodes/grisou-25.json | 25 +- .../clusters/grisou/nodes/grisou-26.json | 25 +- .../clusters/grisou/nodes/grisou-27.json | 25 +- .../clusters/grisou/nodes/grisou-28.json | 25 +- .../clusters/grisou/nodes/grisou-29.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-3.json | 25 +- .../clusters/grisou/nodes/grisou-30.json | 25 +- .../clusters/grisou/nodes/grisou-31.json | 25 +- .../clusters/grisou/nodes/grisou-32.json | 25 +- .../clusters/grisou/nodes/grisou-33.json | 25 +- .../clusters/grisou/nodes/grisou-34.json | 25 +- .../clusters/grisou/nodes/grisou-35.json | 25 +- .../clusters/grisou/nodes/grisou-36.json | 25 +- .../clusters/grisou/nodes/grisou-37.json | 25 +- .../clusters/grisou/nodes/grisou-38.json | 25 +- .../clusters/grisou/nodes/grisou-39.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-4.json | 25 +- .../clusters/grisou/nodes/grisou-40.json | 25 +- .../clusters/grisou/nodes/grisou-41.json | 25 +- .../clusters/grisou/nodes/grisou-42.json | 25 +- .../clusters/grisou/nodes/grisou-43.json | 25 +- .../clusters/grisou/nodes/grisou-44.json | 25 +- .../clusters/grisou/nodes/grisou-45.json | 25 +- .../clusters/grisou/nodes/grisou-46.json | 25 +- .../clusters/grisou/nodes/grisou-47.json | 25 +- .../clusters/grisou/nodes/grisou-48.json | 25 +- .../clusters/grisou/nodes/grisou-49.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-5.json | 25 +- .../clusters/grisou/nodes/grisou-50.json | 25 +- .../clusters/grisou/nodes/grisou-51.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-6.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-7.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-8.json | 25 +- .../nancy/clusters/grisou/nodes/grisou-9.json | 25 +- .../nancy/clusters/gros/nodes/gros-1.json | 39 +-- .../nancy/clusters/gros/nodes/gros-10.json | 39 +-- .../nancy/clusters/gros/nodes/gros-100.json | 39 +-- .../nancy/clusters/gros/nodes/gros-101.json | 39 +-- .../nancy/clusters/gros/nodes/gros-102.json | 39 +-- .../nancy/clusters/gros/nodes/gros-103.json | 39 +-- .../nancy/clusters/gros/nodes/gros-104.json | 39 +-- .../nancy/clusters/gros/nodes/gros-105.json | 39 +-- .../nancy/clusters/gros/nodes/gros-106.json | 39 +-- .../nancy/clusters/gros/nodes/gros-107.json | 39 +-- .../nancy/clusters/gros/nodes/gros-108.json | 39 +-- .../nancy/clusters/gros/nodes/gros-109.json | 39 +-- .../nancy/clusters/gros/nodes/gros-11.json | 39 +-- .../nancy/clusters/gros/nodes/gros-110.json | 39 +-- .../nancy/clusters/gros/nodes/gros-111.json | 39 +-- .../nancy/clusters/gros/nodes/gros-112.json | 39 +-- .../nancy/clusters/gros/nodes/gros-113.json | 39 +-- .../nancy/clusters/gros/nodes/gros-114.json | 39 +-- .../nancy/clusters/gros/nodes/gros-115.json | 39 +-- .../nancy/clusters/gros/nodes/gros-116.json | 39 +-- .../nancy/clusters/gros/nodes/gros-117.json | 39 +-- .../nancy/clusters/gros/nodes/gros-118.json | 39 +-- .../nancy/clusters/gros/nodes/gros-119.json | 39 +-- .../nancy/clusters/gros/nodes/gros-12.json | 39 +-- .../nancy/clusters/gros/nodes/gros-120.json | 39 +-- .../nancy/clusters/gros/nodes/gros-121.json | 39 +-- .../nancy/clusters/gros/nodes/gros-122.json | 39 +-- .../nancy/clusters/gros/nodes/gros-123.json | 39 +-- .../nancy/clusters/gros/nodes/gros-124.json | 39 +-- .../nancy/clusters/gros/nodes/gros-13.json | 39 +-- .../nancy/clusters/gros/nodes/gros-14.json | 39 +-- .../nancy/clusters/gros/nodes/gros-15.json | 39 +-- .../nancy/clusters/gros/nodes/gros-16.json | 39 +-- .../nancy/clusters/gros/nodes/gros-17.json | 39 +-- .../nancy/clusters/gros/nodes/gros-18.json | 39 +-- .../nancy/clusters/gros/nodes/gros-19.json | 39 +-- .../nancy/clusters/gros/nodes/gros-2.json | 39 +-- .../nancy/clusters/gros/nodes/gros-20.json | 39 +-- .../nancy/clusters/gros/nodes/gros-21.json | 39 +-- .../nancy/clusters/gros/nodes/gros-22.json | 39 +-- .../nancy/clusters/gros/nodes/gros-23.json | 39 +-- .../nancy/clusters/gros/nodes/gros-24.json | 39 +-- .../nancy/clusters/gros/nodes/gros-25.json | 39 +-- .../nancy/clusters/gros/nodes/gros-26.json | 39 +-- .../nancy/clusters/gros/nodes/gros-27.json | 39 +-- .../nancy/clusters/gros/nodes/gros-28.json | 39 +-- .../nancy/clusters/gros/nodes/gros-29.json | 39 +-- .../nancy/clusters/gros/nodes/gros-3.json | 39 +-- .../nancy/clusters/gros/nodes/gros-30.json | 39 +-- .../nancy/clusters/gros/nodes/gros-31.json | 39 +-- .../nancy/clusters/gros/nodes/gros-32.json | 39 +-- .../nancy/clusters/gros/nodes/gros-33.json | 39 +-- .../nancy/clusters/gros/nodes/gros-34.json | 39 +-- .../nancy/clusters/gros/nodes/gros-35.json | 39 +-- .../nancy/clusters/gros/nodes/gros-36.json | 39 +-- .../nancy/clusters/gros/nodes/gros-37.json | 39 +-- .../nancy/clusters/gros/nodes/gros-38.json | 39 +-- .../nancy/clusters/gros/nodes/gros-39.json | 39 +-- .../nancy/clusters/gros/nodes/gros-4.json | 39 +-- .../nancy/clusters/gros/nodes/gros-40.json | 39 +-- .../nancy/clusters/gros/nodes/gros-41.json | 39 +-- .../nancy/clusters/gros/nodes/gros-42.json | 39 +-- .../nancy/clusters/gros/nodes/gros-43.json | 39 +-- .../nancy/clusters/gros/nodes/gros-44.json | 39 +-- .../nancy/clusters/gros/nodes/gros-45.json | 39 +-- .../nancy/clusters/gros/nodes/gros-46.json | 39 +-- .../nancy/clusters/gros/nodes/gros-47.json | 39 +-- .../nancy/clusters/gros/nodes/gros-48.json | 39 +-- .../nancy/clusters/gros/nodes/gros-49.json | 39 +-- .../nancy/clusters/gros/nodes/gros-5.json | 39 +-- .../nancy/clusters/gros/nodes/gros-50.json | 39 +-- .../nancy/clusters/gros/nodes/gros-51.json | 39 +-- .../nancy/clusters/gros/nodes/gros-52.json | 39 +-- .../nancy/clusters/gros/nodes/gros-53.json | 39 +-- .../nancy/clusters/gros/nodes/gros-54.json | 39 +-- .../nancy/clusters/gros/nodes/gros-55.json | 39 +-- .../nancy/clusters/gros/nodes/gros-56.json | 39 +-- .../nancy/clusters/gros/nodes/gros-57.json | 39 +-- .../nancy/clusters/gros/nodes/gros-58.json | 39 +-- .../nancy/clusters/gros/nodes/gros-59.json | 39 +-- .../nancy/clusters/gros/nodes/gros-6.json | 39 +-- .../nancy/clusters/gros/nodes/gros-60.json | 39 +-- .../nancy/clusters/gros/nodes/gros-61.json | 39 +-- .../nancy/clusters/gros/nodes/gros-62.json | 39 +-- .../nancy/clusters/gros/nodes/gros-63.json | 39 +-- .../nancy/clusters/gros/nodes/gros-64.json | 39 +-- .../nancy/clusters/gros/nodes/gros-65.json | 39 +-- .../nancy/clusters/gros/nodes/gros-66.json | 39 +-- .../nancy/clusters/gros/nodes/gros-67.json | 39 +-- .../nancy/clusters/gros/nodes/gros-68.json | 39 +-- .../nancy/clusters/gros/nodes/gros-69.json | 39 +-- .../nancy/clusters/gros/nodes/gros-7.json | 39 +-- .../nancy/clusters/gros/nodes/gros-70.json | 39 +-- .../nancy/clusters/gros/nodes/gros-71.json | 39 +-- .../nancy/clusters/gros/nodes/gros-72.json | 39 +-- .../nancy/clusters/gros/nodes/gros-73.json | 39 +-- .../nancy/clusters/gros/nodes/gros-74.json | 39 +-- .../nancy/clusters/gros/nodes/gros-75.json | 39 +-- .../nancy/clusters/gros/nodes/gros-76.json | 39 +-- .../nancy/clusters/gros/nodes/gros-77.json | 39 +-- .../nancy/clusters/gros/nodes/gros-78.json | 39 +-- .../nancy/clusters/gros/nodes/gros-79.json | 39 +-- .../nancy/clusters/gros/nodes/gros-8.json | 39 +-- .../nancy/clusters/gros/nodes/gros-80.json | 39 +-- .../nancy/clusters/gros/nodes/gros-81.json | 39 +-- .../nancy/clusters/gros/nodes/gros-82.json | 39 +-- .../nancy/clusters/gros/nodes/gros-83.json | 39 +-- .../nancy/clusters/gros/nodes/gros-84.json | 39 +-- .../nancy/clusters/gros/nodes/gros-85.json | 39 +-- .../nancy/clusters/gros/nodes/gros-86.json | 39 +-- .../nancy/clusters/gros/nodes/gros-87.json | 39 +-- .../nancy/clusters/gros/nodes/gros-88.json | 39 +-- .../nancy/clusters/gros/nodes/gros-89.json | 39 +-- .../nancy/clusters/gros/nodes/gros-9.json | 39 +-- .../nancy/clusters/gros/nodes/gros-90.json | 39 +-- .../nancy/clusters/gros/nodes/gros-91.json | 39 +-- .../nancy/clusters/gros/nodes/gros-92.json | 39 +-- .../nancy/clusters/gros/nodes/gros-93.json | 39 +-- .../nancy/clusters/gros/nodes/gros-94.json | 39 +-- .../nancy/clusters/gros/nodes/gros-95.json | 39 +-- .../nancy/clusters/gros/nodes/gros-96.json | 39 +-- .../nancy/clusters/gros/nodes/gros-97.json | 39 +-- .../nancy/clusters/gros/nodes/gros-98.json | 39 +-- .../nancy/clusters/gros/nodes/gros-99.json | 39 +-- .../clusters/grouille/nodes/grouille-1.json | 5 - .../clusters/grouille/nodes/grouille-2.json | 5 - .../nancy/clusters/grue/nodes/grue-1.json | 5 - .../nancy/clusters/grue/nodes/grue-2.json | 5 - .../nancy/clusters/grue/nodes/grue-3.json | 5 - .../nancy/clusters/grue/nodes/grue-4.json | 5 - .../nancy/clusters/grue/nodes/grue-5.json | 5 - .../clusters/grvingt/nodes/grvingt-1.json | 14 - .../clusters/grvingt/nodes/grvingt-10.json | 14 - .../clusters/grvingt/nodes/grvingt-11.json | 14 - .../clusters/grvingt/nodes/grvingt-12.json | 14 - .../clusters/grvingt/nodes/grvingt-13.json | 14 - .../clusters/grvingt/nodes/grvingt-14.json | 14 - .../clusters/grvingt/nodes/grvingt-15.json | 14 - .../clusters/grvingt/nodes/grvingt-16.json | 14 - .../clusters/grvingt/nodes/grvingt-17.json | 14 - .../clusters/grvingt/nodes/grvingt-18.json | 14 - .../clusters/grvingt/nodes/grvingt-19.json | 14 - .../clusters/grvingt/nodes/grvingt-2.json | 14 - .../clusters/grvingt/nodes/grvingt-20.json | 14 - .../clusters/grvingt/nodes/grvingt-21.json | 14 - .../clusters/grvingt/nodes/grvingt-22.json | 14 - .../clusters/grvingt/nodes/grvingt-23.json | 14 - .../clusters/grvingt/nodes/grvingt-24.json | 14 - .../clusters/grvingt/nodes/grvingt-25.json | 14 - .../clusters/grvingt/nodes/grvingt-26.json | 14 - .../clusters/grvingt/nodes/grvingt-27.json | 14 - .../clusters/grvingt/nodes/grvingt-28.json | 14 - .../clusters/grvingt/nodes/grvingt-29.json | 14 - .../clusters/grvingt/nodes/grvingt-3.json | 14 - .../clusters/grvingt/nodes/grvingt-30.json | 14 - .../clusters/grvingt/nodes/grvingt-31.json | 14 - .../clusters/grvingt/nodes/grvingt-32.json | 14 - .../clusters/grvingt/nodes/grvingt-33.json | 14 - .../clusters/grvingt/nodes/grvingt-34.json | 14 - .../clusters/grvingt/nodes/grvingt-35.json | 14 - .../clusters/grvingt/nodes/grvingt-36.json | 14 - .../clusters/grvingt/nodes/grvingt-37.json | 14 - .../clusters/grvingt/nodes/grvingt-38.json | 14 - .../clusters/grvingt/nodes/grvingt-39.json | 14 - .../clusters/grvingt/nodes/grvingt-4.json | 14 - .../clusters/grvingt/nodes/grvingt-40.json | 14 - .../clusters/grvingt/nodes/grvingt-41.json | 14 - .../clusters/grvingt/nodes/grvingt-42.json | 14 - .../clusters/grvingt/nodes/grvingt-43.json | 14 - .../clusters/grvingt/nodes/grvingt-44.json | 14 - .../clusters/grvingt/nodes/grvingt-45.json | 14 - .../clusters/grvingt/nodes/grvingt-46.json | 14 - .../clusters/grvingt/nodes/grvingt-47.json | 14 - .../clusters/grvingt/nodes/grvingt-48.json | 14 - .../clusters/grvingt/nodes/grvingt-49.json | 14 - .../clusters/grvingt/nodes/grvingt-5.json | 14 - .../clusters/grvingt/nodes/grvingt-50.json | 14 - .../clusters/grvingt/nodes/grvingt-51.json | 14 - .../clusters/grvingt/nodes/grvingt-52.json | 14 - .../clusters/grvingt/nodes/grvingt-53.json | 14 - .../clusters/grvingt/nodes/grvingt-54.json | 14 - .../clusters/grvingt/nodes/grvingt-55.json | 14 - .../clusters/grvingt/nodes/grvingt-56.json | 14 - .../clusters/grvingt/nodes/grvingt-57.json | 14 - .../clusters/grvingt/nodes/grvingt-58.json | 14 - .../clusters/grvingt/nodes/grvingt-59.json | 14 - .../clusters/grvingt/nodes/grvingt-6.json | 14 - .../clusters/grvingt/nodes/grvingt-60.json | 14 - .../clusters/grvingt/nodes/grvingt-61.json | 14 - .../clusters/grvingt/nodes/grvingt-62.json | 14 - .../clusters/grvingt/nodes/grvingt-63.json | 14 - .../clusters/grvingt/nodes/grvingt-64.json | 14 - .../clusters/grvingt/nodes/grvingt-7.json | 14 - .../clusters/grvingt/nodes/grvingt-8.json | 14 - .../clusters/grvingt/nodes/grvingt-9.json | 14 - .../sites/nancy/network_equipments/gw.json | 48 ++-- .../nancy/network_equipments/sgraoullyib.json | 24 +- .../nancy/network_equipments/sgrele-opf.json | 32 +-- .../nancy/network_equipments/sgrisou1.json | 24 +- .../sites/nancy/pdus/graffiti-pdu1.json | 16 -- .../sites/nancy/pdus/graffiti-pdu2.json | 16 -- .../sites/nancy/pdus/graffiti-pdu3.json | 16 -- .../sites/nancy/pdus/graffiti-pdu4.json | 16 -- .../sites/nancy/pdus/graoully-pdu1.json | 16 -- .../sites/nancy/pdus/graoully-pdu2.json | 16 -- .../sites/nancy/pdus/grappe-pdu1.json | 16 -- .../sites/nancy/pdus/grappe-pdu2.json | 16 -- .../sites/nancy/pdus/grimani-pdu1.json | 16 -- .../sites/nancy/pdus/grimani-pdu2.json | 16 -- .../sites/nancy/pdus/grimoire-pdu1.json | 16 -- .../sites/nancy/pdus/grimoire-pdu2.json | 16 -- .../sites/nancy/pdus/grisou-pdu1.json | 16 -- .../sites/nancy/pdus/grisou-pdu2.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu1.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu2.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu3.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu4.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu5.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu6.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu7.json | 16 -- data/grid5000/sites/nancy/pdus/gros-pdu8.json | 16 -- .../sites/nancy/pdus/gros-wattmetre1.json | 15 -- .../sites/nancy/pdus/gros-wattmetre2.json | 15 -- .../sites/nancy/pdus/gros-wattmetre3.json | 15 -- .../sites/nancy/pdus/grvingt-pdu1.json | 15 -- .../sites/nancy/pdus/grvingt-pdu2.json | 15 -- .../sites/nancy/servers/srv-data.json | 32 +-- .../sites/nancy/servers/srv-data2.json | 32 +-- data/grid5000/sites/nancy/servers/srv.json | 32 +-- data/grid5000/sites/nancy/servers/srv2.json | 32 +-- data/grid5000/sites/nancy/servers/srv3.json | 32 +-- .../sites/nancy/servers/talc-data-baie2.json | 26 +- .../sites/nancy/servers/talc-data-baie3.json | 26 +- .../sites/nancy/servers/talc-data.json | 32 +-- .../clusters/econome/nodes/econome-1.json | 8 - .../clusters/econome/nodes/econome-10.json | 8 - .../clusters/econome/nodes/econome-11.json | 8 - .../clusters/econome/nodes/econome-12.json | 8 - .../clusters/econome/nodes/econome-13.json | 8 - .../clusters/econome/nodes/econome-14.json | 8 - .../clusters/econome/nodes/econome-15.json | 8 - .../clusters/econome/nodes/econome-16.json | 8 - .../clusters/econome/nodes/econome-17.json | 8 - .../clusters/econome/nodes/econome-18.json | 8 - .../clusters/econome/nodes/econome-19.json | 8 - .../clusters/econome/nodes/econome-2.json | 8 - .../clusters/econome/nodes/econome-20.json | 8 - .../clusters/econome/nodes/econome-21.json | 8 - .../clusters/econome/nodes/econome-22.json | 8 - .../clusters/econome/nodes/econome-3.json | 8 - .../clusters/econome/nodes/econome-4.json | 8 - .../clusters/econome/nodes/econome-5.json | 8 - .../clusters/econome/nodes/econome-6.json | 8 - .../clusters/econome/nodes/econome-7.json | 8 - .../clusters/econome/nodes/econome-8.json | 8 - .../clusters/econome/nodes/econome-9.json | 8 - .../clusters/ecotype/nodes/ecotype-1.json | 5 - .../clusters/ecotype/nodes/ecotype-10.json | 5 - .../clusters/ecotype/nodes/ecotype-11.json | 5 - .../clusters/ecotype/nodes/ecotype-12.json | 5 - .../clusters/ecotype/nodes/ecotype-13.json | 5 - .../clusters/ecotype/nodes/ecotype-14.json | 5 - .../clusters/ecotype/nodes/ecotype-15.json | 5 - .../clusters/ecotype/nodes/ecotype-16.json | 5 - .../clusters/ecotype/nodes/ecotype-17.json | 5 - .../clusters/ecotype/nodes/ecotype-18.json | 5 - .../clusters/ecotype/nodes/ecotype-19.json | 5 - .../clusters/ecotype/nodes/ecotype-2.json | 5 - .../clusters/ecotype/nodes/ecotype-20.json | 5 - .../clusters/ecotype/nodes/ecotype-21.json | 5 - .../clusters/ecotype/nodes/ecotype-22.json | 5 - .../clusters/ecotype/nodes/ecotype-23.json | 5 - .../clusters/ecotype/nodes/ecotype-24.json | 5 - .../clusters/ecotype/nodes/ecotype-25.json | 5 - .../clusters/ecotype/nodes/ecotype-26.json | 5 - .../clusters/ecotype/nodes/ecotype-27.json | 5 - .../clusters/ecotype/nodes/ecotype-28.json | 5 - .../clusters/ecotype/nodes/ecotype-29.json | 5 - .../clusters/ecotype/nodes/ecotype-3.json | 5 - .../clusters/ecotype/nodes/ecotype-30.json | 5 - .../clusters/ecotype/nodes/ecotype-31.json | 5 - .../clusters/ecotype/nodes/ecotype-32.json | 5 - .../clusters/ecotype/nodes/ecotype-33.json | 5 - .../clusters/ecotype/nodes/ecotype-34.json | 5 - .../clusters/ecotype/nodes/ecotype-35.json | 5 - .../clusters/ecotype/nodes/ecotype-36.json | 5 - .../clusters/ecotype/nodes/ecotype-37.json | 5 - .../clusters/ecotype/nodes/ecotype-38.json | 5 - .../clusters/ecotype/nodes/ecotype-39.json | 5 - .../clusters/ecotype/nodes/ecotype-4.json | 5 - .../clusters/ecotype/nodes/ecotype-40.json | 5 - .../clusters/ecotype/nodes/ecotype-41.json | 5 - .../clusters/ecotype/nodes/ecotype-42.json | 5 - .../clusters/ecotype/nodes/ecotype-43.json | 5 - .../clusters/ecotype/nodes/ecotype-44.json | 5 - .../clusters/ecotype/nodes/ecotype-45.json | 5 - .../clusters/ecotype/nodes/ecotype-46.json | 5 - .../clusters/ecotype/nodes/ecotype-47.json | 5 - .../clusters/ecotype/nodes/ecotype-48.json | 5 - .../clusters/ecotype/nodes/ecotype-5.json | 5 - .../clusters/ecotype/nodes/ecotype-6.json | 5 - .../clusters/ecotype/nodes/ecotype-7.json | 5 - .../clusters/ecotype/nodes/ecotype-8.json | 5 - .../clusters/ecotype/nodes/ecotype-9.json | 5 - .../clusters/paranoia/nodes/paranoia-1.json | 8 - .../clusters/paranoia/nodes/paranoia-2.json | 8 - .../clusters/paranoia/nodes/paranoia-3.json | 8 - .../clusters/paranoia/nodes/paranoia-4.json | 8 - .../clusters/paranoia/nodes/paranoia-5.json | 8 - .../clusters/paranoia/nodes/paranoia-6.json | 8 - .../clusters/paranoia/nodes/paranoia-7.json | 8 - .../clusters/paranoia/nodes/paranoia-8.json | 8 - .../clusters/parapide/nodes/parapide-1.json | 40 +-- .../clusters/parapide/nodes/parapide-10.json | 40 +-- .../clusters/parapide/nodes/parapide-12.json | 40 +-- .../clusters/parapide/nodes/parapide-13.json | 40 +-- .../clusters/parapide/nodes/parapide-16.json | 40 +-- .../clusters/parapide/nodes/parapide-18.json | 40 +-- .../clusters/parapide/nodes/parapide-19.json | 40 +-- .../clusters/parapide/nodes/parapide-2.json | 40 +-- .../clusters/parapide/nodes/parapide-21.json | 40 +-- .../clusters/parapide/nodes/parapide-24.json | 40 +-- .../clusters/parapide/nodes/parapide-25.json | 40 +-- .../clusters/parapide/nodes/parapide-3.json | 40 +-- .../clusters/parapide/nodes/parapide-5.json | 40 +-- .../clusters/parapide/nodes/parapide-6.json | 40 +-- .../clusters/parapide/nodes/parapide-7.json | 40 +-- .../clusters/parapide/nodes/parapide-8.json | 40 +-- .../clusters/parapide/nodes/parapide-9.json | 40 +-- .../clusters/parapluie/nodes/parapluie-1.json | 40 +-- .../parapluie/nodes/parapluie-11.json | 40 +-- .../parapluie/nodes/parapluie-12.json | 40 +-- .../parapluie/nodes/parapluie-15.json | 40 +-- .../parapluie/nodes/parapluie-19.json | 40 +-- .../clusters/parapluie/nodes/parapluie-2.json | 40 +-- .../parapluie/nodes/parapluie-20.json | 40 +-- .../parapluie/nodes/parapluie-21.json | 40 +-- .../parapluie/nodes/parapluie-22.json | 40 +-- .../parapluie/nodes/parapluie-25.json | 40 +-- .../parapluie/nodes/parapluie-28.json | 40 +-- .../parapluie/nodes/parapluie-31.json | 40 +-- .../parapluie/nodes/parapluie-32.json | 40 +-- .../parapluie/nodes/parapluie-35.json | 40 +-- .../parapluie/nodes/parapluie-38.json | 40 +-- .../clusters/parapluie/nodes/parapluie-9.json | 40 +-- .../clusters/parasilo/nodes/parasilo-1.json | 25 +- .../clusters/parasilo/nodes/parasilo-10.json | 25 +- .../clusters/parasilo/nodes/parasilo-11.json | 25 +- .../clusters/parasilo/nodes/parasilo-12.json | 25 +- .../clusters/parasilo/nodes/parasilo-13.json | 25 +- .../clusters/parasilo/nodes/parasilo-14.json | 25 +- .../clusters/parasilo/nodes/parasilo-15.json | 25 +- .../clusters/parasilo/nodes/parasilo-16.json | 5 - .../clusters/parasilo/nodes/parasilo-17.json | 25 +- .../clusters/parasilo/nodes/parasilo-18.json | 5 - .../clusters/parasilo/nodes/parasilo-19.json | 25 +- .../clusters/parasilo/nodes/parasilo-2.json | 25 +- .../clusters/parasilo/nodes/parasilo-20.json | 5 - .../clusters/parasilo/nodes/parasilo-21.json | 25 +- .../clusters/parasilo/nodes/parasilo-22.json | 25 +- .../clusters/parasilo/nodes/parasilo-23.json | 25 +- .../clusters/parasilo/nodes/parasilo-24.json | 25 +- .../clusters/parasilo/nodes/parasilo-25.json | 25 +- .../clusters/parasilo/nodes/parasilo-26.json | 25 +- .../clusters/parasilo/nodes/parasilo-27.json | 25 +- .../clusters/parasilo/nodes/parasilo-28.json | 25 +- .../clusters/parasilo/nodes/parasilo-3.json | 25 +- .../clusters/parasilo/nodes/parasilo-4.json | 25 +- .../clusters/parasilo/nodes/parasilo-5.json | 25 +- .../clusters/parasilo/nodes/parasilo-6.json | 25 +- .../clusters/parasilo/nodes/parasilo-7.json | 25 +- .../clusters/parasilo/nodes/parasilo-8.json | 5 - .../clusters/parasilo/nodes/parasilo-9.json | 5 - .../clusters/paravance/nodes/paravance-1.json | 5 - .../paravance/nodes/paravance-10.json | 25 +- .../paravance/nodes/paravance-11.json | 25 +- .../paravance/nodes/paravance-12.json | 25 +- .../paravance/nodes/paravance-13.json | 25 +- .../paravance/nodes/paravance-14.json | 25 +- .../paravance/nodes/paravance-15.json | 25 +- .../paravance/nodes/paravance-16.json | 25 +- .../paravance/nodes/paravance-17.json | 25 +- .../paravance/nodes/paravance-18.json | 25 +- .../paravance/nodes/paravance-19.json | 25 +- .../clusters/paravance/nodes/paravance-2.json | 5 - .../paravance/nodes/paravance-20.json | 25 +- .../paravance/nodes/paravance-21.json | 25 +- .../paravance/nodes/paravance-22.json | 25 +- .../paravance/nodes/paravance-23.json | 25 +- .../paravance/nodes/paravance-24.json | 25 +- .../paravance/nodes/paravance-25.json | 25 +- .../paravance/nodes/paravance-26.json | 25 +- .../paravance/nodes/paravance-27.json | 25 +- .../paravance/nodes/paravance-28.json | 25 +- .../paravance/nodes/paravance-29.json | 25 +- .../clusters/paravance/nodes/paravance-3.json | 25 +- .../paravance/nodes/paravance-30.json | 25 +- .../paravance/nodes/paravance-31.json | 25 +- .../paravance/nodes/paravance-32.json | 25 +- .../paravance/nodes/paravance-33.json | 25 +- .../paravance/nodes/paravance-34.json | 25 +- .../paravance/nodes/paravance-35.json | 25 +- .../paravance/nodes/paravance-36.json | 25 +- .../paravance/nodes/paravance-37.json | 25 +- .../paravance/nodes/paravance-38.json | 25 +- .../paravance/nodes/paravance-39.json | 25 +- .../clusters/paravance/nodes/paravance-4.json | 25 +- .../paravance/nodes/paravance-40.json | 25 +- .../paravance/nodes/paravance-41.json | 25 +- .../paravance/nodes/paravance-42.json | 25 +- .../paravance/nodes/paravance-43.json | 25 +- .../paravance/nodes/paravance-44.json | 25 +- .../paravance/nodes/paravance-45.json | 25 +- .../paravance/nodes/paravance-46.json | 25 +- .../paravance/nodes/paravance-47.json | 25 +- .../paravance/nodes/paravance-48.json | 25 +- .../paravance/nodes/paravance-49.json | 25 +- .../clusters/paravance/nodes/paravance-5.json | 25 +- .../paravance/nodes/paravance-50.json | 25 +- .../paravance/nodes/paravance-51.json | 25 +- .../paravance/nodes/paravance-52.json | 25 +- .../paravance/nodes/paravance-53.json | 25 +- .../paravance/nodes/paravance-54.json | 25 +- .../paravance/nodes/paravance-55.json | 25 +- .../paravance/nodes/paravance-56.json | 25 +- .../paravance/nodes/paravance-57.json | 25 +- .../paravance/nodes/paravance-58.json | 25 +- .../paravance/nodes/paravance-59.json | 25 +- .../clusters/paravance/nodes/paravance-6.json | 25 +- .../paravance/nodes/paravance-60.json | 25 +- .../paravance/nodes/paravance-61.json | 25 +- .../paravance/nodes/paravance-62.json | 25 +- .../paravance/nodes/paravance-63.json | 25 +- .../paravance/nodes/paravance-64.json | 25 +- .../paravance/nodes/paravance-65.json | 25 +- .../paravance/nodes/paravance-66.json | 25 +- .../paravance/nodes/paravance-67.json | 25 +- .../paravance/nodes/paravance-68.json | 25 +- .../paravance/nodes/paravance-69.json | 25 +- .../clusters/paravance/nodes/paravance-7.json | 25 +- .../paravance/nodes/paravance-70.json | 25 +- .../paravance/nodes/paravance-71.json | 25 +- .../paravance/nodes/paravance-72.json | 25 +- .../clusters/paravance/nodes/paravance-8.json | 25 +- .../clusters/paravance/nodes/paravance-9.json | 25 +- .../sites/rennes/pdus/parapluie-pdu-1.json | 17 -- .../sites/rennes/pdus/parapluie-pdu-2.json | 17 -- .../sites/rennes/pdus/parapluie-pdu-3.json | 17 -- .../sites/rennes/pdus/parapluie-pdu-4.json | 17 -- .../sites/rennes/pdus/parasilo-pdu-1.json | 16 -- .../sites/rennes/pdus/parasilo-pdu-2.json | 16 -- .../sites/rennes/pdus/parasilo-pdu-3.json | 16 -- .../sites/rennes/pdus/parasilo-pdu-4.json | 16 -- .../sites/rennes/pdus/paravance-pdu-2.json | 16 -- .../sites/rennes/pdus/paravance-pdu-3.json | 16 -- .../sites/rennes/pdus/paravance-pdu-4.json | 16 -- .../sites/rennes/pdus/paravance-pdu-5.json | 16 -- .../sites/rennes/pdus/paravance-pdu-6.json | 16 -- .../sites/rennes/pdus/paravance-pdu-7.json | 16 -- .../sites/rennes/pdus/paravance-pdu-8.json | 16 -- .../sophia/clusters/uvb/nodes/uvb-1.json | 5 - .../sophia/clusters/uvb/nodes/uvb-10.json | 5 - .../sophia/clusters/uvb/nodes/uvb-11.json | 5 - .../sophia/clusters/uvb/nodes/uvb-12.json | 5 - .../sophia/clusters/uvb/nodes/uvb-14.json | 5 - .../sophia/clusters/uvb/nodes/uvb-16.json | 5 - .../sophia/clusters/uvb/nodes/uvb-17.json | 5 - .../sophia/clusters/uvb/nodes/uvb-18.json | 5 - .../sophia/clusters/uvb/nodes/uvb-2.json | 5 - .../sophia/clusters/uvb/nodes/uvb-25.json | 5 - .../sophia/clusters/uvb/nodes/uvb-26.json | 5 - .../sophia/clusters/uvb/nodes/uvb-27.json | 5 - .../sophia/clusters/uvb/nodes/uvb-28.json | 5 - .../sophia/clusters/uvb/nodes/uvb-29.json | 5 - .../sophia/clusters/uvb/nodes/uvb-31.json | 5 - .../sophia/clusters/uvb/nodes/uvb-33.json | 5 - .../sophia/clusters/uvb/nodes/uvb-34.json | 5 - .../sophia/clusters/uvb/nodes/uvb-35.json | 5 - .../sophia/clusters/uvb/nodes/uvb-36.json | 5 - .../sophia/clusters/uvb/nodes/uvb-37.json | 5 - .../sophia/clusters/uvb/nodes/uvb-38.json | 5 - .../sophia/clusters/uvb/nodes/uvb-4.json | 5 - .../sophia/clusters/uvb/nodes/uvb-41.json | 5 - .../sophia/clusters/uvb/nodes/uvb-42.json | 5 - .../sophia/clusters/uvb/nodes/uvb-43.json | 5 - .../sophia/clusters/uvb/nodes/uvb-44.json | 5 - .../sophia/clusters/uvb/nodes/uvb-5.json | 5 - .../sophia/clusters/uvb/nodes/uvb-6.json | 5 - .../sophia/clusters/uvb/nodes/uvb-7.json | 5 - .../sophia/clusters/uvb/nodes/uvb-8.json | 5 - .../sophia/clusters/uvb/nodes/uvb-9.json | 5 - .../sites/grenoble/clusters/troll/troll.yaml | 11 - .../sites/grenoble/clusters/yeti/yeti.yaml | 11 - input/grid5000/sites/grenoble/pdus.yaml | 9 - .../sites/lille/clusters/chetemi/chetemi.yaml | 2 - .../sites/lille/clusters/chiclet/chiclet.yaml | 2 - .../lille/clusters/chifflet/chifflet.yaml | 2 - .../lille/clusters/chifflot/chifflot.yaml | 2 - input/grid5000/sites/lille/pdus.yaml | 34 --- .../sites/lille/servers/physical.yaml | 252 +++++------------- .../clusters/petitprince/petitprince.yaml | 2 - .../sites/lyon/clusters/gemini/gemini.yaml | 11 - .../sites/lyon/clusters/hercule/hercule.yaml | 11 - .../sites/lyon/clusters/nova/nova.yaml | 6 - .../sites/lyon/clusters/orion/orion.yaml | 11 - .../sites/lyon/clusters/pyxis/pyxis.yaml | 11 - .../lyon/clusters/sagittaire/sagittaire.yaml | 11 - .../sites/lyon/clusters/taurus/taurus.yaml | 11 - input/grid5000/sites/lyon/pdus.yaml | 18 -- .../nancy/clusters/graffiti/graffiti_pdu.yaml | 5 - .../nancy/clusters/graoully/graoully_pdu.yaml | 5 - .../nancy/clusters/graphique/graphique.yaml | 6 - .../clusters/graphique/graphique_pdu.yaml | 5 - .../nancy/clusters/graphite/graphite.yaml | 7 - .../nancy/clusters/graphite/graphite_pdu.yaml | 5 - .../sites/nancy/clusters/grappe/grappe.yaml | 10 +- .../nancy/clusters/grappe/grappe_pdu.yaml | 5 - .../sites/nancy/clusters/grcinq/grcinq.yaml | 7 - .../sites/nancy/clusters/grele/grele.yaml | 3 - .../sites/nancy/clusters/grele/grele_pdu.yaml | 5 - .../sites/nancy/clusters/grimani/grimani.yaml | 3 - .../nancy/clusters/grimani/grimani_pdu.yaml | 5 - .../nancy/clusters/grimoire/grimoire.yaml | 7 - .../nancy/clusters/grimoire/grimoire_pdu.yaml | 5 - .../sites/nancy/clusters/grisou/grisou.yaml | 6 - .../nancy/clusters/grisou/grisou_pdu.yaml | 6 - .../sites/nancy/clusters/gros/gros_pdu.yaml | 12 - .../sites/nancy/clusters/grvingt/grvingt.yaml | 7 - .../sites/nancy/networks/gw-nancy.yaml | 30 +-- .../sites/nancy/networks/sgraoullyib.yaml | 14 +- .../sites/nancy/networks/sgrele-opf.yaml | 18 +- .../sites/nancy/networks/sgrisou1.yaml | 14 +- input/grid5000/sites/nancy/pdus.yaml | 106 -------- .../grid5000/sites/nancy/servers/servers.yaml | 156 +++-------- .../nantes/clusters/econome/econome.yaml | 5 - .../rennes/clusters/paranoia/paranoia.yaml | 5 - .../rennes/clusters/parapide/parapide.yaml | 16 -- .../rennes/clusters/parapluie/parapluie.yaml | 18 -- .../clusters/parasilo/parasilo.yaml.erb | 7 - .../clusters/paravance/paravance.yaml.erb | 7 - input/grid5000/sites/rennes/pdus.yaml | 41 --- .../sites/sophia/clusters/uvb/uvb.yaml | 2 - 922 files changed, 4209 insertions(+), 16212 deletions(-) delete mode 100644 input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb delete mode 100644 input/grid5000/sites/rennes/clusters/paravance/paravance.yaml.erb diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json index 098858cf410..4632b2872d8 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json index 7a51fd599f5..f08ffad8caf 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json index 9cc80163e2c..4d25597c2e9 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json index 45e92e35dad..31fa842f084 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json index 5ef695b38a0..28954b0d29a 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json index b13749d4d29..9a040dfb257 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json index 95347d1140e..3a10f4b627e 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json index 0b1a779704a..e3192332c2a 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json index a042b0c9dc1..0e76585cd8d 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json index 05c4ff31e46..6c92271aa46 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json index 72da8ede584..6314be89ef9 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json index c5a7f43f489..1442c3d875f 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json index 8d0bb921cab..fe50f90a471 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json index 188b8512e62..e309d0d5634 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json index e5fc76ed7af..201ce7f5025 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json index 65cf777b50a..ab448347780 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json index 6cd428cc74c..c9fdd9f6652 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json index 449e0ca92d6..c0a440d60d9 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json index 6a5e465467c..7463de9a4e6 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json index 8d9d2aec744..f05070ccbf7 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json index a9ce5aed1d3..03b3f4a08d7 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json index 4974e1fb563..54dad5bec26 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json index 043e513dde4..109a1bb397b 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json index 714bfb02886..ecc92cd4279 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json index d15127da320..0826ad9f786 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json index 33df37cdde8..3325a8349d3 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json index 944b6cc81b2..b5cae371b5f 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json index 926c11bd448..11b43529f4d 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json index c0f14a5f605..6dfb9415254 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json index 87f902c0131..f8945422829 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json index 90b421d7a32..fe959de97aa 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json index 3f3a2a2daa9..58b7db7d536 100644 --- a/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json +++ b/data/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -164,8 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json index 8bad15a116a..68568f7d8b0 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json index ad835a473bd..7b9e13a30d1 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json index f6ec3b2ed86..f948adb6ca0 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json index 2b68279413a..fb7d44a6b76 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json index e941e39523f..7f078d472d2 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json index 15f06cd219c..7b83c4dddb2 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json index 3cded61ae84..cd5211c60be 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json index 72fe069fc91..399f3100e44 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json index ae1a630a682..c0270fef12a 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json index b2b5983d15f..34e79bbafe3 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json index ca06fcbe2c4..85f648cff84 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json index bd22ff44bec..3f687048868 100644 --- a/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json +++ b/data/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.json @@ -100,9 +100,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -281,8 +278,6 @@ "vendor": "IBM", "version": 1.0 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json index 8fd0d1a3c52..c01c8e69aa5 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.json @@ -64,9 +64,6 @@ "pmem_size": 1649267441664, "ram_size": 412316860416 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -146,6 +143,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 8, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 36800000000, "node_flops": 1177600000000 @@ -166,26 +169,6 @@ "vendor": "Intel", "version": "Gold 5218" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 8, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json index bd63d82c442..f077f06e2e7 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.json @@ -64,9 +64,6 @@ "pmem_size": 1649267441664, "ram_size": 412316860416 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -146,6 +143,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 36800000000, "node_flops": 1177600000000 @@ -166,26 +169,6 @@ "vendor": "Intel", "version": "Gold 5218" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json index 35768afd65e..45db7e1f4db 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.json @@ -64,9 +64,6 @@ "pmem_size": 1649267441664, "ram_size": 412316860416 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -146,6 +143,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 36800000000, "node_flops": 1177600000000 @@ -166,26 +169,6 @@ "vendor": "Intel", "version": "Gold 5218" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json index 8ed6255b57a..477c470ce99 100644 --- a/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json +++ b/data/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.json @@ -64,9 +64,6 @@ "pmem_size": 1649267441664, "ram_size": 412316860416 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -146,6 +143,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 36800000000, "node_flops": 1177600000000 @@ -166,26 +169,6 @@ "vendor": "Intel", "version": "Gold 5218" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json index b60260a46bf..d82e054e0b1 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -174,6 +171,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 0, + "uid": "wattmetre1" + }, + { + "port": 1, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 67200000000, "node_flops": 4300800000000 @@ -194,30 +201,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 0, - "uid": "wattmetre1" - }, - { - "port": 1, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://digwatt.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json index d20911e4df8..e1b2c2cb1f3 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -174,6 +171,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "wattmetre1" + }, + { + "port": 3, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 67200000000, "node_flops": 4300800000000 @@ -194,30 +201,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "wattmetre1" - }, - { - "port": 3, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://digwatt.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json index 7a73c5fc63d..a7e561dae9d 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -174,6 +171,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "wattmetre1" + }, + { + "port": 5, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 67200000000, "node_flops": 4300800000000 @@ -194,30 +201,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "wattmetre1" - }, - { - "port": 5, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://digwatt.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json index 1fc1ea4e7d5..b5aaed4db2a 100644 --- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json +++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -174,6 +171,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "wattmetre1" + }, + { + "port": 7, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 67200000000, "node_flops": 4300800000000 @@ -194,30 +201,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "wattmetre1" - }, - { - "port": 7, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://digwatt.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/grenoble/pdus/wattmetre1.json b/data/grid5000/sites/grenoble/pdus/wattmetre1.json index fc394894cb8..52455741d26 100644 --- a/data/grid5000/sites/grenoble/pdus/wattmetre1.json +++ b/data/grid5000/sites/grenoble/pdus/wattmetre1.json @@ -26,21 +26,6 @@ "8": "troll-1", "9": "troll-2" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "wattmetre": { - "available": true, - "unit": "W", - "www": { - "url": "http://digwatt.grenoble.grid5000.fr/GetWatts-json.php" - } - } - } - } - ], "type": "pdu", "uid": "wattmetre1", "vendor": "OmegaWatt" diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json index d5cb818cf4b..972bffe7f0a 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "pdu-b3p1" + }, + { + "port": 1, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 1, - "uid": "pdu-b3p1" - }, - { - "port": 1, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json index b179ca224bb..24a513ba5f6 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "pdu-b3p3" + }, + { + "port": 3, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 3, - "uid": "pdu-b3p3" - }, - { - "port": 3, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json index debe8c63863..e3ab382f2bc 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-b3p3" + }, + { + "port": 4, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 4, - "uid": "pdu-b3p3" - }, - { - "port": 4, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json index f6157e4b5f5..a9fb4332e61 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-b3p3" + }, + { + "port": 5, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 5, - "uid": "pdu-b3p3" - }, - { - "port": 5, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json index e6aaf2dc940..ef850d7deaa 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "pdu-b3p3" + }, + { + "port": 6, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 6, - "uid": "pdu-b3p3" - }, - { - "port": 6, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json index cb0094064bb..7cc3db61169 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-b3p3" + }, + { + "port": 7, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 7, - "uid": "pdu-b3p3" - }, - { - "port": 7, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json index 5b7e3869976..dff8aee7a97 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "pdu-b3p1" + }, + { + "port": 9, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 9, - "uid": "pdu-b3p1" - }, - { - "port": 9, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json index 8fe7667d1bf..02d9b7b6e27 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-b3p1" + }, + { + "port": 2, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 2, - "uid": "pdu-b3p1" - }, - { - "port": 2, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json index 4b26003f0b4..d0d937df693 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "pdu-b3p1" + }, + { + "port": 3, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 3, - "uid": "pdu-b3p1" - }, - { - "port": 3, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json index 44e4501acbe..77643d1689a 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-b3p1" + }, + { + "port": 4, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 4, - "uid": "pdu-b3p1" - }, - { - "port": 4, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json index 7abe39247e7..c82eab18acb 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-b3p1" + }, + { + "port": 5, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 5, - "uid": "pdu-b3p1" - }, - { - "port": 5, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json index eacd7b47538..95e2b95ba4d 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "pdu-b3p1" + }, + { + "port": 6, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 6, - "uid": "pdu-b3p1" - }, - { - "port": 6, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json index cc316c9bec4..1095f37e5af 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-b3p1" + }, + { + "port": 7, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 7, - "uid": "pdu-b3p1" - }, - { - "port": 7, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json index 36b7cc02ce7..5b766687d6b 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "pdu-b3p3" + }, + { + "port": 1, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 1, - "uid": "pdu-b3p3" - }, - { - "port": 1, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json index 1d102e24d7a..6038a58d1b6 100644 --- a/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json +++ b/data/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-b3p3" + }, + { + "port": 2, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 704000000000 @@ -219,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 2, - "uid": "pdu-b3p3" - }, - { - "port": 2, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json index e3ebdd437a0..6c5148f1e38 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-b1p1" + }, + { + "port": 6, + "uid": "pdu-b1p2" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 7, - "uid": "pdu-b1p1" - }, - { - "port": 6, - "uid": "pdu-b1p2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json index f1d9897a97e..72dd1fd13bb 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "pdu-b1p2" + }, + { + "port": 6, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 7, - "uid": "pdu-b1p2" - }, - { - "port": 6, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json index 655e9947550..31bcbdb70d0 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "pdu-b1p1" + }, + { + "port": 7, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 9, - "uid": "pdu-b1p1" - }, - { - "port": 7, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json index 5d9fd680b73..774e2ebf33e 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-b1p1" + }, + { + "port": 9, + "uid": "pdu-b1p2" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 10, - "uid": "pdu-b1p1" - }, - { - "port": 9, - "uid": "pdu-b1p2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json index 5654d5543e2..cba2764d7a0 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-b1p2" + }, + { + "port": 9, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 10, - "uid": "pdu-b1p2" - }, - { - "port": 9, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json index 185e4423806..9b10c8a01cb 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-b1p2" + }, + { + "port": 10, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 11, - "uid": "pdu-b1p2" - }, - { - "port": 10, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json index 3097b4c0f9e..709ba786017 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "pdu-b1p2" + }, + { + "port": 11, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 12, - "uid": "pdu-b1p2" - }, - { - "port": 11, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json index effbef79e66..bc6a22af4d6 100644 --- a/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json +++ b/data/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -229,6 +226,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-b1p1" + }, + { + "port": 12, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 563200000000 @@ -249,22 +256,6 @@ "vendor": "AMD", "version": 7301 }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 11, - "uid": "pdu-b1p1" - }, - { - "port": 12, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json index 3f2cb933e39..fe35452b63c 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-b3p1" + }, + { + "port": 10, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 10, - "uid": "pdu-b3p1" - }, - { - "port": 10, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json index 5e6bd0f3175..d28e1f5d2b4 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-b3p1" + }, + { + "port": 11, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 11, - "uid": "pdu-b3p1" - }, - { - "port": 11, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json index e1ffaca6c56..56e7604cf61 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "pdu-b3p1" + }, + { + "port": 12, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 12, - "uid": "pdu-b3p1" - }, - { - "port": 12, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json index 2496fe21059..f67dd1064f6 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "pdu-b3p1" + }, + { + "port": 13, + "uid": "pdu-b3p2-1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 13, - "uid": "pdu-b3p1" - }, - { - "port": 13, - "uid": "pdu-b3p2-1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json index 7e87392db26..f19f359bece 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "pdu-b3p3" + }, + { + "port": 9, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 9, - "uid": "pdu-b3p3" - }, - { - "port": 9, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json index 2c786068091..69f50e7b893 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "pdu-b3p3" + }, + { + "port": 10, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 10, - "uid": "pdu-b3p3" - }, - { - "port": 10, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json index 260d676401c..64986b9f54a 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "pdu-b3p3" + }, + { + "port": 11, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 11, - "uid": "pdu-b3p3" - }, - { - "port": 11, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json index 4cd295fea8d..658f3210bf9 100644 --- a/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json +++ b/data/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 824633720832 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -219,6 +216,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "pdu-b3p3" + }, + { + "port": 12, + "uid": "pdu-b3p2-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 1075200000000 @@ -239,22 +246,6 @@ "vendor": "Intel", "version": "E5-2680 v4" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 12, - "uid": "pdu-b3p3" - }, - { - "port": 12, - "uid": "pdu-b3p2-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json index 617c7629c63..23f3c56e4d6 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "pdu-b1p1" + }, + { + "port": 1, + "uid": "pdu-b1p2" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 1, - "uid": "pdu-b1p1" - }, - { - "port": 1, - "uid": "pdu-b1p2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json index 4df6b91d0da..252f8196b63 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-b1p2" + }, + { + "port": 1, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 2, - "uid": "pdu-b1p2" - }, - { - "port": 1, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json index 36ded6a7b6e..cf4acb0d0cb 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "pdu-b1p3" + }, + { + "port": 2, + "uid": "pdu-b1p1" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 2, - "uid": "pdu-b1p3" - }, - { - "port": 2, - "uid": "pdu-b1p1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json index 23d4e3cd175..2fda8ac065b 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "pdu-b1p1" + }, + { + "port": 3, + "uid": "pdu-b1p2" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 3, - "uid": "pdu-b1p1" - }, - { - "port": 3, - "uid": "pdu-b1p2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json index 6fe65e4c904..3bc73c3b0c6 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-b1p2" + }, + { + "port": 3, + "uid": "pdu-b1p3" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 4, - "uid": "pdu-b1p2" - }, - { - "port": 3, - "uid": "pdu-b1p3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json index d14533e67d1..aa6f867ae6a 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "pdu-b1p3" + }, + { + "port": 4, + "uid": "pdu-b1p1" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 4, - "uid": "pdu-b1p3" - }, - { - "port": 4, - "uid": "pdu-b1p1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json index d8087b48f6b..0d2141f700a 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-b1p1" + }, + { + "port": 5, + "uid": "pdu-b1p2" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 5, - "uid": "pdu-b1p1" - }, - { - "port": 5, - "uid": "pdu-b1p2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json index 9d7068808ae..7f6c3eac7ed 100644 --- a/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json +++ b/data/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.json @@ -121,9 +121,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -249,6 +246,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "pdu-b1p3" + }, + { + "port": 6, + "uid": "pdu-b1p1" + } + ], "performance": { "core_flops": 83200000000, "node_flops": 1996800000000 @@ -269,22 +276,6 @@ "vendor": "Intel", "version": "Gold 6126" }, - "sensors": { - "power": { - "via": { - "pdu": [ - { - "port": 5, - "uid": "pdu-b1p3" - }, - { - "port": 6, - "uid": "pdu-b1p1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lille/pdus/pdu-b1p1.json b/data/grid5000/sites/lille/pdus/pdu-b1p1.json index 75bf1a689ef..3a129391d81 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b1p1.json +++ b/data/grid5000/sites/lille/pdus/pdu-b1p1.json @@ -25,22 +25,6 @@ "7": "chiclet-1", "9": "chiclet-3" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b1p1", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b1p2.json b/data/grid5000/sites/lille/pdus/pdu-b1p2.json index 9cb0e9edb90..24f37783bc8 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b1p2.json +++ b/data/grid5000/sites/lille/pdus/pdu-b1p2.json @@ -26,22 +26,6 @@ "7": "chiclet-2", "9": "chiclet-4" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b1p2", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b1p3-2.json b/data/grid5000/sites/lille/pdus/pdu-b1p3-2.json index da79ceeb7df..e98153d17ca 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b1p3-2.json +++ b/data/grid5000/sites/lille/pdus/pdu-b1p3-2.json @@ -15,22 +15,6 @@ "model": "AP8659", "ports": { }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b1p3-2", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b1p3.json b/data/grid5000/sites/lille/pdus/pdu-b1p3.json index 085156d427d..75235a96501 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b1p3.json +++ b/data/grid5000/sites/lille/pdus/pdu-b1p3.json @@ -26,22 +26,6 @@ "7": "chiclet-3", "9": "chiclet-5" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b1p3", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b2p1.json b/data/grid5000/sites/lille/pdus/pdu-b2p1.json index 8bcb76f3ce8..1921f70318f 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b2p1.json +++ b/data/grid5000/sites/lille/pdus/pdu-b2p1.json @@ -15,22 +15,6 @@ "model": "AP8659", "ports": { }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b2p1", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b2p2.json b/data/grid5000/sites/lille/pdus/pdu-b2p2.json index ef3526da163..214a3493dee 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b2p2.json +++ b/data/grid5000/sites/lille/pdus/pdu-b2p2.json @@ -15,22 +15,6 @@ "model": "AP8659", "ports": { }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b2p2", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b3p1.json b/data/grid5000/sites/lille/pdus/pdu-b3p1.json index 1c13667ee9e..8c7d1bf94bf 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b3p1.json +++ b/data/grid5000/sites/lille/pdus/pdu-b3p1.json @@ -27,22 +27,6 @@ "7": "chetemi-7", "9": "chetemi-15" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b3p1", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b3p2-1.json b/data/grid5000/sites/lille/pdus/pdu-b3p2-1.json index a9b1a9ea788..9626a90a7ba 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b3p2-1.json +++ b/data/grid5000/sites/lille/pdus/pdu-b3p2-1.json @@ -27,22 +27,6 @@ "7": "chetemi-7", "9": "chetemi-15" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b3p2-1", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b3p2-2.json b/data/grid5000/sites/lille/pdus/pdu-b3p2-2.json index 59b055e42d6..6037c5beea3 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b3p2-2.json +++ b/data/grid5000/sites/lille/pdus/pdu-b3p2-2.json @@ -26,22 +26,6 @@ "7": "chetemi-14", "9": "chifflet-5" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "pdu-b3p2-2", "vendor": "APC" diff --git a/data/grid5000/sites/lille/pdus/pdu-b3p3.json b/data/grid5000/sites/lille/pdus/pdu-b3p3.json index 0b4bf6b5770..cd4f00d8df3 100644 --- a/data/grid5000/sites/lille/pdus/pdu-b3p3.json +++ b/data/grid5000/sites/lille/pdus/pdu-b3p3.json @@ -15,13 +15,6 @@ "7": "chetemi-14", "9": "chifflet-5" }, - "sensors": [ - { - "power": { - "per_outlets": false - } - } - ], "type": "pdu", "uid": "pdu-b3p3", "vendor": "APC" diff --git a/data/grid5000/sites/lille/servers/carbonade.json b/data/grid5000/sites/lille/servers/carbonade.json index 7997eebc68d..e4c8f0bfefb 100644 --- a/data/grid5000/sites/lille/servers/carbonade.json +++ b/data/grid5000/sites/lille/servers/carbonade.json @@ -1,10 +1,6 @@ { "alias": null, "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "adm": { "ip": "172.17.47.12", @@ -19,28 +15,16 @@ "mac": "d4:ae:52:ad:84:68" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 5, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 5, - "uid": "pdu-b2p1" - }, - { - "port": 5, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 5, + "uid": "pdu-b2p2" } - }, + ], "serial": "2VTTD5J", "type": "server", "uid": "carbonade", diff --git a/data/grid5000/sites/lille/servers/caulier.json b/data/grid5000/sites/lille/servers/caulier.json index 672051e3f4d..8768fad3d15 100644 --- a/data/grid5000/sites/lille/servers/caulier.json +++ b/data/grid5000/sites/lille/servers/caulier.json @@ -1,10 +1,6 @@ { "alias": null, "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "adm": { "ip": "172.17.47.7", @@ -19,28 +15,16 @@ "mac": "d4:ae:52:b1:45:b1" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 2, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 2, - "uid": "pdu-b2p1" - }, - { - "port": 2, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 2, + "uid": "pdu-b2p2" } - }, + ], "serial": "BQ9WD5J", "type": "server", "uid": "caulier", diff --git a/data/grid5000/sites/lille/servers/chimint-srv2.json b/data/grid5000/sites/lille/servers/chimint-srv2.json index 1dbaad5ca42..6aa1a6ebd00 100644 --- a/data/grid5000/sites/lille/servers/chimint-srv2.json +++ b/data/grid5000/sites/lille/servers/chimint-srv2.json @@ -1,38 +1,22 @@ { "alias": null, "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.46.3", "mac": "b8:ac:6f:96:8f:54" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 15, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 15, - "uid": "pdu-b2p1" - }, - { - "port": 15, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 15, + "uid": "pdu-b2p2" } - }, + ], "serial": "HFY6Z4J", "type": "server", "uid": "chimint-srv2", diff --git a/data/grid5000/sites/lille/servers/chiterne.json b/data/grid5000/sites/lille/servers/chiterne.json index fe4da8a78e0..f1b8b7a7407 100644 --- a/data/grid5000/sites/lille/servers/chiterne.json +++ b/data/grid5000/sites/lille/servers/chiterne.json @@ -1,9 +1,5 @@ { "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.46.10", @@ -14,28 +10,16 @@ "mac": "24:6e:96:67:5d:a0" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 9, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 9, - "uid": "pdu-b2p1" - }, - { - "port": 9, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 9, + "uid": "pdu-b2p2" } - }, + ], "serial": "JH5RS62", "type": "server", "uid": "chiterne", diff --git a/data/grid5000/sites/lille/servers/fives.json b/data/grid5000/sites/lille/servers/fives.json index c44e81128ae..2917b75f741 100644 --- a/data/grid5000/sites/lille/servers/fives.json +++ b/data/grid5000/sites/lille/servers/fives.json @@ -1,37 +1,21 @@ { "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.46.8", "mac": "44:a8:42:20:c1:9a" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 4, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 4, - "uid": "pdu-b2p1" - }, - { - "port": 4, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 4, + "uid": "pdu-b2p2" } - }, + ], "serial": "CQ9WD5J", "type": "server", "uid": "fives", diff --git a/data/grid5000/sites/lille/servers/flandres.json b/data/grid5000/sites/lille/servers/flandres.json index a942eaa6bbb..4cebd9b5e9b 100644 --- a/data/grid5000/sites/lille/servers/flandres.json +++ b/data/grid5000/sites/lille/servers/flandres.json @@ -1,10 +1,6 @@ { "alias": null, "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "adm": { "ip": "172.17.47.5", @@ -19,28 +15,16 @@ "mac": "d4:ae:52:b0:e2:c6" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 3, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 3, - "uid": "pdu-b2p1" - }, - { - "port": 3, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 3, + "uid": "pdu-b2p2" } - }, + ], "serial": "9Q9WD5J", "type": "server", "uid": "flandres", diff --git a/data/grid5000/sites/lille/servers/gardin.json b/data/grid5000/sites/lille/servers/gardin.json index ccfac0ec236..8873b7166aa 100644 --- a/data/grid5000/sites/lille/servers/gardin.json +++ b/data/grid5000/sites/lille/servers/gardin.json @@ -1,37 +1,21 @@ { "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.46.9", "mac": "54:48:10:f4:f9:0c" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 13, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 13, - "uid": "pdu-b2p1" - }, - { - "port": 13, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 13, + "uid": "pdu-b2p2" } - }, + ], "serial": "2SYTKQ2", "type": "server", "uid": "gardin", diff --git a/data/grid5000/sites/lille/servers/granche-srv1.json b/data/grid5000/sites/lille/servers/granche-srv1.json index 3961e0e5dc6..2fb32539159 100644 --- a/data/grid5000/sites/lille/servers/granche-srv1.json +++ b/data/grid5000/sites/lille/servers/granche-srv1.json @@ -8,10 +8,6 @@ "size": 90000000000000 }, "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.46.14", @@ -22,28 +18,16 @@ "mac": "3C:FD:FE:B9:91:30" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 11, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 11, - "uid": "pdu-b2p1" - }, - { - "port": 11, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 11, + "uid": "pdu-b2p2" } - }, + ], "serial": "2STSKQ2", "type": "server", "uid": "granche-srv1", diff --git a/data/grid5000/sites/lille/servers/granche-srv2.json b/data/grid5000/sites/lille/servers/granche-srv2.json index 3523ee383c0..9476fe235da 100644 --- a/data/grid5000/sites/lille/servers/granche-srv2.json +++ b/data/grid5000/sites/lille/servers/granche-srv2.json @@ -9,10 +9,6 @@ "size": 90000000000000 }, "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.46.15", @@ -23,28 +19,16 @@ "mac": "3C:FD:FE:B9:9A:10" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 10, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 10, - "uid": "pdu-b2p1" - }, - { - "port": 10, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 10, + "uid": "pdu-b2p2" } - }, + ], "serial": "2SVQKQ2", "type": "server", "uid": "granche-srv2", diff --git a/data/grid5000/sites/lille/servers/gwol-north.json b/data/grid5000/sites/lille/servers/gwol-north.json index db86b63bbd6..7a7cad310ab 100644 --- a/data/grid5000/sites/lille/servers/gwol-north.json +++ b/data/grid5000/sites/lille/servers/gwol-north.json @@ -1,37 +1,21 @@ { "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.46.4", "mac": "54:48:10:f4:f5:ca" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 14, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 14, - "uid": "pdu-b2p1" - }, - { - "port": 14, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 14, + "uid": "pdu-b2p2" } - }, + ], "serial": "2SSSKQ2", "type": "server", "uid": "gwol-north", diff --git a/data/grid5000/sites/lille/servers/srv-data.json b/data/grid5000/sites/lille/servers/srv-data.json index 8a812e6c520..72cfdb0add0 100644 --- a/data/grid5000/sites/lille/servers/srv-data.json +++ b/data/grid5000/sites/lille/servers/srv-data.json @@ -4,10 +4,6 @@ "public" ], "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "adm": { "ip": "172.17.47.11", @@ -22,28 +18,16 @@ "mac": "ec:f4:bb:c8:08:d4" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 7, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 7, - "uid": "pdu-b2p1" - }, - { - "port": 7, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 7, + "uid": "pdu-b2p2" } - }, + ], "serial": "5Z4B032", "type": "server", "uid": "srv-data", diff --git a/data/grid5000/sites/lille/servers/welsh.json b/data/grid5000/sites/lille/servers/welsh.json index df679818c0b..74795923da7 100644 --- a/data/grid5000/sites/lille/servers/welsh.json +++ b/data/grid5000/sites/lille/servers/welsh.json @@ -5,10 +5,6 @@ "adminfront" ], "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "adm": { "ip": "172.17.47.1", @@ -23,28 +19,16 @@ "mac": "24:6e:96:2c:9a:40" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 6, + "uid": "pdu-b2p1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 6, - "uid": "pdu-b2p1" - }, - { - "port": 6, - "uid": "pdu-b2p2" - } - ] - } + { + "port": 6, + "uid": "pdu-b2p2" } - }, + ], "serial": "5L2DLG2", "type": "server", "uid": "welsh", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json index 5aee03deeb1..7d341966645 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json index 84d0afee3c2..56a664991b7 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json index 9fd338f81b5..80531697682 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json index e93ec1f1316..8bec36fa0ef 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json index bd6a7322215..a5c86cb789d 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json index e67c4d8d069..6b6cff51f00 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json index 4785bf243e0..d6e5068ab3d 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json index c59882720dd..6842ff05f45 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json index 3eae1811729..def338d55c7 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json index c02a094be2a..02231938624 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json index d2c515b5e74..b839c487d7a 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json index fded36ee454..9c10ac9ea5a 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json index 6f8f2ac393d..99b09164126 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json index 9cc775da788..96450d4e7d9 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json index eef29953af7..29933148abc 100644 --- a/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json +++ b/data/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -193,8 +190,6 @@ "vendor": "Intel", "version": "E5-2630L" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json index 4a8aad6072c..9243d6685de 100644 --- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json +++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json @@ -137,9 +137,6 @@ "main_memory": { "ram_size": 549755813888 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -271,6 +268,24 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 33, + "uid": "wattmetre1" + }, + { + "port": 32, + "uid": "wattmetre1" + }, + { + "port": 31, + "uid": "wattmetre1" + }, + { + "port": 30, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 1408000000000 @@ -291,38 +306,6 @@ "vendor": "Intel", "version": "E5-2698 v4" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 33, - "uid": "wattmetre1" - }, - { - "port": 32, - "uid": "wattmetre1" - }, - { - "port": 31, - "uid": "wattmetre1" - }, - { - "port": 30, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json index 2f78b7a808c..2e55ddc5749 100644 --- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json +++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json @@ -137,9 +137,6 @@ "main_memory": { "ram_size": 549755813888 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -271,6 +268,24 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 28, + "uid": "wattmetre1" + }, + { + "port": 27, + "uid": "wattmetre1" + }, + { + "port": 29, + "uid": "wattmetre1" + }, + { + "port": 26, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 1408000000000 @@ -291,38 +306,6 @@ "vendor": "Intel", "version": "E5-2698 v4" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 28, - "uid": "wattmetre1" - }, - { - "port": 27, - "uid": "wattmetre1" - }, - { - "port": 29, - "uid": "wattmetre1" - }, - { - "port": 26, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json index 70a22a01fda..c29e2ea06f8 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": false, @@ -179,20 +176,6 @@ "vendor": "Intel", "version": "E5-2620" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "pdu_shared" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json index e4590387f05..b2034326f23 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": false, @@ -179,20 +176,6 @@ "vendor": "Intel", "version": "E5-2620" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "pdu_shared" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json index 8ae5d2210ae..16d50c00d8a 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": false, @@ -179,20 +176,6 @@ "vendor": "Intel", "version": "E5-2620" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "pdu_shared" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json index e7b4b554f88..f8247789cfb 100644 --- a/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json +++ b/data/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": false, @@ -179,20 +176,6 @@ "vendor": "Intel", "version": "E5-2620" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "pdu_shared" - }, - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json index f688987fcbe..40f3f5eb69f 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json index ebadb8c9d23..6a638497933 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json index a61ae23bc36..dc784073a22 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json index c1b13d0c83b..df153368634 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json index dd402d23f67..206e9b87328 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json index 5892f1cfd38..8f7907c9230 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json index acfb547bbef..a7a990c2c3b 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json index 50ca50f35d2..440a0c55dba 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json index ec1e3503535..2d31493bb88 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-17.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json index 8de036a2729..fe08405487e 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-18.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json index 2aeb85c4533..5c8ffcc031c 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-19.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json index a65f92b6959..56dcb53ca09 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json index 5ec8f750d21..d64b17a1a8f 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-20.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json index 3d444a64a41..e7df6ec6c78 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-21.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json index c04ec06fc1e..47107724d3a 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-22.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json index 35c7da2a916..07ba681bc1f 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-23.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json index 5ea58ef55ef..704ea449cbc 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json index dbc9ebea00a..500af22d8f7 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json index 1d33b0562f1..c4682882f28 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json index 2673cb7bf27..a543f6a9171 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json index 014beabd18d..2e0f0a077d0 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json index a7b324abbca..3b18430f3c6 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json index c84e8436277..374b78bfc3c 100644 --- a/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json +++ b/data/grid5000/sites/lyon/clusters/nova/nodes/nova-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -211,12 +208,6 @@ "vendor": "Intel", "version": "E5-2620 v4" }, - "sensors": { - "power": { - "available": false, - "per_outlets": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json index d3c3fd73bda..fb4e8aadcb5 100644 --- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json +++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-1.json @@ -75,9 +75,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 16, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -223,26 +226,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 16, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json index 259817b25d7..17d21b21046 100644 --- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json +++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-2.json @@ -75,9 +75,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -223,26 +226,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json index ad6f01f4322..9adf180f0dc 100644 --- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json +++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-3.json @@ -75,9 +75,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -223,26 +226,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json index b55d7360bf7..6339abea874 100644 --- a/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json +++ b/data/grid5000/sites/lyon/clusters/orion/nodes/orion-4.json @@ -75,9 +75,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -223,26 +226,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json index 8a5ddeceed8..0426ba468df 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -144,6 +141,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 45, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 1126400000000 @@ -164,26 +167,6 @@ "vendor": "Cavium", "version": "99xx" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 45, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json index 258df8839cd..811e4ace80f 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -144,6 +141,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 24, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 1126400000000 @@ -164,26 +167,6 @@ "vendor": "Cavium", "version": "99xx" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 24, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json index cea4f5df958..5b6b09dee1e 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -144,6 +141,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 25, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 1126400000000 @@ -164,26 +167,6 @@ "vendor": "Cavium", "version": "99xx" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 25, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json index 436373ae959..bcb878853aa 100644 --- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json +++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 274877906944 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "device": "eth0", @@ -144,6 +141,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 35, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 17600000000, "node_flops": 1126400000000 @@ -164,26 +167,6 @@ "vendor": "Cavium", "version": "99xx" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 35, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json index 19b974c2f8b..f455ec953a7 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 7, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json index 9d40714aa06..bb55a66c531 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 8, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 8, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json index 1f59d0e4e3c..da2f51877fa 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 9, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json index a6173dbc1cd..954efaef35e 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 10, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json index 40523116a1c..32328fbfb72 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 11, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json index 4d9b9a635b5..81422acced6 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 12, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json index 73b2cb457c6..a4bd2dfd07b 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 13, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json index d5ecc7fa892..bfc29860c5d 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 14, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json index ef2348a9983..7de9b6f08f9 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 1, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json index 0e267b293b6..cc6ed3ce436 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 16, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 16, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json index b534df08a07..5ef53b004e3 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-24.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 17, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json index 29667a19ed3..399566ca8db 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-27.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 18, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json index ff695becc92..d1e8720b537 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-29.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 19, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json index 6dd2343bee5..f7c04cc4416 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 2, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json index fd811ab3e48..046f600649c 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-30.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 20, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json index 911526e6d21..e557c69cb74 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 3, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json index 1ee670872eb..5d726909e9b 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 4, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json index 62c98c78317..16c1d5e2461 100644 --- a/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json +++ b/data/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 2147483648 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -128,6 +125,12 @@ "pstate_governor": "none", "turboboost_enabled": false }, + "pdu": [ + { + "port": 5, + "uid": "wattmetre1" + } + ], "performance": { "core_flops": 4800000000, "node_flops": 9600000000 @@ -148,26 +151,6 @@ "vendor": "AMD", "version": 250 }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "wattmetre1" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json index e2a3e2749bd..85099842804 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 0, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 0, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json index c1d7d376ed0..48bc7a3163b 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json index 4afbe96062a..061d2dd8793 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json index b1e656548cd..526a73031e9 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json index e03ee8aec2b..955a0c40ff3 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json index b9e735dc5e7..ca744066e81 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json index 7e859437cec..43147db099a 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json index 1271ea231d8..f6c9055a2c1 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json index aa73ad2a8b7..197c4fd655d 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json index a3001bc4700..e4a3790669a 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json index 046f6df1ea5..aa8adf26cb5 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json index 696240fc5bc..c778c241c8b 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json index 516cba127da..26f55596d1b 100644 --- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json +++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 34359738368 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -191,6 +188,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 8, + "uid": "wattmetre4" + } + ], "performance": { "core_flops": 18400000000, "node_flops": 220800000000 @@ -211,26 +214,6 @@ "vendor": "Intel", "version": "E5-2630" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 8, - "uid": "wattmetre4" - } - ], - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/lyon/pdus/wattmetre1.json b/data/grid5000/sites/lyon/pdus/wattmetre1.json index 55600e42a5e..c0c6adf9ee1 100644 --- a/data/grid5000/sites/lyon/pdus/wattmetre1.json +++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json @@ -44,21 +44,6 @@ "8": "sagittaire-12", "9": "sagittaire-13" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "wattmetre": { - "available": true, - "unit": "W", - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - } - ], "type": "pdu", "uid": "wattmetre1", "vendor": "OmegaWatt" diff --git a/data/grid5000/sites/lyon/pdus/wattmetre4.json b/data/grid5000/sites/lyon/pdus/wattmetre4.json index 0d63b291698..1dfaa9b9ac9 100644 --- a/data/grid5000/sites/lyon/pdus/wattmetre4.json +++ b/data/grid5000/sites/lyon/pdus/wattmetre4.json @@ -31,21 +31,6 @@ "8": "taurus-9", "9": "taurus-10" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "wattmetre": { - "available": true, - "unit": "W", - "www": { - "url": "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" - } - } - } - } - ], "type": "pdu", "uid": "wattmetre4", "vendor": "OmegaWatt" diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json index d3489b75e5c..c43a6bfa64e 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "graffiti-pdu1" + }, + { + "port": 1, + "uid": "graffiti-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "graffiti-pdu1" - }, - { - "port": 1, - "uid": "graffiti-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json index c5c62781740..fbd71115ed9 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "graffiti-pdu3" + }, + { + "port": 7, + "uid": "graffiti-pdu4" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "graffiti-pdu3" - }, - { - "port": 7, - "uid": "graffiti-pdu4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json index 579c3d660db..1aca9459497 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "graffiti-pdu3" + }, + { + "port": 13, + "uid": "graffiti-pdu4" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "graffiti-pdu3" - }, - { - "port": 13, - "uid": "graffiti-pdu4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json index 6da881f6b54..083caae83dc 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "graffiti-pdu3" + }, + { + "port": 17, + "uid": "graffiti-pdu4" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "graffiti-pdu3" - }, - { - "port": 17, - "uid": "graffiti-pdu4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json index b5ff8296c4f..57fa400eae5 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "graffiti-pdu3" + }, + { + "port": 21, + "uid": "graffiti-pdu4" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "graffiti-pdu3" - }, - { - "port": 21, - "uid": "graffiti-pdu4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json index 2fbbe80c438..efe0ebfce1d 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "graffiti-pdu1" + }, + { + "port": 6, + "uid": "graffiti-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "graffiti-pdu1" - }, - { - "port": 6, - "uid": "graffiti-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json index 45431e16361..da2206dad2d 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "graffiti-pdu1" + }, + { + "port": 7, + "uid": "graffiti-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "graffiti-pdu1" - }, - { - "port": 7, - "uid": "graffiti-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json index 5a43f7d4055..927a81eba77 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "graffiti-pdu1" + }, + { + "port": 14, + "uid": "graffiti-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "graffiti-pdu1" - }, - { - "port": 14, - "uid": "graffiti-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json index f6a614af2d2..6ef9eb48599 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "graffiti-pdu1" + }, + { + "port": 15, + "uid": "graffiti-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "graffiti-pdu1" - }, - { - "port": 15, - "uid": "graffiti-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json index e43b56a43ff..7269271e482 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "graffiti-pdu1" + }, + { + "port": 21, + "uid": "graffiti-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "graffiti-pdu1" - }, - { - "port": 21, - "uid": "graffiti-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json index 56165b86ae0..ea420c41c44 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 23, + "uid": "graffiti-pdu1" + }, + { + "port": 23, + "uid": "graffiti-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 23, - "uid": "graffiti-pdu1" - }, - { - "port": 23, - "uid": "graffiti-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json index b79ea5468d5..1a13031ad69 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "graffiti-pdu3" + }, + { + "port": 3, + "uid": "graffiti-pdu4" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "graffiti-pdu3" - }, - { - "port": 3, - "uid": "graffiti-pdu4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json index c97d896d308..7c17a22649d 100644 --- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json +++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": false, @@ -196,6 +193,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "graffiti-pdu3" + }, + { + "port": 5, + "uid": "graffiti-pdu4" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 537600000000 @@ -216,26 +223,6 @@ "vendor": "Intel", "version": "Silver 4110" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "graffiti-pdu3" - }, - { - "port": 5, - "uid": "graffiti-pdu4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json index 8a9a44a8564..62cf0c90923 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json index 0a086bc584f..05a7884fb81 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json index 4bd99cac031..4964cfa7db1 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json index e101d542b9e..2d6f5521161 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json index 7e07e304ea1..7e7175fbb32 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json index 70c29bf1f6e..3fe553a4c52 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json index b07adf35458..c48c10922d0 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json index 95c97931d0b..d24ec0dbad5 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json index 39be30866f4..f39a2c9da83 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json index 4d6318bf363..ed438deebf1 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json index efc340a0eb5..e73367817ce 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json index 6078bedaec7..3c2ba024d0d 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json index 1176b6db025..bb560b821f9 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json index 487598e20e8..45c54d517c2 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json index 4c9c8f6ef46..17dc8a1603e 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json index 79c300692e7..362f0f795ad 100644 --- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json +++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -215,6 +212,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -235,22 +238,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json index 3bd77345d1d..1a591d386f1 100644 --- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json +++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -200,6 +197,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "graoully-pdu1" + }, + { + "port": 5, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 460800000000 @@ -220,26 +227,6 @@ "vendor": "Intel", "version": "E5-2620 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "graoully-pdu1" - }, - { - "port": 5, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json index 96b15ead7ca..25cb9dbb694 100644 --- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json +++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -200,6 +197,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "graoully-pdu1" + }, + { + "port": 23, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 460800000000 @@ -220,26 +227,6 @@ "vendor": "Intel", "version": "E5-2620 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "graoully-pdu1" - }, - { - "port": 23, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json index cda8aaa46f4..51f3fb5cdcc 100644 --- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json +++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -200,6 +197,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "graoully-pdu1" + }, + { + "port": 17, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 460800000000 @@ -220,26 +227,6 @@ "vendor": "Intel", "version": "E5-2620 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "graoully-pdu1" - }, - { - "port": 17, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json index 7f2bc887ddb..ed2b3b51ee0 100644 --- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json +++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -200,6 +197,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "graoully-pdu2" + }, + { + "port": 7, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 460800000000 @@ -220,26 +227,6 @@ "vendor": "Intel", "version": "E5-2620 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "graoully-pdu2" - }, - { - "port": 7, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json index f03609947e0..15901cde9ac 100644 --- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json +++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -200,6 +197,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "grimoire-pdu1" + }, + { + "port": 17, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 460800000000 @@ -220,26 +227,6 @@ "vendor": "Intel", "version": "E5-2620 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "grimoire-pdu1" - }, - { - "port": 17, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json index 0c28cefdb03..a4b67e7a5ba 100644 --- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json +++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -200,6 +197,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "graoully-pdu1" + }, + { + "port": 18, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 460800000000 @@ -220,26 +227,6 @@ "vendor": "Intel", "version": "E5-2620 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "graoully-pdu1" - }, - { - "port": 18, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json index 2506718d694..d34e32ae495 100644 --- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json +++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json @@ -72,9 +72,6 @@ "mic_model": "7120P", "mic_vendor": "Intel Xeon Phi" }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -197,6 +194,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "graoully-pdu1" + }, + { + "port": 1, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 16000000000, "node_flops": 256000000000 @@ -217,26 +224,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "graoully-pdu1" - }, - { - "port": 1, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json index f5493cbed8e..5e77f1a4fa4 100644 --- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json +++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json @@ -72,9 +72,6 @@ "mic_model": "7120P", "mic_vendor": "Intel Xeon Phi" }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -197,6 +194,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "graoully-pdu1" + }, + { + "port": 2, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 16000000000, "node_flops": 256000000000 @@ -217,26 +224,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "graoully-pdu1" - }, - { - "port": 2, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json index 74536cb08f9..d6c05f341dc 100644 --- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json +++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json @@ -72,9 +72,6 @@ "mic_model": "7120P", "mic_vendor": "Intel Xeon Phi" }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -197,6 +194,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "graoully-pdu1" + }, + { + "port": 3, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 16000000000, "node_flops": 256000000000 @@ -217,26 +224,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "graoully-pdu1" - }, - { - "port": 3, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json index 8a444788711..dd774a8a008 100644 --- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json +++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json @@ -72,9 +72,6 @@ "mic_model": "7120P", "mic_vendor": "Intel Xeon Phi" }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -197,6 +194,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "graoully-pdu1" + }, + { + "port": 4, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 16000000000, "node_flops": 256000000000 @@ -217,26 +224,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "graoully-pdu1" - }, - { - "port": 4, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 ec9d137e94e..43260662e36 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "grappe-pdu1" + }, + { + "port": 4, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "grappe-pdu1" - }, - { - "port": 4, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 b390fce7c87..e15911dc336 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "grappe-pdu1" + }, + { + "port": 15, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "grappe-pdu1" - }, - { - "port": 15, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 9abbc6719fd..0b8be549bf1 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 16, + "uid": "grappe-pdu1" + }, + { + "port": 16, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 16, - "uid": "grappe-pdu1" - }, - { - "port": 16, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 f113b5ee01d..846e3c1b7c2 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "grappe-pdu1" + }, + { + "port": 17, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "grappe-pdu1" - }, - { - "port": 17, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 5e688516d82..126e76069b5 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "grappe-pdu1" + }, + { + "port": 18, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "grappe-pdu1" - }, - { - "port": 18, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 7e478f85415..e0616def418 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "grappe-pdu1" + }, + { + "port": 19, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "grappe-pdu1" - }, - { - "port": 19, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 11d39423a7e..d831e9c076c 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "grappe-pdu1" + }, + { + "port": 20, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "grappe-pdu1" - }, - { - "port": 20, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 f95308e9516..4ef863e63f0 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "grappe-pdu1" + }, + { + "port": 22, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "grappe-pdu1" - }, - { - "port": 22, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 128b4a9c06f..a4c9b3a9aa3 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "grappe-pdu1" + }, + { + "port": 5, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "grappe-pdu1" - }, - { - "port": 5, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 e3613cbf770..9c6f7b65c2f 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "grappe-pdu1" + }, + { + "port": 7, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "grappe-pdu1" - }, - { - "port": 7, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 a744212395f..16090a17b34 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 8, + "uid": "grappe-pdu1" + }, + { + "port": 8, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 8, - "uid": "grappe-pdu1" - }, - { - "port": 8, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 cb00a9ab829..543588d89d2 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "grappe-pdu1" + }, + { + "port": 9, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "grappe-pdu1" - }, - { - "port": 9, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 c5c186ecb2e..9cd04c1a0cb 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "grappe-pdu1" + }, + { + "port": 10, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "grappe-pdu1" - }, - { - "port": 10, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 bc23946cb67..3da702472f7 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "grappe-pdu1" + }, + { + "port": 11, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "grappe-pdu1" - }, - { - "port": 11, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 86938d46a84..2faf9cf52c4 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "grappe-pdu1" + }, + { + "port": 12, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "grappe-pdu1" - }, - { - "port": 12, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 c93164f5bea..398e9eb26e6 100644 --- a/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json +++ b/data/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -184,6 +181,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "grappe-pdu1" + }, + { + "port": 14, + "uid": "grappe-pdu2" + } + ], "performance": { "core_flops": 33600000000, "node_flops": 1344000000000 @@ -204,30 +211,6 @@ "vendor": "Intel", "version": "Gold 5218R" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "grappe-pdu1" - }, - { - "port": 14, - "uid": "grappe-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json index 6d0912a5cb2..13f56efe676 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json index 6137b296cf8..9c593fe79b7 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json index 16b5a71f937..a482dae1890 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json index eed103825c5..facf4592fad 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json index 864f28b45f7..9a8805122ee 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json index 985cacc6c26..21cca2c4714 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json index ff88e517d05..81df097b864 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json index e603235b6cb..8251a895f09 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json index 81b5ce6962d..8cf1325ef71 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json index d966d91468c..dcdf17e88a4 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json index 24f90ca5b92..45be5ae3730 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json index 9f1a8d170dc..775ea9f0bca 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json index f755d247155..7d82c2569ff 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json index bfa4dbd7e73..7b159b80595 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json index ec6975f9b3c..2e1f4824e49 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json index c0ee3fa14fb..b5168c703d1 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json index 5739d362bb8..7864cd95f71 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json index 7fdb1df5229..70e4497ee83 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json index 0f8785a8dce..20eddc7394c 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json index 88ccfda1278..04b17ec1868 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json index 6a79db631f3..cd69b74e203 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json index 76e18a6c28f..f0d59783dda 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json index f072615a535..3c751ba5e4d 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json index 01565bd1a85..ba06baa6da0 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json index a630198d5ad..ed4bb9d3a9c 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json index 0a90f3ce7ea..7444e80c8e3 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json index 1abc62c45a5..813f01ece23 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json index d2e3ce970b4..ef4a199efb9 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json index 82330e7d307..8738e46e9a1 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json index 97d227f3a7e..b2115165aa7 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json index 4413dead745..31eb07f3961 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json index 457e2bfe74f..e19324a164e 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json index 6e2cb55b2d3..c87a8eca8ec 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json index c71f95d6d14..01553b0e3ed 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json index a4433c037a5..e5c032fc7d6 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json index 954438f3950..915f42f0e44 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json index 982370b967e..4903ab4911b 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json index f86f8e58bbf..e765231e5f7 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json index 1e32869828b..20c8808b8d0 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json index 7b9bba35953..8941d2bca35 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json index cfc56d03d2e..b0720250761 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json index 36c207ab1d3..e4dbfc14562 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json index 678b17a56d9..95c0383e0da 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json index 3f11aa58966..081feb1eb02 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json index c198296c978..6c00265887f 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json index 8367ea70254..61e60cc8610 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json index 666052977e4..696ff67513f 100644 --- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json +++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "E5-2650" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json index 42db9a7d15f..485e78233fa 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "grimani-pdu1" + }, + { + "port": 7, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "grimani-pdu1" - }, - { - "port": 7, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json index 45bb09a3684..6b947b9c9f3 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "grimani-pdu1" + }, + { + "port": 20, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "grimani-pdu1" - }, - { - "port": 20, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json index 25d92c0ead7..fb4d817c3a9 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "grimani-pdu1" + }, + { + "port": 21, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "grimani-pdu1" - }, - { - "port": 21, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json index 94f92c00909..5ae773525b6 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "grimani-pdu1" + }, + { + "port": 22, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "grimani-pdu1" - }, - { - "port": 22, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json index b6f028d5478..70bedbb3a79 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 23, + "uid": "grimani-pdu1" + }, + { + "port": 23, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 23, - "uid": "grimani-pdu1" - }, - { - "port": 23, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json index 83f40b6dc1f..7624de4fcef 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "grimani-pdu1" + }, + { + "port": 17, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "grimani-pdu1" - }, - { - "port": 17, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json index 69c9da84479..09d2dd35bb2 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "grimani-pdu1" + }, + { + "port": 11, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "grimani-pdu1" - }, - { - "port": 11, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json index 003be9c4e26..d01b0f43116 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "grimani-pdu1" + }, + { + "port": 12, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "grimani-pdu1" - }, - { - "port": 12, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json index ee5a280ff9b..787cdc9ee6e 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "grimani-pdu1" + }, + { + "port": 13, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "grimani-pdu1" - }, - { - "port": 13, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json index 47b1276731c..2e700d144ef 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "grimani-pdu1" + }, + { + "port": 14, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "grimani-pdu1" - }, - { - "port": 14, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json index c7f49bbdc01..e852d01e865 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "grimani-pdu1" + }, + { + "port": 15, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "grimani-pdu1" - }, - { - "port": 15, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json index 96f2bec8b7c..af8b4b3fd6d 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "grimani-pdu1" + }, + { + "port": 9, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "grimani-pdu1" - }, - { - "port": 9, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json index e20b3fbd6cc..1f1c0ffac5a 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "grimani-pdu1" + }, + { + "port": 18, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "grimani-pdu1" - }, - { - "port": 18, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json index d9c1064ad66..540ec71c8d5 100644 --- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json +++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "device": "eth0", @@ -194,6 +191,16 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "grimani-pdu1" + }, + { + "port": 19, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 844800000000 @@ -214,26 +221,6 @@ "vendor": "Intel", "version": "E5-2650 v4" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "grimani-pdu1" - }, - { - "port": 19, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json index fbde582b05f..fba47bfbbdf 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 1, + "uid": "grimani-pdu1" + }, + { + "port": 1, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 25600000000, "node_flops": 307200000000 @@ -219,26 +226,6 @@ "vendor": "Intel", "version": "E5-2603 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "grimani-pdu1" - }, - { - "port": 1, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json index fba85b56795..2662ac3a322 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 2, + "uid": "grimani-pdu1" + }, + { + "port": 2, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 25600000000, "node_flops": 307200000000 @@ -219,26 +226,6 @@ "vendor": "Intel", "version": "E5-2603 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "grimani-pdu1" - }, - { - "port": 2, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json index 19b693a63c1..8ec8c08100f 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 3, + "uid": "grimani-pdu1" + }, + { + "port": 3, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 25600000000, "node_flops": 307200000000 @@ -219,26 +226,6 @@ "vendor": "Intel", "version": "E5-2603 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "grimani-pdu1" - }, - { - "port": 3, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json index 3c5009d5b74..ec0ba943286 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 4, + "uid": "grimani-pdu1" + }, + { + "port": 4, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 25600000000, "node_flops": 307200000000 @@ -219,26 +226,6 @@ "vendor": "Intel", "version": "E5-2603 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "grimani-pdu1" - }, - { - "port": 4, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json index 1fba6553e8a..45f0ab3d3ab 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 5, + "uid": "grimani-pdu1" + }, + { + "port": 5, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 25600000000, "node_flops": 307200000000 @@ -219,26 +226,6 @@ "vendor": "Intel", "version": "E5-2603 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "grimani-pdu1" - }, - { - "port": 5, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json index dfff25074cf..f9a6c0ea4f2 100644 --- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json +++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "multiple" - }, "network_adapters": [ { "bridged": true, @@ -199,6 +196,16 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 6, + "uid": "grimani-pdu1" + }, + { + "port": 6, + "uid": "grimani-pdu2" + } + ], "performance": { "core_flops": 25600000000, "node_flops": 307200000000 @@ -219,26 +226,6 @@ "vendor": "Intel", "version": "E5-2603 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "grimani-pdu1" - }, - { - "port": 6, - "uid": "grimani-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json index 5217b7ba1f0..4e3fd2ba108 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json index 3b7507644ca..9a75c545b36 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json index d14fb0160c4..bab7876ff51 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json index ef900907b73..d3915e9c742 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json index 7549a3680eb..687563f12e5 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json index c4f7b5881f7..0ea1c45247e 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json index a81a1ba5023..5a5e7b73534 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json index e773828a570..0282187ebb0 100644 --- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json +++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json index 8bd1850fc89..9e3774c8d8a 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json index fc737d48991..1759ae396df 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json index 2ad11ad8b60..2cc523fe724 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json index 345c8d1dadd..9722f2804ae 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json index 2b1b1c70fac..b3a111eb7c8 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json index 9f3673879a8..3a8de5952e3 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json index f748bb6cc74..2dddb2b861c 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json index 41bea1740fb..5f963804998 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json index 5abc3a48313..1bddf5820cd 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json index 0eab85772f4..f27d0db3b98 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json index 424571c4871..d9a0e2842e2 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json index e6aa956928f..4b1cf4ca132 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json index c7726942410..0260fa69dcc 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json index 62e760dc1ed..bc801112cfd 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json index 890dbb88d7c..b5475e3fc06 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json index fb4a2295f90..bf4247b3181 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json index d896ada93bf..2483bf94bc9 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json index 025e224b624..b97c2755dfb 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json index 5cfece525e0..9d4a5446f0e 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json index e966af9fa2d..01002c2c615 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json index 52dff41af30..90490552b57 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json index fc637bf6d66..b8c33899bdf 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json index 55af1b5faff..25015025b8d 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json index 33e18222f9e..91dcf929f4e 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json index 02717c27414..e8eb7f9fadb 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json index 5a51b6f4b90..4299607829f 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json index 8e121d922f4..721a5ffb2a3 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json index 2ad6cf3bd58..d9ecebc2b6e 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json index 6e137835ea4..9d0e1dd8184 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json index 960e3412291..06c140ac40a 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json index 2bd38818f29..39b5a8ac583 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json index f4301a8f99d..4df4ebca773 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json index 27d7bd2e3f6..fb35d72057a 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json index d020ef02a92..12ad2a535e5 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json index 697260c519f..cdd1db32809 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json index 730e1a33fd8..f2538f29504 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json index 5c31b1cff5b..e6a8c018dbd 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json index b1099029c34..b35546e2add 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json index 59c4d0f7b89..3b9073bcbe0 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json index 009ada3d13f..ad573e6d4d1 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json index 6dd9b400d67..8dbee7c1ff8 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json index 3375d51e29d..6c97f87d22d 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json index ba71b48f00e..01b8f65307c 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "grimoire-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "grimoire-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json index 9c936662b32..b72710bb0a6 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -322,6 +319,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "grimoire-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -342,22 +345,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "grimoire-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json index 57c526508fd..6974251835e 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json index 6b63edac601..aea26b06099 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "graoully-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "graoully-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json index 3203231bb65..fb8db7320a6 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json @@ -177,9 +177,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -347,6 +344,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "graoully-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -367,22 +370,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "graoully-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json index a8cfc92136c..3f53c878711 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json index e89a69707e9..a44c179fe04 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json index 8d9425f8477..5de5d2b2b93 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "grisou-pdu2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "grisou-pdu2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json index ffc4cd0e0a9..f81d96dd01f 100644 --- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json +++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json @@ -215,9 +215,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -366,6 +363,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "grisou-pdu1" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -386,22 +389,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "grisou-pdu1" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json index 17540bf7cad..f26fd2aa96d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 0, + "uid": "gros-wattmetre1" + }, + { + "port": 1, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 0, - "uid": "gros-wattmetre1" - }, - { - "port": 1, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json index 398668dbfd9..80acba99ed6 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-10.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 9, + "uid": "gros-wattmetre1" + }, + { + "port": 6, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 9, - "uid": "gros-wattmetre1" - }, - { - "port": 6, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json index fc2baa0e7d3..25bee50e100 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-100.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 29, + "uid": "gros-wattmetre3" + }, + { + "port": 14, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 29, - "uid": "gros-wattmetre3" - }, - { - "port": 14, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json index f0bc2645f7f..4db31da3cc9 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-101.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 18, + "uid": "gros-wattmetre3" + }, + { + "port": 14, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 18, - "uid": "gros-wattmetre3" - }, - { - "port": 14, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json index 7f6a531685c..6a024fb3b63 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-102.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 19, + "uid": "gros-wattmetre3" + }, + { + "port": 15, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 19, - "uid": "gros-wattmetre3" - }, - { - "port": 15, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json index 1ea4e49dee1..0ecaa615459 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-103.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 20, + "uid": "gros-wattmetre3" + }, + { + "port": 17, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 20, - "uid": "gros-wattmetre3" - }, - { - "port": 17, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json index 9b63967e5d7..3672f27324b 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-104.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 21, + "uid": "gros-wattmetre3" + }, + { + "port": 15, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 21, - "uid": "gros-wattmetre3" - }, - { - "port": 15, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json index c5491381b37..9e99a271c7a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-105.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 22, + "uid": "gros-wattmetre3" + }, + { + "port": 17, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 22, - "uid": "gros-wattmetre3" - }, - { - "port": 17, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json index 2191255e497..60e10d9b66c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-106.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 23, + "uid": "gros-wattmetre3" + }, + { + "port": 18, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 23, - "uid": "gros-wattmetre3" - }, - { - "port": 18, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json index f9600bff46d..03e1c9eb182 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-107.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 12, + "uid": "gros-wattmetre3" + }, + { + "port": 19, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 12, - "uid": "gros-wattmetre3" - }, - { - "port": 19, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json index 21df19d9aff..67c554f12e2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-108.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 13, + "uid": "gros-wattmetre3" + }, + { + "port": 18, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 13, - "uid": "gros-wattmetre3" - }, - { - "port": 18, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json index aa0748562f2..31759b63dcc 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-109.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 14, + "uid": "gros-wattmetre3" + }, + { + "port": 20, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 14, - "uid": "gros-wattmetre3" - }, - { - "port": 20, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json index 6062ec4cf62..cbc4b8414bd 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-11.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 10, + "uid": "gros-wattmetre1" + }, + { + "port": 6, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 10, - "uid": "gros-wattmetre1" - }, - { - "port": 6, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json index 121b96d517b..2db9a44b777 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-110.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 15, + "uid": "gros-wattmetre3" + }, + { + "port": 19, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 15, - "uid": "gros-wattmetre3" - }, - { - "port": 19, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json index 55261ff1877..fe1f158e213 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-111.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 16, + "uid": "gros-wattmetre3" + }, + { + "port": 20, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 16, - "uid": "gros-wattmetre3" - }, - { - "port": 20, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json index 37fecc27dd5..d9f45c197a2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-112.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 17, + "uid": "gros-wattmetre3" + }, + { + "port": 21, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 17, - "uid": "gros-wattmetre3" - }, - { - "port": 21, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json index cf10fc54aef..58a762bea0a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-113.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 0, + "uid": "gros-wattmetre3" + }, + { + "port": 22, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 0, - "uid": "gros-wattmetre3" - }, - { - "port": 22, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json index e9aeae67a6b..45a2f4cc95a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-114.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 1, + "uid": "gros-wattmetre3" + }, + { + "port": 21, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 1, - "uid": "gros-wattmetre3" - }, - { - "port": 21, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json index 4ee52b3d79e..33b30c9778b 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-115.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 2, + "uid": "gros-wattmetre3" + }, + { + "port": 23, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 2, - "uid": "gros-wattmetre3" - }, - { - "port": 23, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json index bb4201f8129..b4307f6c8a1 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-116.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 3, + "uid": "gros-wattmetre3" + }, + { + "port": 22, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 3, - "uid": "gros-wattmetre3" - }, - { - "port": 22, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json index 94dff3a5398..37b92e71744 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-117.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 6, + "uid": "gros-wattmetre3" + }, + { + "port": 13, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 6, - "uid": "gros-wattmetre3" - }, - { - "port": 13, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json index cc3236b8304..c129b7bf943 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-118.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 7, + "uid": "gros-wattmetre3" + }, + { + "port": 17, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 7, - "uid": "gros-wattmetre3" - }, - { - "port": 17, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json index 0bbbf618f16..7527a2f67d3 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-119.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 8, + "uid": "gros-wattmetre3" + }, + { + "port": 18, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 8, - "uid": "gros-wattmetre3" - }, - { - "port": 18, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json index 559da114123..07f9976b5f1 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-12.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 11, + "uid": "gros-wattmetre1" + }, + { + "port": 7, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 11, - "uid": "gros-wattmetre1" - }, - { - "port": 7, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json index bcc53769d83..a4637ae7560 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-120.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 9, + "uid": "gros-wattmetre3" + }, + { + "port": 19, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 9, - "uid": "gros-wattmetre3" - }, - { - "port": 19, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json index fe0fb926775..0ab44091288 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-121.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 10, + "uid": "gros-wattmetre3" + }, + { + "port": 20, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 10, - "uid": "gros-wattmetre3" - }, - { - "port": 20, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json index 8525a086726..fccdb68c0a2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-122.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 11, + "uid": "gros-wattmetre3" + }, + { + "port": 21, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 11, - "uid": "gros-wattmetre3" - }, - { - "port": 21, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json index b91baeab207..13d56a9ff3c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-123.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 4, + "uid": "gros-wattmetre3" + }, + { + "port": 22, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 4, - "uid": "gros-wattmetre3" - }, - { - "port": 22, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json index 58685845376..9238107cee4 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-124.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 5, + "uid": "gros-wattmetre3" + }, + { + "port": 23, + "uid": "gros-pdu8" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 5, - "uid": "gros-wattmetre3" - }, - { - "port": 23, - "uid": "gros-pdu8" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json index 197320b679a..e35a0fc0871 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-13.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 12, + "uid": "gros-wattmetre1" + }, + { + "port": 7, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 12, - "uid": "gros-wattmetre1" - }, - { - "port": 7, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json index 22d3a6a1501..e61a53a2e0a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-14.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 13, + "uid": "gros-wattmetre1" + }, + { + "port": 9, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 13, - "uid": "gros-wattmetre1" - }, - { - "port": 9, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json index 0046f1b8802..08798520544 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-15.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 14, + "uid": "gros-wattmetre1" + }, + { + "port": 10, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 14, - "uid": "gros-wattmetre1" - }, - { - "port": 10, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json index 58cc3ecca14..c0de93ea650 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-16.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 15, + "uid": "gros-wattmetre1" + }, + { + "port": 9, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 15, - "uid": "gros-wattmetre1" - }, - { - "port": 9, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json index 2fd7602084a..81097ed323e 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-17.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 16, + "uid": "gros-wattmetre1" + }, + { + "port": 10, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 16, - "uid": "gros-wattmetre1" - }, - { - "port": 10, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json index 5c4d7040b2c..9c965687c99 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-18.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 17, + "uid": "gros-wattmetre1" + }, + { + "port": 11, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 17, - "uid": "gros-wattmetre1" - }, - { - "port": 11, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json index 94fde0db8f7..e0f195d98cf 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-19.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 18, + "uid": "gros-wattmetre1" + }, + { + "port": 11, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 18, - "uid": "gros-wattmetre1" - }, - { - "port": 11, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json index 6ac33e7fcd3..15f23fd831d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 1, + "uid": "gros-wattmetre1" + }, + { + "port": 1, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 1, - "uid": "gros-wattmetre1" - }, - { - "port": 1, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json index 6953728f738..e410a172f62 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-20.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 19, + "uid": "gros-wattmetre1" + }, + { + "port": 12, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 19, - "uid": "gros-wattmetre1" - }, - { - "port": 12, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json index a82371af104..a87d40d4b3a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-21.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 20, + "uid": "gros-wattmetre1" + }, + { + "port": 12, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 20, - "uid": "gros-wattmetre1" - }, - { - "port": 12, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json index f284fc23016..1ee7400ff0e 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-22.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 21, + "uid": "gros-wattmetre1" + }, + { + "port": 13, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 21, - "uid": "gros-wattmetre1" - }, - { - "port": 13, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json index b10645de592..7c9c7a44b5a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-23.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 22, + "uid": "gros-wattmetre1" + }, + { + "port": 14, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 22, - "uid": "gros-wattmetre1" - }, - { - "port": 14, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json index 9400ae067a0..b4c94dd3143 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-24.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 23, + "uid": "gros-wattmetre1" + }, + { + "port": 13, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 23, - "uid": "gros-wattmetre1" - }, - { - "port": 13, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json index c35780d2f62..9c26417c26d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-25.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 24, + "uid": "gros-wattmetre1" + }, + { + "port": 14, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 24, - "uid": "gros-wattmetre1" - }, - { - "port": 14, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json index fc4a24b6d8b..72dafe35829 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-26.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 25, + "uid": "gros-wattmetre1" + }, + { + "port": 15, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 25, - "uid": "gros-wattmetre1" - }, - { - "port": 15, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json index b7711f32025..871cfc97ff3 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-27.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 26, + "uid": "gros-wattmetre1" + }, + { + "port": 15, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 26, - "uid": "gros-wattmetre1" - }, - { - "port": 15, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json index 3f1d8cd7c66..e749076a27e 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-28.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 27, + "uid": "gros-wattmetre1" + }, + { + "port": 17, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 27, - "uid": "gros-wattmetre1" - }, - { - "port": 17, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json index 2998ea3e447..af39b35a6b3 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-29.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 28, + "uid": "gros-wattmetre1" + }, + { + "port": 17, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 28, - "uid": "gros-wattmetre1" - }, - { - "port": 17, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json index d67bc9c68f8..6c136690966 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 2, + "uid": "gros-wattmetre1" + }, + { + "port": 2, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 2, - "uid": "gros-wattmetre1" - }, - { - "port": 2, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json index 7f88fe6769e..ea005914bbb 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-30.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 29, + "uid": "gros-wattmetre1" + }, + { + "port": 18, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 29, - "uid": "gros-wattmetre1" - }, - { - "port": 18, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json index 8ef609f2087..ff8b9000544 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-31.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 30, + "uid": "gros-wattmetre1" + }, + { + "port": 18, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 30, - "uid": "gros-wattmetre1" - }, - { - "port": 18, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json index 55292c0c695..423e5eee388 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-32.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 31, + "uid": "gros-wattmetre1" + }, + { + "port": 19, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 31, - "uid": "gros-wattmetre1" - }, - { - "port": 19, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json index 377c322a8ad..bae8480c7f2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-33.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 32, + "uid": "gros-wattmetre1" + }, + { + "port": 19, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 32, - "uid": "gros-wattmetre1" - }, - { - "port": 19, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json index 226fa8240d4..0f6a0f98735 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-34.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 33, + "uid": "gros-wattmetre1" + }, + { + "port": 20, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 33, - "uid": "gros-wattmetre1" - }, - { - "port": 20, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json index 9acfc3e7b1b..5f3777797db 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-35.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 34, + "uid": "gros-wattmetre1" + }, + { + "port": 21, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 34, - "uid": "gros-wattmetre1" - }, - { - "port": 21, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json index a5f71b15be8..4bb24395bac 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-36.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 35, + "uid": "gros-wattmetre1" + }, + { + "port": 20, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 35, - "uid": "gros-wattmetre1" - }, - { - "port": 20, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json index 6e78f928325..55afb4807ac 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-37.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 36, + "uid": "gros-wattmetre1" + }, + { + "port": 22, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 36, - "uid": "gros-wattmetre1" - }, - { - "port": 22, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json index d9c38817e2b..98c9d6b80f2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-38.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 37, + "uid": "gros-wattmetre1" + }, + { + "port": 21, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 37, - "uid": "gros-wattmetre1" - }, - { - "port": 21, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json index 690da92d7dd..8df44687e5a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-39.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 38, + "uid": "gros-wattmetre1" + }, + { + "port": 23, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 38, - "uid": "gros-wattmetre1" - }, - { - "port": 23, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json index 552fe958030..343b53e2946 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 3, + "uid": "gros-wattmetre1" + }, + { + "port": 3, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 3, - "uid": "gros-wattmetre1" - }, - { - "port": 3, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json index 0cb450ea967..c48d300b358 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-40.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 39, + "uid": "gros-wattmetre1" + }, + { + "port": 23, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 39, - "uid": "gros-wattmetre1" - }, - { - "port": 23, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json index 32391496355..d699750c6d7 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-41.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 30, + "uid": "gros-wattmetre2" + }, + { + "port": 1, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 30, - "uid": "gros-wattmetre2" - }, - { - "port": 1, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json index fa4871568c1..aff9f0a20ce 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-42.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 31, + "uid": "gros-wattmetre2" + }, + { + "port": 2, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 31, - "uid": "gros-wattmetre2" - }, - { - "port": 2, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json index 77913b2465f..7fd90299b6d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-43.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 32, + "uid": "gros-wattmetre2" + }, + { + "port": 1, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 32, - "uid": "gros-wattmetre2" - }, - { - "port": 1, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json index a3e01342c8b..f2449eea7d7 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-44.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 33, + "uid": "gros-wattmetre2" + }, + { + "port": 3, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 33, - "uid": "gros-wattmetre2" - }, - { - "port": 3, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json index d2ec4c5c2c2..5603a39b8c1 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-45.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 34, + "uid": "gros-wattmetre2" + }, + { + "port": 4, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 34, - "uid": "gros-wattmetre2" - }, - { - "port": 4, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json index 1f0f246dbc8..49f490f53a0 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-46.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 35, + "uid": "gros-wattmetre2" + }, + { + "port": 2, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 35, - "uid": "gros-wattmetre2" - }, - { - "port": 2, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json index df2a9c0a73c..80830d924a9 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-47.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 24, + "uid": "gros-wattmetre2" + }, + { + "port": 5, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 24, - "uid": "gros-wattmetre2" - }, - { - "port": 5, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json index 1e085d86fe0..c41b20079d9 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-48.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 25, + "uid": "gros-wattmetre2" + }, + { + "port": 4, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 25, - "uid": "gros-wattmetre2" - }, - { - "port": 4, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json index 985b977be1e..33287769990 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-49.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 26, + "uid": "gros-wattmetre2" + }, + { + "port": 6, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 26, - "uid": "gros-wattmetre2" - }, - { - "port": 6, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json index 434745c9f36..c2a33ad4431 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 4, + "uid": "gros-wattmetre1" + }, + { + "port": 3, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 4, - "uid": "gros-wattmetre1" - }, - { - "port": 3, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json index a6ff125e702..e7d8113354c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-50.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 27, + "uid": "gros-wattmetre2" + }, + { + "port": 7, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 27, - "uid": "gros-wattmetre2" - }, - { - "port": 7, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json index 14993311895..91064461867 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-51.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 28, + "uid": "gros-wattmetre2" + }, + { + "port": 5, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 28, - "uid": "gros-wattmetre2" - }, - { - "port": 5, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json index f8f5a7d38a8..5d0c5d46ba7 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-52.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 29, + "uid": "gros-wattmetre2" + }, + { + "port": 7, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 29, - "uid": "gros-wattmetre2" - }, - { - "port": 7, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json index b417b5111c2..3ac0ec673ba 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-53.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 18, + "uid": "gros-wattmetre2" + }, + { + "port": 6, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 18, - "uid": "gros-wattmetre2" - }, - { - "port": 6, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json index 8e9d58a6451..63241c8e9f7 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-54.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 19, + "uid": "gros-wattmetre2" + }, + { + "port": 9, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 19, - "uid": "gros-wattmetre2" - }, - { - "port": 9, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json index 8551c2ad2b0..02263a632f1 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-55.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 20, + "uid": "gros-wattmetre2" + }, + { + "port": 10, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 20, - "uid": "gros-wattmetre2" - }, - { - "port": 10, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json index 24f95a16681..935ad0f1086 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-56.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 21, + "uid": "gros-wattmetre2" + }, + { + "port": 9, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 21, - "uid": "gros-wattmetre2" - }, - { - "port": 9, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json index 028516b6ab1..b246f32abac 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-57.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 22, + "uid": "gros-wattmetre2" + }, + { + "port": 10, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 22, - "uid": "gros-wattmetre2" - }, - { - "port": 10, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json index 07d0bf01d51..e989c6bf6ad 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-58.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 23, + "uid": "gros-wattmetre2" + }, + { + "port": 11, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 23, - "uid": "gros-wattmetre2" - }, - { - "port": 11, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json index c819187f8e0..89e5053102e 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-59.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 12, + "uid": "gros-wattmetre2" + }, + { + "port": 11, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 12, - "uid": "gros-wattmetre2" - }, - { - "port": 11, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json index 2272a80a8b9..16b6ca783d9 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 5, + "uid": "gros-wattmetre1" + }, + { + "port": 4, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 5, - "uid": "gros-wattmetre1" - }, - { - "port": 4, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json index 0e6c28e84d9..b90376e0d1c 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-60.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 13, + "uid": "gros-wattmetre2" + }, + { + "port": 12, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 13, - "uid": "gros-wattmetre2" - }, - { - "port": 12, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json index 7e82565a7c7..c8767b868d6 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-61.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 14, + "uid": "gros-wattmetre2" + }, + { + "port": 15, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 14, - "uid": "gros-wattmetre2" - }, - { - "port": 15, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json index 2ebaae2c77a..29eeaa2c668 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-62.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 15, + "uid": "gros-wattmetre2" + }, + { + "port": 14, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 15, - "uid": "gros-wattmetre2" - }, - { - "port": 14, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json index 979fea2fb01..9a47b5c664e 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-63.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 16, + "uid": "gros-wattmetre2" + }, + { + "port": 15, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 16, - "uid": "gros-wattmetre2" - }, - { - "port": 15, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json index 608dc460aea..2a0659f7ffb 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-64.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 17, + "uid": "gros-wattmetre2" + }, + { + "port": 17, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 17, - "uid": "gros-wattmetre2" - }, - { - "port": 17, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json index e4acb7d7163..d5a454ef250 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-65.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 6, + "uid": "gros-wattmetre2" + }, + { + "port": 18, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 6, - "uid": "gros-wattmetre2" - }, - { - "port": 18, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json index beb023f63eb..fc6a55b57e6 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-66.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 7, + "uid": "gros-wattmetre2" + }, + { + "port": 17, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 7, - "uid": "gros-wattmetre2" - }, - { - "port": 17, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json index f888435d6ee..9f3863d78b2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-67.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 8, + "uid": "gros-wattmetre2" + }, + { + "port": 19, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 8, - "uid": "gros-wattmetre2" - }, - { - "port": 19, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json index 296e61f2937..a11ee74ad7b 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-68.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 9, + "uid": "gros-wattmetre2" + }, + { + "port": 18, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 9, - "uid": "gros-wattmetre2" - }, - { - "port": 18, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json index 0df748e9f22..80b6d431fb4 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-69.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 10, + "uid": "gros-wattmetre2" + }, + { + "port": 20, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 10, - "uid": "gros-wattmetre2" - }, - { - "port": 20, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json index 1b6bfeee0f0..a2023b15d8d 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 6, + "uid": "gros-wattmetre1" + }, + { + "port": 4, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 6, - "uid": "gros-wattmetre1" - }, - { - "port": 4, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json index c1577951cca..8130d5c89de 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-70.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 11, + "uid": "gros-wattmetre2" + }, + { + "port": 19, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 11, - "uid": "gros-wattmetre2" - }, - { - "port": 19, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json index e37ebd90af7..e458ddcabd8 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-71.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 0, + "uid": "gros-wattmetre2" + }, + { + "port": 21, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 0, - "uid": "gros-wattmetre2" - }, - { - "port": 21, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json index 3341ec8aac0..489e2fdfea5 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-72.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 1, + "uid": "gros-wattmetre2" + }, + { + "port": 20, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 1, - "uid": "gros-wattmetre2" - }, - { - "port": 20, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json index cc65f468ed8..dd88e1ef396 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-73.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 2, + "uid": "gros-wattmetre2" + }, + { + "port": 23, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 2, - "uid": "gros-wattmetre2" - }, - { - "port": 23, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json index 444a64f023e..f0d123e4a71 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-74.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 3, + "uid": "gros-wattmetre2" + }, + { + "port": 21, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 3, - "uid": "gros-wattmetre2" - }, - { - "port": 21, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json index 619bc153910..5237ff93346 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-75.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 4, + "uid": "gros-wattmetre2" + }, + { + "port": 22, + "uid": "gros-pdu4" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 4, - "uid": "gros-wattmetre2" - }, - { - "port": 22, - "uid": "gros-pdu4" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json index 4faef972777..d30910f1300 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-76.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 5, + "uid": "gros-wattmetre2" + }, + { + "port": 22, + "uid": "gros-pdu3" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 5, - "uid": "gros-wattmetre2" - }, - { - "port": 22, - "uid": "gros-pdu3" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json index 4cbdd2bf7a4..062789f5f61 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-77.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 42, + "uid": "gros-wattmetre3" + }, + { + "port": 1, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 42, - "uid": "gros-wattmetre3" - }, - { - "port": 1, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json index 5aa07f23519..cd98c4a85b5 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-78.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 43, + "uid": "gros-wattmetre3" + }, + { + "port": 2, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 43, - "uid": "gros-wattmetre3" - }, - { - "port": 2, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json index 58f8f19c615..1ed23d6ba35 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-79.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 44, + "uid": "gros-wattmetre3" + }, + { + "port": 3, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 44, - "uid": "gros-wattmetre3" - }, - { - "port": 3, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json index 7f25cddf6bc..d04cfd2ddc6 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 7, + "uid": "gros-wattmetre1" + }, + { + "port": 5, + "uid": "gros-pdu1" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 7, - "uid": "gros-wattmetre1" - }, - { - "port": 5, - "uid": "gros-pdu1" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json index a551b405b83..d7768f99739 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-80.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 45, + "uid": "gros-wattmetre3" + }, + { + "port": 1, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 45, - "uid": "gros-wattmetre3" - }, - { - "port": 1, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json index b273cf41706..1a795518109 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-81.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 46, + "uid": "gros-wattmetre3" + }, + { + "port": 4, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 46, - "uid": "gros-wattmetre3" - }, - { - "port": 4, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json index b94948efdc2..8a7b39067b2 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-82.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 47, + "uid": "gros-wattmetre3" + }, + { + "port": 2, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 47, - "uid": "gros-wattmetre3" - }, - { - "port": 2, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json index 7b377f43415..bdeddd46a2a 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-83.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 36, + "uid": "gros-wattmetre3" + }, + { + "port": 5, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 36, - "uid": "gros-wattmetre3" - }, - { - "port": 5, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json index db98dd43c1d..b55ad5848c5 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-84.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 37, + "uid": "gros-wattmetre3" + }, + { + "port": 3, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 37, - "uid": "gros-wattmetre3" - }, - { - "port": 3, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json index 5945ef7facf..a5815498b45 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-85.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 38, + "uid": "gros-wattmetre3" + }, + { + "port": 6, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 38, - "uid": "gros-wattmetre3" - }, - { - "port": 6, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json index cf3bc3deb64..8d128b84b62 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-86.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 39, + "uid": "gros-wattmetre3" + }, + { + "port": 4, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 39, - "uid": "gros-wattmetre3" - }, - { - "port": 4, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json index 5c33c3cfaa9..98d6d32e910 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-87.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 40, + "uid": "gros-wattmetre3" + }, + { + "port": 5, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 40, - "uid": "gros-wattmetre3" - }, - { - "port": 5, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json index 032aa419a67..e7a4c378e3f 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-88.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 41, + "uid": "gros-wattmetre3" + }, + { + "port": 7, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 41, - "uid": "gros-wattmetre3" - }, - { - "port": 7, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json index ed4631ad428..0992ec8fcdf 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-89.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 30, + "uid": "gros-wattmetre3" + }, + { + "port": 6, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 30, - "uid": "gros-wattmetre3" - }, - { - "port": 6, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json index 8f4a20d22c8..e5bcca5b0e0 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-9.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 8, + "uid": "gros-wattmetre1" + }, + { + "port": 5, + "uid": "gros-pdu2" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 8, - "uid": "gros-wattmetre1" - }, - { - "port": 5, - "uid": "gros-pdu2" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json index 9f3ebb42793..26efc6584f0 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-90.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 31, + "uid": "gros-wattmetre3" + }, + { + "port": 10, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 31, - "uid": "gros-wattmetre3" - }, - { - "port": 10, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json index d0b0672c211..f848c773555 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-91.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 32, + "uid": "gros-wattmetre3" + }, + { + "port": 7, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 32, - "uid": "gros-wattmetre3" - }, - { - "port": 7, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json index 61f1bdafd4c..bb5aa8ee0e6 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-92.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 33, + "uid": "gros-wattmetre3" + }, + { + "port": 9, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 33, - "uid": "gros-wattmetre3" - }, - { - "port": 9, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json index 3516c6da32f..18f72b58cd4 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-93.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 34, + "uid": "gros-wattmetre3" + }, + { + "port": 10, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 34, - "uid": "gros-wattmetre3" - }, - { - "port": 10, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json index bb7978cba8f..c20da658670 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-94.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 35, + "uid": "gros-wattmetre3" + }, + { + "port": 9, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 35, - "uid": "gros-wattmetre3" - }, - { - "port": 9, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json index 3b631152fa8..0034a20cdda 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-95.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 24, + "uid": "gros-wattmetre3" + }, + { + "port": 11, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 24, - "uid": "gros-wattmetre3" - }, - { - "port": 11, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json index 7809a162a50..a2a9626e47f 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-96.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 25, + "uid": "gros-wattmetre3" + }, + { + "port": 12, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 25, - "uid": "gros-wattmetre3" - }, - { - "port": 12, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json index 1d615d2176c..a9d58d61dc5 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-97.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 26, + "uid": "gros-wattmetre3" + }, + { + "port": 12, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 26, - "uid": "gros-wattmetre3" - }, - { - "port": 12, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json index 269cd151927..04bb6988c31 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-98.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 27, + "uid": "gros-wattmetre3" + }, + { + "port": 13, + "uid": "gros-pdu6" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 27, - "uid": "gros-wattmetre3" - }, - { - "port": 13, - "uid": "gros-pdu6" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json index eb02fc22eaa..cc7f26fe4dc 100644 --- a/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json +++ b/data/grid5000/sites/nancy/clusters/gros/nodes/gros-99.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -170,6 +167,17 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "kind": "wattmetre-only", + "port": 28, + "uid": "gros-wattmetre3" + }, + { + "port": 13, + "uid": "gros-pdu5" + } + ], "performance": { "core_flops": 35200000000, "node_flops": 633600000000 @@ -190,31 +198,6 @@ "vendor": "Intel", "version": "Gold 5220" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "kind": "wattmetre-only", - "port": 28, - "uid": "gros-wattmetre3" - }, - { - "port": 13, - "uid": "gros-pdu5" - } - ], - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 e18247a6277..526f51401a6 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json +++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -194,8 +191,6 @@ "vendor": "AMD", "version": 7452 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", 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 6a8ff40ed5d..d1c77eddadd 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json +++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.json @@ -83,9 +83,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -194,8 +191,6 @@ "vendor": "AMD", "version": 7452 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json index 319371f4b5f..077e407764e 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json @@ -105,9 +105,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -216,8 +213,6 @@ "vendor": "AMD", "version": 7351 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json index dcbfd57a089..35f2a614e38 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json @@ -105,9 +105,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -216,8 +213,6 @@ "vendor": "AMD", "version": 7351 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json index 1c625af5ab6..5d25f6aed37 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json @@ -105,9 +105,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -216,8 +213,6 @@ "vendor": "AMD", "version": 7351 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json index 124a3c9a48b..ab258e9f2d6 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json @@ -105,9 +105,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -216,8 +213,6 @@ "vendor": "AMD", "version": 7351 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json index 08441dbb00a..b6ff4a919b7 100644 --- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json +++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json @@ -105,9 +105,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -216,8 +213,6 @@ "vendor": "AMD", "version": 7351 }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json index f787e5aa551..26c5eec4ad2 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json index 9b0ecb601a4..a8528d7f34e 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json index c6791907b4f..2ab7d06217a 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json index 90d75ca79ed..659f9fbafc4 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json index 365180da19a..bbbf6978079 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json index 8e3027a341d..68438f8f8c9 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json index 930d05866e7..247fa393245 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json index 44e26b41248..cd3883c3604 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json index e77dacbc37c..c69a8dd56f4 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json index e15ec5c9efb..5bfbeb6cbe3 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json index 476675a8eaf..55b49907c55 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json index 7a30449ed85..9eb3e057f9c 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json index 385177d9692..f8864de7180 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json index 97438fb1fdc..c065f29455a 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json index c4bf76ac0ce..83605e1ef98 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json index a8d43fe03c4..b6f27e5b5ef 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json index 72a79629d17..0cecffcc080 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json index cf2851ff789..03607f72e79 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json index ddca5b0a706..06bae5867fb 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json index 6ac319c3ffb..054715efab0 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json index 1649f831b07..a210e1a760a 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json index 55d16118bf7..ce73037a463 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json index 8965dd7f7ef..bbb6cbd5c81 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json index 8ef02d7d0ae..59e3f74450a 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json index c1dc998e9cc..46292199d98 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json index 9200a43bab5..33d2e54e1bb 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json index 5b0404478ab..8f9115d8645 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json index 190acaea5d6..98f9f592827 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json index 1aafbd401b8..8f4fcf87144 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json index 84c7157da65..154a9de0361 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json index b8a6beb13cf..36d8a129f1b 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json index 43db1bf64cc..8101346cc05 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json index 33467aa5421..3e8c99bb5b3 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json index 94152bc6af3..deb20892850 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json index cfaff36b3ad..5274b1344f3 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json index 32994fe2ded..6552078f657 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json index 7be65af841f..7f2c9887c5f 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json index 06bcdcc5e3c..22445ad50ab 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json index f2fe73f1e35..d6ddb9e7c03 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json index 0b0a6c9ee52..2a252c5cdd6 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json index 05a194abc97..e9c8428a6b8 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json index 568ce2964a1..e23feb9d22a 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json index 1b78296f5de..23a8d691217 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json index ec2e96f0f10..6ccad045b79 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json index 5c225c91f55..f4f8ce816a3 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json index d3ccf015ed4..b5e8f5a7d7c 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json index 052d120b94b..0830104a72b 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json index 3e2b0f917a9..516a3c1f962 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json index 35710243a3b..bec2f8a29c9 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json index 65fe8c697e3..600549907a2 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json index a800e972629..167290ab717 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json index cf830454497..9ab3eb98e43 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json index 6b3b2b344db..861974211c6 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json index 2419d8550cf..281e5c91340 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json index 74dff2fe4b5..92a55e6886d 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json index bd99d0ae0ad..d8f44ea4c5a 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json index deb1c19842f..b9ec912b8e0 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json index a90d3ae2c35..23ebc24300d 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json index ae814b30248..ec0bfb8bcfd 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json index 652dac9cf8c..5cf0d8237d7 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json index d4b0dd8ddf6..7721a0af675 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json index 34fc3227876..7b86c5c7389 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json index d59ea1b02cb..c92695c0a65 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json index a2f5cfc2a44..cbcb3f29f26 100644 --- a/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json +++ b/data/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 206158430208 }, - "monitoring": { - "wattmeter": "shared" - }, "network_adapters": [ { "device": "eth0", @@ -164,17 +161,6 @@ "vendor": "Intel", "version": "Gold 6130" }, - "sensors": { - "power": { - "available": true, - "per_outlets": false, - "via": { - "api": { - "metric": "power" - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json index 94abe8844d0..1fc2ffc6e68 100644 --- a/data/grid5000/sites/nancy/network_equipments/gw.json +++ b/data/grid5000/sites/nancy/network_equipments/gw.json @@ -2079,37 +2079,25 @@ } ], "model": "Cisco Nexus 9508", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, - "role": "production", - "sensors": { - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 8, - "uid": "graoully-pdu1" - }, - { - "port": 8, - "uid": "graoully-pdu2" - }, - { - "port": 8, - "uid": "grimoire-pdu1" - }, - { - "port": 8, - "uid": "grimoire-pdu2" - } - ] - } + "pdu": [ + { + "port": 8, + "uid": "graoully-pdu1" + }, + { + "port": 8, + "uid": "graoully-pdu2" + }, + { + "port": 8, + "uid": "grimoire-pdu1" + }, + { + "port": 8, + "uid": "grimoire-pdu2" } - }, + ], + "role": "production", "site": "nancy", "snmp_community": "public", "type": "network_equipment", diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json index 49978671f43..62fcad51859 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json +++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json @@ -146,25 +146,13 @@ } ], "model": "Infiniband", - "monitoring": { - "metric": "power", - "wattmeter": true - }, - "role": "hpc", - "sensors": { - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 7, - "uid": "graoully-pdu2" - } - ] - } + "pdu": [ + { + "port": 7, + "uid": "graoully-pdu2" } - }, + ], + "role": "hpc", "site": "nancy", "snmp_community": "public", "type": "network_equipment", diff --git a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json index 447d8f73113..6cc3c059b53 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json +++ b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json @@ -52,29 +52,17 @@ } ], "model": "Omni-Path", - "monitoring": { - "metric": "power", - "wattmeter": true - }, - "role": "hpc", - "sensors": { - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 10, - "uid": "grimani-pdu1" - }, - { - "port": 10, - "uid": "grimani-pdu2" - } - ] - } + "pdu": [ + { + "port": 10, + "uid": "grimani-pdu1" + }, + { + "port": 10, + "uid": "grimani-pdu2" } - }, + ], + "role": "hpc", "site": "nancy", "snmp_community": "public", "type": "network_equipment", diff --git a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json index 00d27d9e881..e5380e726d3 100644 --- a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json +++ b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json @@ -442,25 +442,13 @@ } ], "model": "Dell S3048", - "monitoring": { - "metric": "power", - "wattmeter": true - }, - "role": "production", - "sensors": { - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 14, - "uid": "grimoire-pdu2" - } - ] - } + "pdu": [ + { + "port": 14, + "uid": "grimoire-pdu2" } - }, + ], + "role": "production", "site": "nancy", "snmp_community": "public", "type": "network_equipment", diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu1.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu1.json index 124e043eef1..ca818817b93 100644 --- a/data/grid5000/sites/nancy/pdus/graffiti-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/graffiti-pdu1.json @@ -22,22 +22,6 @@ "6": "graffiti-2", "7": "graffiti-3" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "graffiti-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu2.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu2.json index f3dd8857d94..f4007de7b6b 100644 --- a/data/grid5000/sites/nancy/pdus/graffiti-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/graffiti-pdu2.json @@ -22,22 +22,6 @@ "6": "graffiti-2", "7": "graffiti-3" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "graffiti-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu3.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu3.json index 507fc6df512..c2428c1122b 100644 --- a/data/grid5000/sites/nancy/pdus/graffiti-pdu3.json +++ b/data/grid5000/sites/nancy/pdus/graffiti-pdu3.json @@ -21,22 +21,6 @@ "5": "graffiti-9", "7": "graffiti-10" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "graffiti-pdu3", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/graffiti-pdu4.json b/data/grid5000/sites/nancy/pdus/graffiti-pdu4.json index 6a903eee854..c00ec88f56f 100644 --- a/data/grid5000/sites/nancy/pdus/graffiti-pdu4.json +++ b/data/grid5000/sites/nancy/pdus/graffiti-pdu4.json @@ -21,22 +21,6 @@ "5": "graffiti-9", "7": "graffiti-10" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "graffiti-pdu4", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json b/data/grid5000/sites/nancy/pdus/graoully-pdu1.json index 4ebce939352..bb93bb57ba0 100644 --- a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/graoully-pdu1.json @@ -34,22 +34,6 @@ "7": "graphique-4", "9": "graphique-1" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "graoully-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json b/data/grid5000/sites/nancy/pdus/graoully-pdu2.json index ac82b806faf..a2de4e979dc 100644 --- a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/graoully-pdu2.json @@ -33,22 +33,6 @@ "5": "graphique-1", "6": "graphique-4" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "graoully-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json b/data/grid5000/sites/nancy/pdus/grappe-pdu1.json index e2edd7be59c..c0a1d586820 100644 --- a/data/grid5000/sites/nancy/pdus/grappe-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/grappe-pdu1.json @@ -31,22 +31,6 @@ "8": "grappe-4", "9": "grappe-5" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grappe-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json b/data/grid5000/sites/nancy/pdus/grappe-pdu2.json index ea4a039fb0b..91f5b42de3e 100644 --- a/data/grid5000/sites/nancy/pdus/grappe-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/grappe-pdu2.json @@ -31,22 +31,6 @@ "8": "grappe-4", "9": "grappe-5" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grappe-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grimani-pdu1.json b/data/grid5000/sites/nancy/pdus/grimani-pdu1.json index e040cddc12e..4219880d5cf 100644 --- a/data/grid5000/sites/nancy/pdus/grimani-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/grimani-pdu1.json @@ -35,22 +35,6 @@ "7": "grele-1", "9": "grele-7" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grimani-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grimani-pdu2.json b/data/grid5000/sites/nancy/pdus/grimani-pdu2.json index 5321f369c66..87c570a8c79 100644 --- a/data/grid5000/sites/nancy/pdus/grimani-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/grimani-pdu2.json @@ -35,22 +35,6 @@ "7": "grele-1", "9": "grele-7" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grimani-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json b/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json index 97fdf475b4d..95566ccd589 100644 --- a/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/grimoire-pdu1.json @@ -29,22 +29,6 @@ "7": "grisou-44", "9": "graphique-5" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grimoire-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json b/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json index 76ea07addde..1cda0b2fd74 100644 --- a/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/grimoire-pdu2.json @@ -29,22 +29,6 @@ "6": "grisou-41", "7": "grisou-42" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grimoire-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grisou-pdu1.json b/data/grid5000/sites/nancy/pdus/grisou-pdu1.json index 73652f64f1f..464f9049108 100644 --- a/data/grid5000/sites/nancy/pdus/grisou-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/grisou-pdu1.json @@ -31,22 +31,6 @@ "7": "grisou-13", "9": "grisou-15" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grisou-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grisou-pdu2.json b/data/grid5000/sites/nancy/pdus/grisou-pdu2.json index 4682294a2b5..225eb84b770 100644 --- a/data/grid5000/sites/nancy/pdus/grisou-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/grisou-pdu2.json @@ -29,22 +29,6 @@ "6": "grisou-12", "7": "grisou-14" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grisou-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu1.json b/data/grid5000/sites/nancy/pdus/gros-pdu1.json index 3fe7d6d7095..731a6737432 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu1.json @@ -35,22 +35,6 @@ "7": "gros-12", "9": "gros-14" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu2.json b/data/grid5000/sites/nancy/pdus/gros-pdu2.json index 16d5d8acef6..cfd2d0abe0b 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu2.json @@ -35,22 +35,6 @@ "7": "gros-13", "9": "gros-16" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu3.json b/data/grid5000/sites/nancy/pdus/gros-pdu3.json index d85ed128d5d..2dca3b8874a 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu3.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu3.json @@ -33,22 +33,6 @@ "7": "gros-50", "9": "gros-56" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu3", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu4.json b/data/grid5000/sites/nancy/pdus/gros-pdu4.json index e82d4c351ff..f46f25fa383 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu4.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu4.json @@ -33,22 +33,6 @@ "7": "gros-52", "9": "gros-54" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu4", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu5.json b/data/grid5000/sites/nancy/pdus/gros-pdu5.json index 42e2d1a30df..283b17925a1 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu5.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu5.json @@ -35,22 +35,6 @@ "7": "gros-88", "9": "gros-92" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu5", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu6.json b/data/grid5000/sites/nancy/pdus/gros-pdu6.json index c3345b4a9e9..feec81bb34a 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu6.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu6.json @@ -35,22 +35,6 @@ "7": "gros-91", "9": "gros-94" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu6", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu7.json b/data/grid5000/sites/nancy/pdus/gros-pdu7.json index 7bfecab35d2..8336bb39677 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu7.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu7.json @@ -15,22 +15,6 @@ "model": "AP8653", "ports": { }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu7", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-pdu8.json b/data/grid5000/sites/nancy/pdus/gros-pdu8.json index 77796f6474a..8a57ea450c5 100644 --- a/data/grid5000/sites/nancy/pdus/gros-pdu8.json +++ b/data/grid5000/sites/nancy/pdus/gros-pdu8.json @@ -23,22 +23,6 @@ "22": "gros-123", "23": "gros-124" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "gros-pdu8", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/gros-wattmetre1.json b/data/grid5000/sites/nancy/pdus/gros-wattmetre1.json index f0c61fab27d..b869dd9e50d 100644 --- a/data/grid5000/sites/nancy/pdus/gros-wattmetre1.json +++ b/data/grid5000/sites/nancy/pdus/gros-wattmetre1.json @@ -55,21 +55,6 @@ "8": "gros-9", "9": "gros-10" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "wattmetre": { - "available": true, - "unit": "W", - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - } - ], "type": "pdu", "uid": "gros-wattmetre1", "vendor": "OmegaWatt" diff --git a/data/grid5000/sites/nancy/pdus/gros-wattmetre2.json b/data/grid5000/sites/nancy/pdus/gros-wattmetre2.json index 2dc095ea2eb..2e6ecb5908e 100644 --- a/data/grid5000/sites/nancy/pdus/gros-wattmetre2.json +++ b/data/grid5000/sites/nancy/pdus/gros-wattmetre2.json @@ -51,21 +51,6 @@ "8": "gros-67", "9": "gros-68" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "wattmetre": { - "available": true, - "unit": "W", - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - } - ], "type": "pdu", "uid": "gros-wattmetre2", "vendor": "OmegaWatt" diff --git a/data/grid5000/sites/nancy/pdus/gros-wattmetre3.json b/data/grid5000/sites/nancy/pdus/gros-wattmetre3.json index a9d6a2b9b61..e8eda65f438 100644 --- a/data/grid5000/sites/nancy/pdus/gros-wattmetre3.json +++ b/data/grid5000/sites/nancy/pdus/gros-wattmetre3.json @@ -63,21 +63,6 @@ "8": "gros-119", "9": "gros-120" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "wattmetre": { - "available": true, - "unit": "W", - "www": { - "url": "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" - } - } - } - } - ], "type": "pdu", "uid": "gros-wattmetre3", "vendor": "OmegaWatt" diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json index 8bdc91087bd..7aa2deb719d 100644 --- a/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json +++ b/data/grid5000/sites/nancy/pdus/grvingt-pdu1.json @@ -4,21 +4,6 @@ "model": "AP8886", "ports": { }, - "sensors": [ - { - "power": { - "per_outlets": false, - "resolution": 1, - "snmp": { - "available": true, - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grvingt-pdu1", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json b/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json index ae721ef29e1..dfcb58f43ad 100644 --- a/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json +++ b/data/grid5000/sites/nancy/pdus/grvingt-pdu2.json @@ -4,21 +4,6 @@ "model": "AP8886", "ports": { }, - "sensors": [ - { - "power": { - "per_outlets": false, - "resolution": 1, - "snmp": { - "available": true, - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "grvingt-pdu2", "vendor": "APC" diff --git a/data/grid5000/sites/nancy/servers/srv-data.json b/data/grid5000/sites/nancy/servers/srv-data.json index 16fb2e42225..0706a84e749 100644 --- a/data/grid5000/sites/nancy/servers/srv-data.json +++ b/data/grid5000/sites/nancy/servers/srv-data.json @@ -1,9 +1,5 @@ { "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.79.16", @@ -16,28 +12,16 @@ "mounted": true } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 20, + "uid": "grisou-pdu1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 20, - "uid": "grisou-pdu1" - }, - { - "port": 20, - "uid": "grisou-pdu2" - } - ] - } + { + "port": 20, + "uid": "grisou-pdu2" } - }, + ], "serial": "GCQ7NZ1", "type": "server", "uid": "srv-data", diff --git a/data/grid5000/sites/nancy/servers/srv-data2.json b/data/grid5000/sites/nancy/servers/srv-data2.json index 3c6808c4e4a..61de0c4647a 100644 --- a/data/grid5000/sites/nancy/servers/srv-data2.json +++ b/data/grid5000/sites/nancy/servers/srv-data2.json @@ -6,10 +6,6 @@ "modules" ], "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.79.17", @@ -22,28 +18,16 @@ "mounted": false } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 1, + "uid": "gros-pdu7" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 1, - "uid": "gros-pdu7" - }, - { - "port": 1, - "uid": "gros-pdu8" - } - ] - } + { + "port": 1, + "uid": "gros-pdu8" } - }, + ], "serial": "DKHBSY2", "type": "server", "uid": "srv-data2", diff --git a/data/grid5000/sites/nancy/servers/srv.json b/data/grid5000/sites/nancy/servers/srv.json index 07fab5ca7d0..f1da4af896c 100644 --- a/data/grid5000/sites/nancy/servers/srv.json +++ b/data/grid5000/sites/nancy/servers/srv.json @@ -1,9 +1,5 @@ { "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.79.18", @@ -16,28 +12,16 @@ "mounted": true } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 15, + "uid": "graoully-pdu1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 15, - "uid": "graoully-pdu1" - }, - { - "port": 15, - "uid": "graoully-pdu2" - } - ] - } + { + "port": 15, + "uid": "graoully-pdu2" } - }, + ], "serial": "G8VYKZ1", "type": "server", "uid": "srv", diff --git a/data/grid5000/sites/nancy/servers/srv2.json b/data/grid5000/sites/nancy/servers/srv2.json index b1f95f96b76..0c6481ba44b 100644 --- a/data/grid5000/sites/nancy/servers/srv2.json +++ b/data/grid5000/sites/nancy/servers/srv2.json @@ -3,10 +3,6 @@ "ntp" ], "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "adm": { "ip": "172.17.79.22" @@ -18,28 +14,16 @@ "ip": "172.16.79.22" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 23, + "uid": "grimoire-pdu1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 23, - "uid": "grimoire-pdu1" - }, - { - "port": 23, - "uid": "grimoire-pdu2" - } - ] - } + { + "port": 23, + "uid": "grimoire-pdu2" } - }, + ], "serial": "37H1J82", "type": "server", "uid": "srv2", diff --git a/data/grid5000/sites/nancy/servers/srv3.json b/data/grid5000/sites/nancy/servers/srv3.json index ff59764f8fc..3d5f0c223c8 100644 --- a/data/grid5000/sites/nancy/servers/srv3.json +++ b/data/grid5000/sites/nancy/servers/srv3.json @@ -4,10 +4,6 @@ "adminfront" ], "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "adm": { "ip": "172.17.79.19" @@ -21,28 +17,16 @@ "mac": "e4:43:4b:83:8a:ec" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 14, + "uid": "gros-pdu7" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 14, - "uid": "gros-pdu7" - }, - { - "port": 14, - "uid": "gros-pdu8" - } - ] - } + { + "port": 14, + "uid": "gros-pdu8" } - }, + ], "serial": "FKHBSY2", "type": "server", "uid": "srv3", diff --git a/data/grid5000/sites/nancy/servers/talc-data-baie2.json b/data/grid5000/sites/nancy/servers/talc-data-baie2.json index a673bf74fe7..43d0662ec4a 100644 --- a/data/grid5000/sites/nancy/servers/talc-data-baie2.json +++ b/data/grid5000/sites/nancy/servers/talc-data-baie2.json @@ -5,24 +5,16 @@ "kind": "storage", "network_adapters": { }, - "sensors": { - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 22, - "uid": "grisou-pdu1" - }, - { - "port": 22, - "uid": "grisou-pdu2" - } - ] - } + "pdu": [ + { + "port": 22, + "uid": "grisou-pdu1" + }, + { + "port": 22, + "uid": "grisou-pdu2" } - }, + ], "serial": "3WT6RG2", "type": "server", "uid": "talc-data-baie2", diff --git a/data/grid5000/sites/nancy/servers/talc-data-baie3.json b/data/grid5000/sites/nancy/servers/talc-data-baie3.json index 9e3169dbc9a..87115266218 100644 --- a/data/grid5000/sites/nancy/servers/talc-data-baie3.json +++ b/data/grid5000/sites/nancy/servers/talc-data-baie3.json @@ -5,24 +5,16 @@ "kind": "storage", "network_adapters": { }, - "sensors": { - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 23, - "uid": "grisou-pdu1" - }, - { - "port": 23, - "uid": "grisou-pdu2" - } - ] - } + "pdu": [ + { + "port": 23, + "uid": "grisou-pdu1" + }, + { + "port": 23, + "uid": "grisou-pdu2" } - }, + ], "serial": "3DV6DK2", "type": "server", "uid": "talc-data-baie3", diff --git a/data/grid5000/sites/nancy/servers/talc-data.json b/data/grid5000/sites/nancy/servers/talc-data.json index dcc026a838a..487b3b89fea 100644 --- a/data/grid5000/sites/nancy/servers/talc-data.json +++ b/data/grid5000/sites/nancy/servers/talc-data.json @@ -3,10 +3,6 @@ ], "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, "network_adapters": { "bmc": { "ip": "172.17.79.21" @@ -15,28 +11,16 @@ "ip": "172.16.79.21" } }, - "sensors": { - "network": { - "available": true, - "resolution": 1 + "pdu": [ + { + "port": 21, + "uid": "grisou-pdu1" }, - "power": { - "available": true, - "resolution": 1, - "via": { - "pdu": [ - { - "port": 21, - "uid": "grisou-pdu1" - }, - { - "port": 21, - "uid": "grisou-pdu2" - } - ] - } + { + "port": 21, + "uid": "grisou-pdu2" } - }, + ], "serial": "92ZLL82", "type": "server", "uid": "talc-data", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json index c83cf0fa867..faa3b5d5738 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json index a35601b7dfe..09e37dd64e4 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json index 2998b0f5e2d..d78d1723f0d 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json index e1d3a0324e1..5683d9c567f 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json index 50f32a420cb..cb986f004b6 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json index 04b77ac9ebd..0a3638460f7 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json index 42dbbeb7889..5e08325778a 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -180,11 +177,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json index cd5969d431f..88a1cda2eb9 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json index fa3fd2ac7e7..66a5802e755 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json index 7de3e563b17..4bc4edbc10e 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json index ec79992da3b..b9a74599a46 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json index 1621b719173..f092f9f1450 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json index 4bf2c6b7e48..0c10abede06 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json index 480710ebf42..34835330582 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json index 51dc299da01..1a8012971e6 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json index 8fab0b9f5a1..21ed2d1ea90 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json index 553459bd6b6..c428b015986 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json index d8d7f3f1688..1aabb0df9a1 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json index f8c262bfaf0..3b83380c7d3 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json index 6e0cb01543b..b716a6ddac7 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json index 2b2f3fab949..4edd2bfe039 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json index 51b43126c2a..d4036d9eb39 100644 --- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json +++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 68719476736 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -179,11 +176,6 @@ "vendor": "Intel", "version": "E5-2660" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json index a02a13a54ce..95232c0b491 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json index 7d42167e174..4cfe91fb012 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json index a4282a1b53e..ce10e428855 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json index 465f7d325ac..bf24735d7b9 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json index f5860bb2077..9c1ce7ba3a7 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json index 6853beb762f..b63f42d5db0 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json index 3690901a509..ade0c6a389f 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json index 39aa0e97dc9..0de78e11a2a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json index 4a71d722f07..e3f269798eb 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json index 55058fb2dad..8f110326aad 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json index 2827619c8fa..c3d7c304895 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json index 038d1887631..76f54d6316b 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json index 810e4ad4b92..527a9e9743a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json index 2fc16bb522b..b7138e5fe88 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json index e4199138fda..20e011bf1f9 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json index dd8af02b9cc..258e9efab88 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json index 184b8b51b38..2f3217ed1bb 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json index 339e32f4b44..e3d27061616 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json index a577ec18473..e49fc187e1f 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json index 336ab30be13..086bfe823db 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json index fd7c8249c35..c5155f9c481 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json index b332ec1b408..d2fac069913 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json index 4dfee3ff90d..36aecc7c260 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json index be3c1a22962..d4e91df1506 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json index def53bad76f..74cd13ab860 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json index 9527a6c6dd0..236024398c0 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json index 4783891b5ae..02b7ca85428 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json index a67641cd5d7..f55515f79c9 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json index bc75235c39f..a69cbc112db 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json index 3629d53788b..70251fd05a6 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json index d5412e1fd22..3b464d494d5 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json index 5ad9e39b587..f7be3be0778 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json index c305b82273c..e6ba530e459 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json index b931f5d0253..2d1469be933 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json index c44c8856591..641d6204d32 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json index 62172f7f20e..4f38ed6d865 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json index 6774f68b0ba..df29aae9d1f 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json index 810437bd686..718012ad23a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json index 242562fb40b..08fd5f7f78b 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json index c3681b718a5..2a9196f37bc 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json index 66b22def9ba..b6135ef1d5c 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json index b07f1022ec4..44f515fce6a 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json index 2909c19a315..7bf04a28f6e 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json index 6a1eeb7f771..4b694bf512f 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json index 00c432c37c7..054cb3dfb03 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json index 4b11678d5a9..2cc57c24f94 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json index 991ca91ff32..f73cd1de0fd 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json index 703d6d9ceb4..00ca048ef0c 100644 --- a/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json +++ b/data/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "device": "eth0", @@ -219,8 +216,6 @@ "vendor": "Intel", "version": "E5-2630L v4" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json index fe43df6a6ed..6a3a60e4e39 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json index d8863625baa..37f7e017a0d 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json index 6bf709335e3..7da5b20ba3a 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json index f2bba06fdc9..11eaf378f52 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json index 9073ea8e1f2..913e0551e81 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json index 16eb36195d3..23a274a0c73 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json index e8aece997e6..a0c1262f989 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json index 8f932b80be1..84c97c3cb81 100644 --- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json +++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json @@ -139,9 +139,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -267,11 +264,6 @@ "vendor": "Intel", "version": "E5-2660 v2" }, - "sensors": { - "power": { - "available": false - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json index 9bd784f4da6..e14198f2ee7 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json index 310940b3032..39f8b683a22 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json index 2f631a7ce45..8072575bbb7 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 24, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 24, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json index 1b14c0e8cb1..85958e8f9e7 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json index 1b91792d4e4..064d965933c 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json index e6581d205c8..a191a1d9022 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json index 0537c4df2ea..21f773b2938 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json index d689793f8fd..40914ea249e 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json index 28408030fed..2cdb158ed6d 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json index 54e0e3001ab..4884b224742 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json index b4e50d43c80..352977f1a8d 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "parapluie-pdu-4" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "parapluie-pdu-4" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json index 80ac6b42f7a..5c8f1217731 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 24, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 24, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json index 91e72c8c7cd..94fca0a5627 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json index 5cd7385913c..77d5669a4b8 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 20, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json index 10664ee1108..0a38fb23468 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json index fd46dd4b486..4eaafed8abe 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json index 3c889b6d9fb..e8fb2f3f36f 100644 --- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json +++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 25769803776 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -165,6 +161,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "parapluie-pdu-3" + } + ], "performance": { "core_flops": 11800000000, "node_flops": 94400000000 @@ -185,36 +187,6 @@ "vendor": "Intel", "version": "X5570" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "parapluie-pdu-3" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "/MB/T_AMB" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json index e06a658903b..4fbcc06223d 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 24, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 24, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json index fb11cbe62e7..618a9fc148f 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 20, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json index fb83f6c38c6..a01f35c273c 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 5, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json index 3da4ce0b3e3..8eef7cab859 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 3, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json index bc5e175d433..ccb3b999fc8 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 2, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json index 228ac3f18d9..a8bf2f16c67 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 23, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 23, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json index 19e3aaed74c..ec887f0d10a 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 1, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json index 70386dfb9a8..c41e762c9ac 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 24, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 24, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json index 1ca91771b33..4e7ee5c88ee 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 23, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 23, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json index 77f77444e7c..793a867ebfe 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 22, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json index 86ffdd7c83f..26c5262e9da 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 21, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json index 96431837108..4d019c1c203 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 20, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 20, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json index ecd665604c5..28b4a3e7ac3 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 5, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json index c856c3110df..96bf31dc08e 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 4, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json index 8ccc30694fd..6071673669a 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 3, + "uid": "parapluie-pdu-2" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "parapluie-pdu-2" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json index a10ca87707b..e7be844423f 100644 --- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json +++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json @@ -63,10 +63,6 @@ "main_memory": { "ram_size": 51539607552 }, - "monitoring": { - "temperature": true, - "wattmeter": "true" - }, "network_adapters": [ { "bridged": false, @@ -198,6 +194,12 @@ "pstate_governor": "performance", "turboboost_enabled": false }, + "pdu": [ + { + "port": 21, + "uid": "parapluie-pdu-1" + } + ], "performance": { "core_flops": 6800000000, "node_flops": 163200000000 @@ -218,36 +220,6 @@ "vendor": "AMD", "version": "6164 HE" }, - "sensors": { - "power": { - "available": true, - "per_outlets": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "parapluie-pdu-1" - } - ] - } - }, - "temperature": { - "available": true, - "via": { - "api": { - "metric": "ambient_temp" - }, - "ipmi": { - "sensors": { - "ambient": "Inlet Ambient" - } - } - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json index f5480ebd303..8e8b6f1400f 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json index 647b5d94add..0bb47f899b0 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "parasilo-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "parasilo-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json index ee0e408ae27..44fe8b7d63a 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json index 39482e32548..dd7347fca7d 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json index db5c60b21f9..5dc27762570 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json index 7562fc4068e..2769c17775f 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json index 2addb9e06d5..0c5145c18af 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json index c181206d9b0..33af58704d2 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -223,8 +220,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json index e9f3b6cd39a..5c0ab35d4fd 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "parasilo-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "parasilo-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json index 88ce760ac1f..a067539b685 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -223,8 +220,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json index 236970a4d2b..6e98340876f 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "parasilo-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "parasilo-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json index 9df010910e0..f7b3e8d36fe 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json index 70c814e3c4a..8c4affe36cf 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -223,8 +220,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json index 90b401cd3b5..44ba926842a 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json index e126a6d0330..007180b084e 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json index 890dc97bc2e..c25b94bbb2b 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json index 5e048a25290..5b9d6a69ef1 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json index 8e056655a7f..efd45e7e9c3 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json index 2df09dfbdc9..e98fbfa4eb2 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json index b49744d621f..8a1a63d4e4c 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json index a693126bd50..3f436d06a06 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json index 411223ff2d0..3024c7dd277 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json index 3ce3fc47e9d..4f4559ff4e7 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "parasilo-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "parasilo-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json index 422f9204888..8b741f18034 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "parasilo-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "parasilo-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json index 6c68aa19522..47c113db617 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "parasilo-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "parasilo-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json index bf913a30b95..299731fdadd 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "parasilo-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "parasilo-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json index 6f2064a0f44..3a9b76d4e1f 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -223,8 +220,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json index bcde7da560e..2cfff169972 100644 --- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json +++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -223,8 +220,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json index 4c78b5cde25..36019e3e0c1 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -223,8 +220,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json index 7d3f3ecfa55..84ba8995884 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json index f737fcb1989..7cc2f9725ef 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json index 737181b7693..35192aafb6d 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json index 905c4189930..fa90b5515ba 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json index 5a11750bd92..0970c487854 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json index dd27cb040b5..e7f11559c2f 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json index 384d3e0d9a1..6d590ac0e24 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json index ec547901222..3de9bde2356 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json index 5a1165725ff..7bd5c593c5d 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json index 25e1ec9883f..41121652d66 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json index 68ab7b517c9..525d338478a 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -223,8 +220,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json index 7ad5acee09c..0d512626316 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json index d26ccc7e6af..5ab1b707aab 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json index de3ee6042c4..855d4e2a246 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json index 8284f4d63b3..6ea505e3148 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json index ae4719ccd1b..188360b7921 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json index de18527bc2d..b0c29382358 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 22, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 22, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json index 84c7ac8b956..e175c21caa8 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json index 99b3b36167d..d2409eac817 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json index 6fd50a31bc1..9423ca27106 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json index c4b75dbef5e..30419e94df1 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json index 9df93fd8f1b..397a1990912 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json index d47d5e3cf3b..3b141b48268 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json index 3cdb217827c..931a79fb4cf 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 13, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 13, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json index ef5e47cff3b..3e0d490bcdc 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json index bbd686165f6..bdc8aa8033b 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json index 19a909b6285..e65df0924cc 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json index 198e51ddb96..31963fcdb95 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json index 058d0997950..f6d548bc2a5 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json index 0dcb30e3ada..44461bd0b29 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json index 1722f3b4ab5..a20cee74cfb 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json index b85bcbc4bd2..7cfa8bf29d1 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 18, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 18, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json index 6a9a7c50758..3eff576c4b1 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "parasilo-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "parasilo-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json index 760a4d7f6f2..4979e2452b2 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json index 53a66a8cab2..47693bc1bd3 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 11, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 11, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json index 4a66fff6a59..0c1e5a154d4 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json index e0bff2164b7..98be2ffd373 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json index 69510c8179a..41c17bff464 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json index d0913cf65d3..4b0553a7efa 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json index 81368bf2ed3..414c8e1d480 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json index d1edc79ada0..2f3fb44186a 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json index 3ff064898ea..ce27c4ce61f 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json index eef1e9a860c..1cddc4f83d5 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 6, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 6, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json index c97b7673de1..05483185264 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "paravance-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "paravance-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json index fd9ce1d794f..63d93c3bd33 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json index 32cb5fd15ae..587eae522dd 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 5, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 5, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json index b5f6f6e5d23..b72ef8d35fe 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json index dee1362a06d..4be9cb05b8e 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json index 08c5557b93c..2ed62c8e25d 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 3, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 3, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json index 1216e58b59a..653015da6bc 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 4, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 4, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json index 73e15653eaa..386ddac446c 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json index 43920b70e38..905022acc41 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 2, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 2, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json index 969d7c1853c..8e563ef8dff 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "paravance-pdu-7" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "paravance-pdu-7" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json index 0a439a890f4..f27dd65a81f 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 1, + "uid": "paravance-pdu-8" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 1, - "uid": "paravance-pdu-8" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json index b93c70dbbfa..ca042de3241 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 7, + "uid": "parasilo-pdu-2" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 7, - "uid": "parasilo-pdu-2" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json index 06df7952880..c014e13729f 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json index f17e7e92c5e..daea3b5058d 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 21, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 21, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json index ed9a4eb08ad..34c893cb96c 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json index d67336654b0..cc4cbeb9fc8 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 19, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 19, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json index 192d1cce766..b79d55fed1f 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json index 621b732da67..10b9d8e257d 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 17, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 17, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json index 3281d8a55b9..dcf7fd8576e 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 15, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 15, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json index 1c80df8f9da..6fa2b237c53 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 14, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 14, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json index 42dec0cdc05..8bff8e85b28 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 12, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 12, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json index bc0dedb9279..c3ffeee1f25 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json index ad7c3a32e3b..7c02b7c94c2 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json index 158d9fb0f1e..c5b56297450 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json index 57f9e06ec06..44ccc874f39 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "paravance-pdu-6" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "paravance-pdu-6" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json index 23529a2b8b8..c8c25211764 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "paravance-pdu-5" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "paravance-pdu-5" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json index 2694e057d13..f32ecddc9f0 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 10, + "uid": "paravance-pdu-4" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 10, - "uid": "paravance-pdu-4" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json index 76ee9459915..ddb2826add1 100644 --- a/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json +++ b/data/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.json @@ -101,9 +101,6 @@ "main_memory": { "ram_size": 137438953472 }, - "monitoring": { - "wattmeter": "true" - }, "network_adapters": [ { "bridged": true, @@ -203,6 +200,12 @@ "pstate_governor": "performance", "turboboost_enabled": true }, + "pdu": [ + { + "port": 9, + "uid": "paravance-pdu-3" + } + ], "performance": { "core_flops": 38400000000, "node_flops": 614400000000 @@ -223,22 +226,6 @@ "vendor": "Intel", "version": "E5-2630 v3" }, - "sensors": { - "power": { - "available": true, - "via": { - "api": { - "metric": "power" - }, - "pdu": [ - { - "port": 9, - "uid": "paravance-pdu-3" - } - ] - } - } - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json index 4bee182a9ff..bd4b566ffbc 100644 --- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json +++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-1.json @@ -11,23 +11,6 @@ "3": "parapluie-15", "5": "parapluie-12" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 60, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0", - "total_oids": [ - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parapluie-pdu-1", "vendor": "Eaton Corporation" diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json index 1fa9cf5cfee..c25b5d643b1 100644 --- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json +++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-2.json @@ -12,23 +12,6 @@ "4": "parapluie-35", "5": "parapluie-32" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 60, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0", - "total_oids": [ - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parapluie-pdu-2", "vendor": "Eaton Corporation" diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json index 157eae89e1d..d69fcb2d2d1 100644 --- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json +++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-3.json @@ -11,23 +11,6 @@ "4": "parapide-9", "5": "parapide-10" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 60, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0", - "total_oids": [ - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parapluie-pdu-3", "vendor": "Eaton Corporation" diff --git a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json index ee7c26e0d55..cf9d8650b16 100644 --- a/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json +++ b/data/grid5000/sites/rennes/pdus/parapluie-pdu-4.json @@ -11,23 +11,6 @@ "3": "parapide-19", "4": "parapide-25" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 60, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0", - "total_oids": [ - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", - "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parapluie-pdu-4", "vendor": "Eaton Corporation" diff --git a/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json b/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json index 897eb80fea9..3e10554cc3b 100644 --- a/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json +++ b/data/grid5000/sites/rennes/pdus/parasilo-pdu-1.json @@ -14,22 +14,6 @@ "model": "AP8659", "ports": { }, - "sensors": [ - { - "power": { - "per_outlets": false, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parasilo-pdu-1", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/parasilo-pdu-2.json b/data/grid5000/sites/rennes/pdus/parasilo-pdu-2.json index e9758a5b6c6..44606ed14ed 100644 --- a/data/grid5000/sites/rennes/pdus/parasilo-pdu-2.json +++ b/data/grid5000/sites/rennes/pdus/parasilo-pdu-2.json @@ -21,22 +21,6 @@ "6": "paravance-4", "7": "paravance-6" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parasilo-pdu-2", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/parasilo-pdu-3.json b/data/grid5000/sites/rennes/pdus/parasilo-pdu-3.json index d468cc843c3..474601183c3 100644 --- a/data/grid5000/sites/rennes/pdus/parasilo-pdu-3.json +++ b/data/grid5000/sites/rennes/pdus/parasilo-pdu-3.json @@ -23,22 +23,6 @@ "5": "parasilo-12", "9": "parasilo-23" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parasilo-pdu-3", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/parasilo-pdu-4.json b/data/grid5000/sites/rennes/pdus/parasilo-pdu-4.json index 09e75489862..a019ca5d2ad 100644 --- a/data/grid5000/sites/rennes/pdus/parasilo-pdu-4.json +++ b/data/grid5000/sites/rennes/pdus/parasilo-pdu-4.json @@ -23,22 +23,6 @@ "5": "parasilo-11", "9": "parasilo-24" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "parasilo-pdu-4", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/paravance-pdu-2.json b/data/grid5000/sites/rennes/pdus/paravance-pdu-2.json index 495f1b93b1d..e44237e4086 100644 --- a/data/grid5000/sites/rennes/pdus/paravance-pdu-2.json +++ b/data/grid5000/sites/rennes/pdus/paravance-pdu-2.json @@ -28,22 +28,6 @@ "5": "paravance-3", "9": "paravance-36" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "paravance-pdu-2", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/paravance-pdu-3.json b/data/grid5000/sites/rennes/pdus/paravance-pdu-3.json index 2081941a872..34602318c23 100644 --- a/data/grid5000/sites/rennes/pdus/paravance-pdu-3.json +++ b/data/grid5000/sites/rennes/pdus/paravance-pdu-3.json @@ -23,22 +23,6 @@ "7": "paravance-12", "9": "paravance-9" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "paravance-pdu-3", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/paravance-pdu-4.json b/data/grid5000/sites/rennes/pdus/paravance-pdu-4.json index e75dff12a0f..8254e0150c6 100644 --- a/data/grid5000/sites/rennes/pdus/paravance-pdu-4.json +++ b/data/grid5000/sites/rennes/pdus/paravance-pdu-4.json @@ -23,22 +23,6 @@ "7": "paravance-11", "9": "paravance-10" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "paravance-pdu-4", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/paravance-pdu-5.json b/data/grid5000/sites/rennes/pdus/paravance-pdu-5.json index 2a92e4c0dab..b9644e3968e 100644 --- a/data/grid5000/sites/rennes/pdus/paravance-pdu-5.json +++ b/data/grid5000/sites/rennes/pdus/paravance-pdu-5.json @@ -23,22 +23,6 @@ "21": "paravance-61", "9": "paravance-72" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "paravance-pdu-5", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/paravance-pdu-6.json b/data/grid5000/sites/rennes/pdus/paravance-pdu-6.json index 95825e77df7..c8488c0efdf 100644 --- a/data/grid5000/sites/rennes/pdus/paravance-pdu-6.json +++ b/data/grid5000/sites/rennes/pdus/paravance-pdu-6.json @@ -23,22 +23,6 @@ "3": "paravance-42", "9": "paravance-71" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "paravance-pdu-6", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/paravance-pdu-7.json b/data/grid5000/sites/rennes/pdus/paravance-pdu-7.json index 3b5a405393a..f69d0abbe45 100644 --- a/data/grid5000/sites/rennes/pdus/paravance-pdu-7.json +++ b/data/grid5000/sites/rennes/pdus/paravance-pdu-7.json @@ -23,22 +23,6 @@ "6": "paravance-49", "7": "paravance-47" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "paravance-pdu-7", "vendor": "APC" diff --git a/data/grid5000/sites/rennes/pdus/paravance-pdu-8.json b/data/grid5000/sites/rennes/pdus/paravance-pdu-8.json index 51ffa356239..33079e0809f 100644 --- a/data/grid5000/sites/rennes/pdus/paravance-pdu-8.json +++ b/data/grid5000/sites/rennes/pdus/paravance-pdu-8.json @@ -23,22 +23,6 @@ "7": "paravance-48", "9": "paravance-38" }, - "sensors": [ - { - "power": { - "per_outlets": true, - "resolution": 1, - "snmp": { - "available": true, - "outlet_prefix_oid": "iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7", - "total_oids": [ - "iso.3.6.1.4.1.318.1.1.12.1.16.0" - ], - "unit": "W" - } - } - } - ], "type": "pdu", "uid": "paravance-pdu-8", "vendor": "APC" diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json index 857a496c65e..862362d00e4 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json index ca79ecf0722..ca955a1203a 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json index 871f9ffc504..193530f5725 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json index 918a1a6ee84..22afb5540bb 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json index 855330d5e3a..1cb3fe5be58 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json index fdb5a703767..565c2dd7ae8 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json index 9977c724705..e837e4dde95 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json index 9ad986f3f54..cc015060c4a 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json index 2251d0dbc91..41c8047aa11 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json index 4ac53909224..3af0eba7c1b 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json index cdfb9b01b4e..27a05196901 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json index 949cba32f3e..582ee956f6c 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json index 1301d25a98d..27583b2e3ff 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json index 44f6cf0ed7c..e245be28228 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json index 31d6b2e651f..13519e97877 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json index 330dbb45124..ac8a5857817 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json index 5b1a7589631..35a9de7414f 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json index a40e52db254..8ce5d10479d 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json index 0354e637015..ee95d42e91e 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json index ac8fd4717a2..a5959be45d5 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json index 9fcb28bb104..958fbee987b 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json index a57fb98e9de..0c84ef3e0ce 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json index ba581f36415..5e3d3ae818b 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json index e495df99264..771ba76b058 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json index 220b52f52aa..bb8f6ff551f 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json index 0532d91c016..d8210ac0e11 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json index 0aabe4100ba..a1985963a20 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json index 7a08e81d4a7..479c7fc1b9c 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json index 67aed6c30cb..06d7f7671de 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json index cd9bcbab782..86b542c65e5 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json index 9f721763c94..a0ebee13737 100644 --- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json +++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json @@ -63,9 +63,6 @@ "main_memory": { "ram_size": 103079215104 }, - "monitoring": { - "wattmeter": "false" - }, "network_adapters": [ { "bridged": true, @@ -182,8 +179,6 @@ "vendor": "Intel", "version": "X5670" }, - "sensors": { - }, "software": { "forced-deployment-timestamp": 202007300948, "postinstall-version": "1.2021041500", diff --git a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml index 0d59a108b14..d44cc5f4a9f 100644 --- a/input/grid5000/sites/grenoble/clusters/troll/troll.yaml +++ b/input/grid5000/sites/grenoble/clusters/troll/troll.yaml @@ -43,14 +43,3 @@ nodes: alt_model_name: Samsung PM1735 sda: interface: SATA - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.grenoble.grid5000.fr/GetWatts-json.php diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml index 04d72cfd0f3..b70d4e7a1ba 100644 --- a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml +++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml @@ -62,14 +62,3 @@ nodes: sdd: interface: SAS reservation: true - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://digwatt.grenoble.grid5000.fr/GetWatts-json.php diff --git a/input/grid5000/sites/grenoble/pdus.yaml b/input/grid5000/sites/grenoble/pdus.yaml index ff1cd502f98..739c3ed6cb5 100644 --- a/input/grid5000/sites/grenoble/pdus.yaml +++ b/input/grid5000/sites/grenoble/pdus.yaml @@ -4,15 +4,6 @@ pdus: vendor: OmegaWatt model: '' ip: 172.16.31.9 - sensors: - - power: - resolution: 1 - per_outlets: true - wattmetre: - available: true - unit: W - www: - url: "http://digwatt.grenoble.grid5000.fr/GetWatts-json.php" metrics: - name: wattmetre_power_watt description: Power consumption per outlet reported by wattmetre, in watt diff --git a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml index 9c4fde9c1c1..20aeef42aac 100644 --- a/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml +++ b/input/grid5000/sites/lille/clusters/chetemi/chetemi.yaml @@ -19,8 +19,6 @@ nodes: clock_speed: 2200000000 software: standard-environment: debian10-x64-std - monitoring: - wattmeter: multiple network_adapters: bmc: interface: Ethernet diff --git a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml index 32f27bbb2af..aa677574064 100644 --- a/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml +++ b/input/grid5000/sites/lille/clusters/chiclet/chiclet.yaml @@ -19,8 +19,6 @@ nodes: clock_speed: 2200000000 software: standard-environment: debian10-x64-std - monitoring: - wattmeter: multiple network_adapters: bmc: interface: Ethernet diff --git a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml index 3afd2c42864..a31e1465274 100644 --- a/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml +++ b/input/grid5000/sites/lille/clusters/chifflet/chifflet.yaml @@ -19,8 +19,6 @@ nodes: clock_speed: 2400000000 software: standard-environment: debian10-x64-std - monitoring: - wattmeter: multiple network_adapters: bmc: interface: Ethernet diff --git a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml index d0da4260491..e1a38c98a5a 100644 --- a/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml +++ b/input/grid5000/sites/lille/clusters/chifflot/chifflot.yaml @@ -19,8 +19,6 @@ nodes: clock_speed: 2600000000 software: standard-environment: debian10-x64-std - monitoring: - wattmeter: multiple network_adapters: bmc: interface: Ethernet diff --git a/input/grid5000/sites/lille/pdus.yaml b/input/grid5000/sites/lille/pdus.yaml index bc2055dc4e4..0c35ee49b25 100644 --- a/input/grid5000/sites/lille/pdus.yaml +++ b/input/grid5000/sites/lille/pdus.yaml @@ -10,16 +10,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - resolution: 1 - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 pdu-b2p[1-2]: *ap8659 pdu-b3p2-[1-2]: *ap8659 pdu-b1p1: @@ -41,16 +31,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - resolution: 1 - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 ip: 172.17.47.250 mac: 00:23:ae:e2:d8:7f pdu-b2p1: @@ -69,17 +49,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - resolution: 1 - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - ip: 172.17.47.247 mac: 00:c0:b7:f2:b0:f8 pdu-b3p2-1: @@ -93,6 +62,3 @@ pdus: model: AP7951 ip: 172.17.47.249 mac: 00:c0:b7:4f:32:78 - sensors: - - power: - per_outlets: false diff --git a/input/grid5000/sites/lille/servers/physical.yaml b/input/grid5000/sites/lille/servers/physical.yaml index 5fccfb75e98..8f019b111f2 100644 --- a/input/grid5000/sites/lille/servers/physical.yaml +++ b/input/grid5000/sites/lille/servers/physical.yaml @@ -7,22 +7,11 @@ fives: bmc: ip: 172.17.46.8 mac: 44:a8:42:20:c1:9a - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 4 - - uid: pdu-b2p2 - port: 4 + pdu: + - uid: pdu-b2p1 + port: 4 + - uid: pdu-b2p2 + port: 4 caulier: kind: physical @@ -39,22 +28,11 @@ caulier: bmc: ip: 172.17.46.7 mac: d4:ae:52:af:44:00 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 2 - - uid: pdu-b2p2 - port: 2 + pdu: + - uid: pdu-b2p1 + port: 2 + - uid: pdu-b2p2 + port: 2 flandres: kind: physical @@ -71,22 +49,11 @@ flandres: bmc: ip: 172.17.46.5 mac: d4:ae:52:af:1c:71 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 3 - - uid: pdu-b2p2 - port: 3 + pdu: + - uid: pdu-b2p1 + port: 3 + - uid: pdu-b2p2 + port: 3 carbonade: kind: physical @@ -103,22 +70,11 @@ carbonade: bmc: ip: 172.17.46.12 mac: d4:ae:52:af:2e:ee - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 5 - - uid: pdu-b2p2 - port: 5 + pdu: + - uid: pdu-b2p1 + port: 5 + - uid: pdu-b2p2 + port: 5 srv-data: kind: physical @@ -137,22 +93,11 @@ srv-data: bmc: ip: 172.17.46.11 mac: b0:83:fe:cc:73:02 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 7 - - uid: pdu-b2p2 - port: 7 + pdu: + - uid: pdu-b2p1 + port: 7 + - uid: pdu-b2p2 + port: 7 chimint-srv2: kind: physical @@ -163,22 +108,11 @@ chimint-srv2: bmc: ip: 172.17.46.3 mac: b8:ac:6f:96:8f:54 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 15 - - uid: pdu-b2p2 - port: 15 + pdu: + - uid: pdu-b2p1 + port: 15 + - uid: pdu-b2p2 + port: 15 welsh: kind: physical @@ -198,22 +132,11 @@ welsh: bmc: ip: 172.17.46.1 mac: 84:7b:eb:d5:ae:46 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 6 - - uid: pdu-b2p2 - port: 6 + pdu: + - uid: pdu-b2p1 + port: 6 + - uid: pdu-b2p2 + port: 6 chiterne: kind: physical @@ -226,22 +149,11 @@ chiterne: bmc: ip: 172.17.46.10 mac: 50:9a:4c:61:df:4a - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 9 - - uid: pdu-b2p2 - port: 9 + pdu: + - uid: pdu-b2p1 + port: 9 + - uid: pdu-b2p2 + port: 9 gardin: kind: physical @@ -251,22 +163,11 @@ gardin: bmc: ip: 172.17.46.9 mac: 54:48:10:f4:f9:0c - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 13 - - uid: pdu-b2p2 - port: 13 + pdu: + - uid: pdu-b2p1 + port: 13 + - uid: pdu-b2p2 + port: 13 gwol-north: kind: physical @@ -276,22 +177,11 @@ gwol-north: bmc: ip: 172.17.46.4 mac: 54:48:10:f4:f5:ca - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 14 - - uid: pdu-b2p2 - port: 14 + pdu: + - uid: pdu-b2p1 + port: 14 + - uid: pdu-b2p2 + port: 14 granche-srv1: kind: physical @@ -306,22 +196,11 @@ granche-srv1: bmc: ip: 172.17.46.14 mac: 54:48:10:f2:e9:78 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 11 - - uid: pdu-b2p2 - port: 11 + pdu: + - uid: pdu-b2p1 + port: 11 + - uid: pdu-b2p2 + port: 11 group_storage: name: storage1 size: 90000000000000 @@ -341,22 +220,11 @@ granche-srv2: bmc: ip: 172.17.46.15 mac: 54:48:10:f2:d3:7c - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: pdu-b2p1 - port: 10 - - uid: pdu-b2p2 - port: 10 + pdu: + - uid: pdu-b2p1 + port: 10 + - uid: pdu-b2p2 + port: 10 group_storage: name: storage2 size: 90000000000000 diff --git a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml index bbae14e860e..153e250f7bb 100644 --- a/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml +++ b/input/grid5000/sites/luxembourg/clusters/petitprince/petitprince.yaml @@ -38,5 +38,3 @@ nodes: mountable: false mounted: false switch: gw-luxembourg - monitoring: - wattmeter: false diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml index 227c694e219..0e470175de8 100644 --- a/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml +++ b/input/grid5000/sites/lyon/clusters/gemini/gemini.yaml @@ -47,14 +47,3 @@ nodes: enabled: false mountable: false mounted: false - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php diff --git a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml index 3052c6b2785..6d95b7b2202 100644 --- a/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml +++ b/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml @@ -54,17 +54,6 @@ nodes: enabled: true mounted: false mountable: false - monitoring: - wattmeter: false - sensors: - power: - available: true - per_outlets: false - via: - api: - metric: pdu_shared - www: - url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php hercule-1: network_adapters: diff --git a/input/grid5000/sites/lyon/clusters/nova/nova.yaml b/input/grid5000/sites/lyon/clusters/nova/nova.yaml index 6ad68e9dd79..6bf43338232 100644 --- a/input/grid5000/sites/lyon/clusters/nova/nova.yaml +++ b/input/grid5000/sites/lyon/clusters/nova/nova.yaml @@ -58,9 +58,3 @@ nodes: enabled: true mounted: false mountable: false - monitoring: - wattmeter: false - sensors: - power: - available: false - per_outlets: false diff --git a/input/grid5000/sites/lyon/clusters/orion/orion.yaml b/input/grid5000/sites/lyon/clusters/orion/orion.yaml index b63ec046785..7a27bb52161 100644 --- a/input/grid5000/sites/lyon/clusters/orion/orion.yaml +++ b/input/grid5000/sites/lyon/clusters/orion/orion.yaml @@ -68,17 +68,6 @@ nodes: enabled: true mounted: false mountable: false - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php orion-1: network_adapters: diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml index fcf87814ef3..841bcf10e7c 100644 --- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml +++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml @@ -36,14 +36,3 @@ nodes: interface: SATA sdb: interface: SATA - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml index 7637c9fbaf3..e8a53cbdd5e 100644 --- a/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml +++ b/input/grid5000/sites/lyon/clusters/sagittaire/sagittaire.yaml @@ -54,17 +54,6 @@ nodes: mountable: false mounted: false driver: bnx2 - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php sagittaire-[70-79]: storage_devices: diff --git a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml index 8efb70acedd..6443322b2f5 100644 --- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml +++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml @@ -63,14 +63,3 @@ nodes: enabled: true mounted: false mountable: false - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php diff --git a/input/grid5000/sites/lyon/pdus.yaml b/input/grid5000/sites/lyon/pdus.yaml index 5c99a52444d..729c326f339 100644 --- a/input/grid5000/sites/lyon/pdus.yaml +++ b/input/grid5000/sites/lyon/pdus.yaml @@ -4,15 +4,6 @@ pdus: vendor: OmegaWatt model: '' ip: 172.16.63.8 - sensors: - - power: - resolution: 1 - per_outlets: true - wattmetre: - available: true - unit: W - www: - url: "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" metrics: - name: wattmetre_power_watt description: Power consumption per outlet reported by wattmetre, in watt @@ -25,15 +16,6 @@ pdus: vendor: OmegaWatt model: '' ip: 172.16.63.8 - sensors: - - power: - resolution: 1 - per_outlets: true - wattmetre: - available: true - unit: W - www: - url: "http://wattmetre.lyon.grid5000.fr/GetWatts-json.php" metrics: - name: wattmetre_power_watt description: Power consumption per outlet reported by wattmetre, in watt diff --git a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml index d96a0fd008a..8dad72ad4a5 100644 --- a/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/graffiti/graffiti_pdu.yaml @@ -1,10 +1,5 @@ --- nodes: - graffiti-[1-13]: - monitoring: - wattmeter: multiple - metric: power - graffiti-1: pdu: - uid: graffiti-pdu1 diff --git a/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml b/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml index e7f781c82a9..10523e68ac2 100644 --- a/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/graoully/graoully_pdu.yaml @@ -1,10 +1,5 @@ --- nodes: - graoully-[1-16]: - monitoring: - wattmeter: true - metric: power - graoully-1: pdu: - uid: graoully-pdu1 diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml index 1339ca9c610..ee23c514639 100644 --- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml +++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml @@ -54,12 +54,6 @@ nodes: enabled: true mounted: false mountable: false - sensors: - power: - available: true - via: - api: - metric: pdu graphique-2: supported_job_types: diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml index 4273c02d4a1..404d69b35d3 100644 --- a/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml @@ -1,10 +1,5 @@ --- nodes: - graphique-[1-6]: - monitoring: - wattmeter: multiple - metric: power - graphique-4: pdu: - uid: graoully-pdu2 diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml index 6efeb125ca8..f3356b42c9e 100644 --- a/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml +++ b/input/grid5000/sites/nancy/clusters/graphite/graphite.yaml @@ -67,13 +67,6 @@ nodes: vendor: DELL mic: mic: true - sensors: - power: - available: true - via: - api: - metric: pdu - graphite-1: mic: diff --git a/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml b/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml index d5ff35aeb53..e42f49c5078 100644 --- a/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/graphite/graphite_pdu.yaml @@ -1,10 +1,5 @@ --- nodes: - graphite-[1-4]: - monitoring: - wattmeter: multiple - metric: power - graphite-1: pdu: - uid: graoully-pdu1 diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml index 1614bd49ef6..b8b0e3db655 100644 --- a/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml +++ b/input/grid5000/sites/nancy/clusters/grappe/grappe.yaml @@ -54,15 +54,7 @@ nodes: interface: SAS #model: PERC H330 Mini reservation: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.nancy.grid5000.fr/GetWatts-json.php + grappe-[1-4]: supported_job_types: max_walltime: 172800 diff --git a/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml b/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml index e7969808190..74f5f42ebdb 100644 --- a/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/grappe/grappe_pdu.yaml @@ -1,9 +1,4 @@ nodes: - grappe-[1-16]: - monitoring: - wattmeter: multiple - metric: power - grappe-1: pdu: - uid: grappe-pdu1 diff --git a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml index 6a2e1a3191a..1344dd824e4 100644 --- a/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml +++ b/input/grid5000/sites/nancy/clusters/grcinq/grcinq.yaml @@ -39,13 +39,6 @@ nodes: storage_devices: sda: interface: SATA - monitoring: - wattmeter: shared - metric: power - sensors: - power: - available: true - per_outlets: false grcinq-[1-8]: supported_job_types: diff --git a/input/grid5000/sites/nancy/clusters/grele/grele.yaml b/input/grid5000/sites/nancy/clusters/grele/grele.yaml index 0e4b95970ed..1f34f623102 100644 --- a/input/grid5000/sites/nancy/clusters/grele/grele.yaml +++ b/input/grid5000/sites/nancy/clusters/grele/grele.yaml @@ -13,9 +13,6 @@ nodes: supported_job_types: deploy: true besteffort: true - sensors: - power: - available: false processor: microarchitecture: Broadwell clock_speed: 2200000000 diff --git a/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml b/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml index 3494443b6cf..c3c42993940 100644 --- a/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/grele/grele_pdu.yaml @@ -1,10 +1,5 @@ --- nodes: - grele-[1-14]: - monitoring: - wattmeter: multiple - metric: power - grele-1: pdu: - uid: grimani-pdu1 diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml index 1b33ecc3c24..34f00dc8488 100644 --- a/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml +++ b/input/grid5000/sites/nancy/clusters/grimani/grimani.yaml @@ -13,9 +13,6 @@ nodes: supported_job_types: deploy: true besteffort: true - sensors: - power: - available: false processor: microarchitecture: Haswell clock_speed: 1600000000 diff --git a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml index c2d484044ab..61a479cd5f2 100644 --- a/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/grimani/grimani_pdu.yaml @@ -1,10 +1,5 @@ --- nodes: - grimani-[1-6]: - monitoring: - wattmeter: multiple - metric: power - grimani-1: pdu: - uid: grimani-pdu1 diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml index df5d632da24..0218d28917a 100644 --- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml +++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire.yaml @@ -86,10 +86,3 @@ nodes: enabled: true mounted: false mountable: false - - sensors: - power: - available: true - via: - api: - metric: power diff --git a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_pdu.yaml b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_pdu.yaml index 2975bf568d1..d204e3444d3 100644 --- a/input/grid5000/sites/nancy/clusters/grimoire/grimoire_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/grimoire/grimoire_pdu.yaml @@ -1,10 +1,5 @@ --- nodes: - grimoire-[1-8]: - monitoring: - wattmeter: true - metric: power - grimoire-1: pdu: - uid: grimoire-pdu2 diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml index cbb0ccd8f6b..8041295ba93 100644 --- a/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml +++ b/input/grid5000/sites/nancy/clusters/grisou/grisou.yaml @@ -25,12 +25,6 @@ nodes: interface: SAS sdb: interface: SAS - sensors: - power: - available: true - via: - api: - metric: power # Nodes with 4 interfaces grisou-[1-48]: diff --git a/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml b/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml index cedb0fed2a9..7da41bb65bd 100644 --- a/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/grisou/grisou_pdu.yaml @@ -1,11 +1,5 @@ --- - nodes: - grisou-[1-51]: - monitoring: - wattmeter: true - metric: power - grisou-1: pdu: - uid: grisou-pdu1 diff --git a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml index 61fa212b471..2b8143213b5 100644 --- a/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml +++ b/input/grid5000/sites/nancy/clusters/gros/gros_pdu.yaml @@ -1,17 +1,5 @@ --- nodes: - gros-[1-124]: - monitoring: - wattmeter: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - www: - url: http://wattmetre.nancy.grid5000.fr/GetWatts-json.php gros-1: pdu: - uid: gros-wattmetre1 diff --git a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml index e7dccbaf9af..a2935fefe03 100644 --- a/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml +++ b/input/grid5000/sites/nancy/clusters/grvingt/grvingt.yaml @@ -38,13 +38,6 @@ nodes: storage_devices: sda: interface: SATA - monitoring: - wattmeter: shared - metric: power - sensors: - power: - available: true - per_outlets: false grvingt-[1-8]: supported_job_types: diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml index 73081364fd9..9a57b0190be 100644 --- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml +++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml @@ -10,23 +10,15 @@ gw: alias: - gw-nancy - sgravillon2 - sensors: - power: - available: true - resolution: 1 - via: - pdu: - - uid: graoully-pdu1 - port: 8 - - uid: graoully-pdu2 - port: 8 - - uid: grimoire-pdu1 - port: 8 - - uid: grimoire-pdu2 - port: 8 - monitoring: - wattmeter: multiple - metric: power + pdu: + - uid: graoully-pdu1 + port: 8 + - uid: graoully-pdu2 + port: 8 + - uid: grimoire-pdu1 + port: 8 + - uid: grimoire-pdu2 + port: 8 metrics: - name: network_ifacein_bytes_total description: Input byte counter for the network device port @@ -810,9 +802,9 @@ gw: uid: sgros2 kind: switch rate: 800000000000 - port-channel4: + port-channel4: port: port-channel1 uid: sgrappe kind: switch rate: 800000000000 - + diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml index 82d995d25e7..965a40ddc44 100644 --- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml +++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml @@ -6,17 +6,9 @@ sgraoullyib: kind: switch site: nancy snmp_community: public - sensors: - power: - available: true - resolution: 1 - via: - pdu: - - uid: graoully-pdu2 - port: 7 - monitoring: - wattmeter: true - metric: power + pdu: + - uid: graoully-pdu2 + port: 7 metrics: - name: network_ifacein_bytes_total description: Input byte counter for the network device port diff --git a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml index 95fd29c5425..d36f7657c04 100644 --- a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml +++ b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml @@ -7,20 +7,12 @@ sgrele-opf: kind: switch site: nancy snmp_community: public - sensors: - power: - available: true - resolution: 1 - via: - pdu: - - uid: grimani-pdu1 - port: 10 - - uid: grimani-pdu2 - port: 10 - monitoring: - wattmeter: true - metric: power ip: 172.17.79.253 + pdu: + - uid: grimani-pdu1 + port: 10 + - uid: grimani-pdu2 + port: 10 linecards: 1: snmp_pattern: "%LINECARD%/%PORT%" diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml index abdbbc31e5d..42a7a251c60 100644 --- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml +++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml @@ -6,17 +6,9 @@ sgrisou1: kind: switch site: nancy snmp_community: public - sensors: - power: - available: true - resolution: 1 - via: - pdu: - - uid: grimoire-pdu2 - port: 14 - monitoring: - wattmeter: true - metric: power + pdu: + - uid: grimoire-pdu2 + port: 14 metrics: - name: network_ifacein_bytes_total description: Input byte counter for the network device port diff --git a/input/grid5000/sites/nancy/pdus.yaml b/input/grid5000/sites/nancy/pdus.yaml index eecbedcc2ed..242457d7996 100644 --- a/input/grid5000/sites/nancy/pdus.yaml +++ b/input/grid5000/sites/nancy/pdus.yaml @@ -3,15 +3,6 @@ pdus: grvingt-pdu[1-2]: vendor: APC model: AP8886 - sensors: - - power: - per_outlets: false - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - resolution: 1 graoully-pdu[1-2]: vendor: APC @@ -23,16 +14,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 grimoire-pdu[1-2]: vendor: APC @@ -44,16 +25,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 grisou-pdu[1-2]: vendor: APC @@ -65,16 +36,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 grimani-pdu[1-2]: vendor: APC @@ -86,16 +47,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 graffiti-pdu[1-4]: vendor: APC @@ -107,16 +58,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 graoully-pdu1: ip: 172.17.79.243 @@ -184,16 +125,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 gros-pdu1: ip: 172.17.79.222 @@ -235,31 +166,12 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 gros-wattmetre1: vendor: OmegaWatt model: '' ip: 172.16.79.15 kind: wattmetre-only - sensors: - - power: - resolution: 1 - per_outlets: true - wattmetre: - available: true - unit: W - www: - url: "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" metrics: - name: wattmetre_power_watt description: Power consumption per outlet reported by wattmetre, in watt @@ -273,15 +185,6 @@ pdus: model: '' ip: 172.16.79.15 kind: wattmetre-only - sensors: - - power: - resolution: 1 - per_outlets: true - wattmetre: - available: true - unit: W - www: - url: "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" metrics: - name: wattmetre_power_watt description: Power consumption per outlet reported by wattmetre, in watt @@ -295,15 +198,6 @@ pdus: model: '' ip: 172.16.79.15 kind: wattmetre-only - sensors: - - power: - resolution: 1 - per_outlets: true - wattmetre: - available: true - unit: W - www: - url: "http://wattmetre.nancy.grid5000.fr/GetWatts-json.php" metrics: - name: wattmetre_power_watt description: Power consumption per outlet reported by wattmetre, in watt diff --git a/input/grid5000/sites/nancy/servers/servers.yaml b/input/grid5000/sites/nancy/servers/servers.yaml index 8d1bda4ac62..bd74573b422 100644 --- a/input/grid5000/sites/nancy/servers/servers.yaml +++ b/input/grid5000/sites/nancy/servers/servers.yaml @@ -12,22 +12,11 @@ srv: mounted: true ip: 172.17.79.18 mac: F0:1F:AF:E0:FA:DC - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: graoully-pdu1 - port: 15 - - uid: graoully-pdu2 - port: 15 + pdu: + - uid: graoully-pdu1 + port: 15 + - uid: graoully-pdu2 + port: 15 srv-data: kind: physical @@ -42,22 +31,11 @@ srv-data: mounted: true ip: 172.17.79.16 mac: F0:1F:AF:E1:99:E4 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: grisou-pdu1 - port: 20 - - uid: grisou-pdu2 - port: 20 + pdu: + - uid: grisou-pdu1 + port: 20 + - uid: grisou-pdu2 + port: 20 srv-data2: kind: physical @@ -73,22 +51,11 @@ srv-data2: mounted: true ip: 172.17.79.17 mac: 4C:D9:8F:6B:D5:60 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: gros-pdu7 - port: 1 - - uid: gros-pdu8 - port: 1 + pdu: + - uid: gros-pdu7 + port: 1 + - uid: gros-pdu8 + port: 1 srv2: kind: physical @@ -102,22 +69,11 @@ srv2: ip: 172.17.79.22 bmc: ip: 172.17.79.23 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: grimoire-pdu1 - port: 23 - - uid: grimoire-pdu2 - port: 23 + pdu: + - uid: grimoire-pdu1 + port: 23 + - uid: grimoire-pdu2 + port: 23 talc-data: kind: physical @@ -129,22 +85,11 @@ talc-data: ip: 172.16.79.21 bmc: ip: 172.17.79.21 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: grisou-pdu1 - port: 21 - - uid: grisou-pdu2 - port: 21 + pdu: + - uid: grisou-pdu1 + port: 21 + - uid: grisou-pdu2 + port: 21 talc-data-baie2: kind: storage @@ -152,16 +97,11 @@ talc-data-baie2: warranty: 2021-10 serial: 3WT6RG2 network_adapters: {} - sensors: - power: - available: true - resolution: 1 - via: - pdu: - - uid: grisou-pdu1 - port: 22 - - uid: grisou-pdu2 - port: 22 + pdu: + - uid: grisou-pdu1 + port: 22 + - uid: grisou-pdu2 + port: 22 talc-data-baie3: kind: storage @@ -169,16 +109,11 @@ talc-data-baie3: warranty: 2022-06 serial: 3DV6DK2 network_adapters: {} - sensors: - power: - available: true - resolution: 1 - via: - pdu: - - uid: grisou-pdu1 - port: 23 - - uid: grisou-pdu2 - port: 23 + pdu: + - uid: grisou-pdu1 + port: 23 + - uid: grisou-pdu2 + port: 23 grcinq-srv-1: kind: physical @@ -298,19 +233,8 @@ srv3: bmc: ip: 172.17.79.15 mac: 54:bf:64:fc:97:42 - monitoring: - wattmeter: multiple - metric: power - sensors: - network: - available: true - resolution: 1 - power: - available: true - resolution: 1 - via: - pdu: - - uid: gros-pdu7 - port: 14 - - uid: gros-pdu8 - port: 14 + pdu: + - uid: gros-pdu7 + port: 14 + - uid: gros-pdu8 + port: 14 diff --git a/input/grid5000/sites/nantes/clusters/econome/econome.yaml b/input/grid5000/sites/nantes/clusters/econome/econome.yaml index 13a6f307118..232b1f96f58 100644 --- a/input/grid5000/sites/nantes/clusters/econome/econome.yaml +++ b/input/grid5000/sites/nantes/clusters/econome/econome.yaml @@ -47,8 +47,3 @@ nodes: enabled: true mounted: false mountable: false - monitoring: - wattmeter: false - sensors: - power: - available: false diff --git a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml index 0f7accc9d7b..d2726e3db01 100644 --- a/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml +++ b/input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml @@ -64,8 +64,3 @@ nodes: enabled: true mounted: false mountable: false - monitoring: - wattmeter: false - sensors: - power: - available: false diff --git a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml index 9f2ea906fa3..f714aea991c 100644 --- a/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml +++ b/input/grid5000/sites/rennes/clusters/parapide/parapide.yaml @@ -8,22 +8,6 @@ queues: nodes: parapide-[1-25]: - monitoring: - temperature: true - wattmeter: true - metric: power - sensors: - power: - available: true - per_outlets: true - temperature: - available: true - via: - api: - metric: ambient_temp - ipmi: - sensors: - ambient: /MB/T_AMB processor: microarchitecture: Nehalem clock_speed: 2950000000 diff --git a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml index 4223efb03a5..24e5a4c673a 100644 --- a/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml +++ b/input/grid5000/sites/rennes/clusters/parapluie/parapluie.yaml @@ -56,24 +56,6 @@ nodes: enabled: true mounted: false mountable: false - monitoring: - wattmeter: true - temperature: true - sensors: - power: - available: true - per_outlets: true - via: - api: - metric: power - temperature: - available: true - via: - api: - metric: ambient_temp - ipmi: - sensors: - ambient: Inlet Ambient parapluie-8: status: retired diff --git a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb b/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb deleted file mode 100644 index c170ffd1fd0..00000000000 --- a/input/grid5000/sites/rennes/clusters/parasilo/parasilo.yaml.erb +++ /dev/null @@ -1,7 +0,0 @@ -nodes: -<% [1,2,3,4,5,6,7,10,11,12,13,14,15,17,19,21,22,23,24,25,26,27,28].each { |i| %> - parasilo-<%= i %>: - monitoring: - wattmeter: true - metric: power -<% } %> diff --git a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml.erb b/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml.erb deleted file mode 100644 index 399b376f352..00000000000 --- a/input/grid5000/sites/rennes/clusters/paravance/paravance.yaml.erb +++ /dev/null @@ -1,7 +0,0 @@ -nodes: -<% (3..72).each { |i| %> - paravance-<%= i %>: - monitoring: - wattmeter: true - metric: power -<% } %> diff --git a/input/grid5000/sites/rennes/pdus.yaml b/input/grid5000/sites/rennes/pdus.yaml index 59dee2cb9ae..f888398e300 100644 --- a/input/grid5000/sites/rennes/pdus.yaml +++ b/input/grid5000/sites/rennes/pdus.yaml @@ -4,17 +4,6 @@ pdus: parapluie-pdu-[1-4]: vendor: Eaton Corporation model: '' - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1 - - iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.534.6.6.7.6.5.1.3.0 - resolution: 60 paravance-pdu-[2-8]: vendor: APC @@ -26,16 +15,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 parasilo-pdu-[1-1]: vendor: APC @@ -47,16 +26,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: false - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 parasilo-pdu-[2-4]: vendor: APC @@ -68,16 +37,6 @@ pdus: source: protocol: snmp id: 1.3.6.1.4.1.318.1.1.26.9.4.3.1.7.%PORT% - sensors: - - power: - per_outlets: true - snmp: - available: true - total_oids: - - iso.3.6.1.4.1.318.1.1.12.1.16.0 - unit: W - outlet_prefix_oid: iso.3.6.1.4.1.318.1.1.26.9.4.3.1.7 - resolution: 1 parapluie-pdu-1: ip: 172.17.99.201 diff --git a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml index 4d8c1495e11..bed9fd8db93 100644 --- a/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml +++ b/input/grid5000/sites/sophia/clusters/uvb/uvb.yaml @@ -17,8 +17,6 @@ nodes: deploy: true besteffort: true max_walltime: 0 - monitoring: - wattmeter: false network_adapters: eth0: enabled: true -- GitLab