Permalink
Browse files

Merge pull request #159 from 'cognusion/master'

Added a case for parseATTime, and a bugfix
  • Loading branch information...
2 parents a8dd81a + 5bea8ad commit 61d53c559807e38940ea36246699fe410a48b7db @mleinart mleinart committed Mar 16, 2013
Showing with 3 additions and 1 deletion.
  1. +1 −1 webapp/graphite/metrics/views.py
  2. +2 −0 webapp/graphite/render/attime.py
@@ -160,7 +160,7 @@ def expand_view(request):
results[query] = set()
for node in STORE.find(query, local=local_only):
if node.is_leaf or not leaves_only:
- results[query].add( node.metric_path )
+ results[query].add( node.path )
# Convert our results to sorted lists because sets aren't json-friendly
if group_by_expr:
@@ -28,6 +28,8 @@ def parseATTime(s, tzinfo=None):
pass #Fall back because its not a timestamp, its YYYYMMDD form
else:
return datetime.fromtimestamp(int(s),tzinfo)
+ elif ':' in s:
+ return datetime.strptime(s,'%H:%M%Y%m%d')
if '+' in s:
ref,offset = s.split('+',1)
offset = '+' + offset

0 comments on commit 61d53c5

Please sign in to comment.