git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a3b4df
)
add cachedGroupBy arg, add healthy and bytes_hit to the latest query
author
Scott Baker
<smbaker@gmail.com>
Tue, 29 Apr 2014 06:31:29 +0000
(23:31 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Tue, 29 Apr 2014 06:31:29 +0000
(23:31 -0700)
planetstack/hpc_wizard/planetstack_analytics.py
patch
|
blob
|
history
diff --git
a/planetstack/hpc_wizard/planetstack_analytics.py
b/planetstack/hpc_wizard/planetstack_analytics.py
index
c0f7ff5
..
91e4ce1
100644
(file)
--- a/
planetstack/hpc_wizard/planetstack_analytics.py
+++ b/
planetstack/hpc_wizard/planetstack_analytics.py
@@
-247,7
+247,7
@@
class PlanetStackAnalytics(BigQueryAnalytics):
"""
if not fieldNames:
"""
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)
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)
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)
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
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)
else:
result = self.run_query(q)