From f02d45d2a0bbba49c2ba75505e4c8a66975452cf Mon Sep 17 00:00:00 2001
From: Simon Crowle <sgc@it-innovation.soton.ac.uk>
Date: Tue, 1 May 2018 12:03:20 +0100
Subject: [PATCH] Fixes time-out on MINIO query and adds additional test

---
 clmctest/inputs/test_telegraf_agents.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/clmctest/inputs/test_telegraf_agents.py b/clmctest/inputs/test_telegraf_agents.py
index 91798c9..c041104 100644
--- a/clmctest/inputs/test_telegraf_agents.py
+++ b/clmctest/inputs/test_telegraf_agents.py
@@ -65,8 +65,10 @@ def test_ping(telegraf_agent_config):
     ('disk', 'SELECT mean("free") AS "mean" FROM "CLMCMetrics"."autogen"."disk"', 0),
     ('diskio', 'SELECT mean("write_bytes") AS "mean" FROM "CLMCMetrics"."autogen"."diskio"', 0),
     ('mem', 'SELECT mean("free") AS "mean" FROM "CLMCMetrics"."autogen"."mem"', 0),
+    # Report MINIO's HTTP request response time (as a rolling difference of the sum total)
+    ('minio_http_requests_duration_seconds', 'SELECT difference(max("sum")) AS "mean" FROM "CLMCMetrics"."autogen"."minio_http_requests_duration_seconds" WHERE time > now() - 1h GROUP BY time(10s)',0),              
     # Report the average change in difference of MINIO's HTTP response time (the inner query determines a rolling difference between sampling periods [respTimeDiff])
-    ('minio_http_requests_duration_seconds', 'select mean("respTimeDiff") as "mean" from (select difference(max("sum")) as "respTimeDiff" from "CLMCMetrics"."autogen"."minio_http_requests_duration_seconds" where time > 0 group by time(10s))',0)              
+    ('minio_http_requests_duration_seconds', 'SELECT mean("respTimeDiff") AS "mean" FROM (SELECT difference(max("sum")) AS "respTimeDiff" FROM "CLMCMetrics"."autogen"."minio_http_requests_duration_seconds" WHERE time > now() - 1h GROUP BY time(10s))',0)              
     ])
 def test_all_inputs(influxdb, measurement, query, expected_result):
     """
-- 
GitLab