From 4e025af4346c0451c482738295790ef6dabf254c Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Mon, 28 Apr 2014 23:31:29 -0700 Subject: [PATCH] add cachedGroupBy arg, add healthy and bytes_hit to the latest query --- planetstack/hpc_wizard/planetstack_analytics.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/planetstack/hpc_wizard/planetstack_analytics.py b/planetstack/hpc_wizard/planetstack_analytics.py index c0f7ff5..91e4ce1 100644 --- a/planetstack/hpc_wizard/planetstack_analytics.py +++ b/planetstack/hpc_wizard/planetstack_analytics.py @@ -247,7 +247,7 @@ class PlanetStackAnalytics(BigQueryAnalytics): """ if not fieldNames: - fieldNames = ["%hostname", "%bytes_sent", "time", "event", "%site", "%elapsed", "%slice", "%cpu"] + fieldNames = ["%hostname", "%bytes_sent", "%bytes_hit", "%healthy", "time", "event", "%site", "%elapsed", "%slice", "%cpu"] fields = ["table1.%s AS %s" % (x,x) for x in fieldNames] fields = ", ".join(fields) @@ -310,6 +310,7 @@ class PlanetStackAnalytics(BigQueryAnalytics): maxAge = int(req.GET.get("maxAge", 60*60)) cached = req.GET.get("cached", None) + cachedGroupBy = self.get_list_from_req(req, "cachedGroupBy", ["doesnotexist"]) q = self.compose_query(slice, site, node, service, event, timeBucket, avg, sum, count, computed, [], groupBy, orderBy, maxAge=maxAge) @@ -386,7 +387,7 @@ class PlanetStackAnalytics(BigQueryAnalytics): if event: filter["event"] = event - result = self.postprocess_results(results, filter=filter, sum=sum, count=count, avg=avg, computed=computed, maxDeltaTime=120, groupBy=["doesnotexist"]) + result = self.postprocess_results(results, filter=filter, sum=sum, count=count, avg=avg, computed=computed, maxDeltaTime=120, groupBy=cachedGroupBy) else: result = self.run_query(q) -- 2.47.0