Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make analytics events flat #826

Merged
merged 3 commits into from
Nov 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion images/events-archiver/events-archiver.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@ def main():
temp.seek(0)

for line in temp:
event = process_event(json.loads(json.loads(line)['jsonPayload']['message']))
event = json.loads(json.loads(line)['jsonPayload']['message'])
# Account for time when 'event' was nested
if 'event' in event:
event.update(event['event'])
del event['event']
event = process_event(event)
if args.debug:
print(event)
if not args.dry_run:
Expand Down
2 changes: 1 addition & 1 deletion mybinder/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ dependencies:
version: 0.4.2
repository: https://kubernetes-charts.storage.googleapis.com
- name: binderhub
version: 0.1.0-70d53fe
version: 0.1.0-88fd96d
repository: https://jupyterhub.github.io/helm-chart
4 changes: 2 additions & 2 deletions mybinder/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ etcJupyter:
NotebookApp:
allow_origin: '*'
tornado_settings:
trust_xheaders: True
trust_xheaders: true
# shutdown the server after no activity
shutdown_no_activity_timeout: 600

Expand All @@ -19,7 +19,7 @@ etcJupyter:
# a kernel with open connections but no activity still counts as idle
# this is what allows us to shutdown servers
# when people leave a notebook open and wander off
cull_connected: True
cull_connected: true

binderhub:

Expand Down