From 03db75462f5835b4e622eb391ed5573a7ef69f09 Mon Sep 17 00:00:00 2001
From: Georges Da Costa <dacosta@irit.fr>
Date: Fri, 2 Jul 2021 22:03:15 +0200
Subject: [PATCH] Adds an argument to kwollect to know the target sensor
---
expetator/monitors/kwollect.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/expetator/monitors/kwollect.py b/expetator/monitors/kwollect.py
index 661a8d5..5bfae65 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:
--
GitLab