From 20a8d056be1ba4f08dddbb76d34fd16ea4fb3e61 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Wed, 7 Nov 2018 11:54:35 -0800 Subject: [PATCH 1/3] Update events-archiver to work with flat events Works with https://github.com/jupyterhub/binderhub/pull/710 now --- images/events-archiver/events-archiver.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/images/events-archiver/events-archiver.py b/images/events-archiver/events-archiver.py index 35bb66d9a..9d4e91d4c 100644 --- a/images/events-archiver/events-archiver.py +++ b/images/events-archiver/events-archiver.py @@ -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: From 5e5023870d7f13dca15b584e4c555e62b3bbc01f Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Wed, 7 Nov 2018 11:55:59 -0800 Subject: [PATCH 2/3] Make values.yaml match chartpress produced formatting --- mybinder/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mybinder/values.yaml b/mybinder/values.yaml index 5f096d52e..0ea595b24 100644 --- a/mybinder/values.yaml +++ b/mybinder/values.yaml @@ -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 @@ -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: From c5f240bfec24e7a8b831726307b58b20cbb096d2 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Wed, 7 Nov 2018 11:56:34 -0800 Subject: [PATCH 3/3] Bump binderhub to bring in flat events --- mybinder/requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mybinder/requirements.yaml b/mybinder/requirements.yaml index bfc83151e..23cefb063 100644 --- a/mybinder/requirements.yaml +++ b/mybinder/requirements.yaml @@ -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