summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/daq/accesslog/s5-accesslog.py2
-rw-r--r--src/daq/flumotion-plug/s5.py2
-rwxr-xr-xsrc/daq/flumotion-rrd/s5-flumotion-rrd.py6
3 files changed, 6 insertions, 4 deletions
diff --git a/src/daq/accesslog/s5-accesslog.py b/src/daq/accesslog/s5-accesslog.py
index 7e74090..3f8775a 100755
--- a/src/daq/accesslog/s5-accesslog.py
+++ b/src/daq/accesslog/s5-accesslog.py
@@ -283,7 +283,7 @@ class AccessLog():
return cnt
def _sendDataset(self, timestamp, duration, clients):
- data = { "start-time": timestamp.isoformat('T'),
+ data = { "start-time": timestamp.isoformat('T') + 'Z',
"duration-ms": duration * 1000,
"data": {
"clients": list(clients.values()),
diff --git a/src/daq/flumotion-plug/s5.py b/src/daq/flumotion-plug/s5.py
index 32d823e..0fe6c24 100644
--- a/src/daq/flumotion-plug/s5.py
+++ b/src/daq/flumotion-plug/s5.py
@@ -170,7 +170,7 @@ class ComponentSFivePlug(base.ComponentPlug):
bytes_sent_diff = bytes_sent - self._old_bytes_sent
self._old_bytes_sent = bytes_sent
- data = { "start-time": self._start_time.isoformat('T'),
+ data = { "start-time": self._start_time.isoformat('T') + 'Z',
"duration-ms": self._duration * 1000,
"data": {
"client-count": client_count,
diff --git a/src/daq/flumotion-rrd/s5-flumotion-rrd.py b/src/daq/flumotion-rrd/s5-flumotion-rrd.py
index 4b0a2d1..6809d20 100755
--- a/src/daq/flumotion-rrd/s5-flumotion-rrd.py
+++ b/src/daq/flumotion-rrd/s5-flumotion-rrd.py
@@ -135,7 +135,7 @@ class FlumotionRRD():
return False
print 'SFive: will use 7 days of data ending with %s using a step size of %d seconds' % (
- datetime.datetime.utcfromtimestamp(self._end).isoformat('T'), self._duration)
+ datetime.datetime.utcfromtimestamp(self._end).isoformat('T') + 'Z', self._duration)
except rrdtool.error as e:
print 'SFive: rrdtool-error: %s' % (e)
@@ -194,7 +194,9 @@ class FlumotionRRD():
return cnt
def _sendDataset(self, timestamp, duration, client_count, bytes_sent):
- data = { "start-time": timestamp.isoformat('T'),
+ client_count = int(round(client_count)) if client_count else 0
+ bytes_sent = int(round(bytes_sent)) if bytes_sent else 0
+ data = { "start-time": timestamp.isoformat('T') + 'Z',
"duration-ms": duration * 1000,
"data": {
"client-count": client_count,