diff --git a/expetator/monitors/kwollect.py b/expetator/monitors/kwollect.py index 88c72430c523b4c36c23a7b840856dc807de7623..feadeab7741fdd397b96de158f9f86588be227d2 100644 --- a/expetator/monitors/kwollect.py +++ b/expetator/monitors/kwollect.py @@ -10,12 +10,12 @@ def get_g5k_target_metric(): if cluster_name in ['grisou', 'graoully', 'grimoire', 'grisou', 'gros', 'gruss', 'paravance']: - target_metric = 'pdu_outlet_power_watt' - elif cluster_name in ['troll', 'yeti', 'gemini', 'neowise', + return 'pdu_outlet_power_watt' + if cluster_name in ['troll', 'yeti', 'gemini', 'neowise', 'orion', 'pyxis', 'sagittaire', 'taurus']: - target_metric = 'wattmetre_power_watt' - else: - target_metric = 'bmc_node_power_watt' + return 'wattmetre_power_watt' + + return 'bmc_node_power_watt' class Power: 'Monitoring using Kwollect on g5k' diff --git a/setup.py b/setup.py index bfb4ad910d8c9b8cfc51be30c3d68b4818195a34..9e0c463c3c52e0cde5ba9464780672479b23eb33 100644 --- a/setup.py +++ b/setup.py @@ -5,13 +5,13 @@ with open("README.md", "r") as fh: setuptools.setup( name="expetator", - version="0.3.10", + version="0.3.11", author="Georges Da Costa", author_email="georges.da-costa@irit.fr", description="A framework for monitoring HPC applications using DVFS", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/georges-da-costa/expetator", + url="https://gitlab.irit.fr/sepia-pub/expetator", packages=setuptools.find_packages(), classifiers=[ "Programming Language :: Python :: 3",