diff --git a/expetator/monitors/kwollect.py b/expetator/monitors/kwollect.py index 5bfae65bb8f1a4cdcaa1efa5d4138e558d53ef40..2a1eeffdf4f0c8eeab4adcd504074f0a197626cc 100644 --- a/expetator/monitors/kwollect.py +++ b/expetator/monitors/kwollect.py @@ -4,8 +4,18 @@ import requests import os import json -def get_names(): - return {'kwollect'} +import platform +def get_g5k_target_metric(): + cluster_name = platform.node().split('-')[0] + + 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', + 'orion', 'pyxis', 'sagittaire', 'taurus']: + target_metric = 'wattmetre_power_watt' + else: + target_metric = 'bmc_node_power_watt' class Power: 'Monitoring using Kwollect on g5k' @@ -16,7 +26,7 @@ class Power: self.end_time = None self.executor = None self.names = get_names() - self.metric = metric + self.metric = {'kwollect'} def build(self, executor): """Prepare the right request only needed on g5k""" diff --git a/setup.py b/setup.py index 4582e3aa91731a3e66b31aca75367b3cce86829f..1cf3e7c9f2f4dad19bcf5852d920d0d4961366f7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r") as fh: setuptools.setup( name="expetator", - version="0.3.8", + version="0.3.9", author="Georges Da Costa", author_email="georges.da-costa@irit.fr", description="A framework for monitoring HPC applications using DVFS",