diff --git a/expetator/monitors/kwollect.py b/expetator/monitors/kwollect.py index 661a8d5967b8b48e5c4e42541c63417662f02b5d..5bfae65bb8f1a4cdcaa1efa5d4138e558d53ef40 100644 --- a/expetator/monitors/kwollect.py +++ b/expetator/monitors/kwollect.py @@ -9,13 +9,14 @@ def get_names(): class Power: 'Monitoring using Kwollect on g5k' - def __init__(self): + def __init__(self, metric = 'wattmetre_power_watt'): self.hostnames = None self.site = None self.start_time = None self.end_time = None self.executor = None self.names = get_names() + self.metric = metric def build(self, executor): """Prepare the right request only needed on g5k""" @@ -37,7 +38,7 @@ class Power: os.makedirs(filename_power, exist_ok=True) target = '%s/%s_%s_%s' % (filename_power, self.executor.hostnames[0], benchname, beg_time) - request = 'https://api.grid5000.fr/stable/sites/%s/metrics?metrics=wattmetre_power_watt&start_time=%s&end_time=%s&nodes=%s' % (self.site, self.start_time, self.end_time, self.hostnames) + request = 'https://api.grid5000.fr/stable/sites/%s/metrics?metrics=%s&start_time=%s&end_time=%s&nodes=%s' % (self.site, self.metric, self.start_time, self.end_time, self.hostnames) delta = int(time.time())-self.end_time if delta < 6: