+### Cleanup Service
+
+JupyterHub was originally not created with Docker or Kubernetes in mind, which can result in unfavorable scenarios such as that containers are stopped but not deleted on the host. Furthermore, our custom spawners might create some artifacts that should be cleaned up as well. MLHub contains a cleanup service that is started as a [JupyterHub service](https://jupyterhub.readthedocs.io/en/stable/reference/services.html) inside the hub container. It can be accessed as a REST-API by an admin, but it is also triggered automatically every X timesteps when not disabled (see config for `CLEANUP_INTERVAL_SECONDS`). The service enhances the JupyterHub functionality with regards to the Docker and Kubernetes world. "Containers" is hereby used interchangeably for Docker containers and Kubernetes pods.
+The service has two endpoints which can be reached under the Hub service url `/services/cleanup-service/*` with admin permissions.
+
+- `GET /services/cleanup-service/users`: This endpoint is currently doing anything only in Docker-local mode. There, it will check for resources of deleted users, so users who are not in the JupyterHub database anymore, and delete them. This includes containers, networks, and volumes. This is done by looking for labeled Docker resources that point to containers started by hub and belonging to the specific users.
+
+- `GET /services/cleanup-service/expired`: When starting a named workspace, an expiration date can be assigned to it. This endpoint will delete all containers that are expired. The respective named server is deleted from the JupyterHub database and also the Docker/Kubernetes resource is deleted.
+
## Contribution
- Pull requests are encouraged and always welcome. Read [`CONTRIBUTING.md`](https://github.com/ml-tooling/ml-hub/tree/master/CONTRIBUTING.md) and check out [help-wanted](https://github.com/ml-tooling/ml-hub/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A"help+wanted"+sort%3Areactions-%2B1-desc+) issues.
diff --git a/resources/jupyterhub-mod/cleanup-service.py b/resources/jupyterhub-mod/cleanup-service.py
new file mode 100644
index 0000000..a0435e8
--- /dev/null
+++ b/resources/jupyterhub-mod/cleanup-service.py
@@ -0,0 +1,266 @@
+"""
+Web service that is supposed to be started via JupyterHub.
+By this, the service has access to some information passed
+by JupyterHub. For more information check out https://jupyterhub.readthedocs.io/en/stable/reference/services.html
+
+Note: Logs probably don't appear in stdout, as the service is started as a subprocess by JupyterHub
+"""
+
+import os
+import urllib3
+import json
+import time
+import math
+from threading import Thread
+import logging
+
+from tornado import web, ioloop
+from jupyterhub.services.auth import HubAuthenticated
+
+import docker.errors
+from kubernetes import client, config, stream
+
+from mlhubspawner import utils
+
+# Environment variables passed by JupyterHub to the service
+prefix = os.environ.get('JUPYTERHUB_SERVICE_PREFIX', '/')
+service_url = os.getenv('JUPYTERHUB_SERVICE_URL')
+jupyterhub_api_url = os.getenv('JUPYTERHUB_API_URL')
+jupyterhub_api_token = os.getenv('JUPYTERHUB_API_TOKEN')
+
+auth_header = {"Authorization": "token " + jupyterhub_api_token}
+
+execution_mode = os.environ[utils.ENV_NAME_EXECUTION_MODE]
+
+http = urllib3.PoolManager()
+
+if execution_mode == utils.EXECUTION_MODE_LOCAL:
+ docker_client_kwargs = json.loads(os.getenv("DOCKER_CLIENT_KWARGS"))
+ docker_tls_kwargs = json.loads(os.getenv("DOCKER_TLS_CONFIG"))
+ docker_client = utils.init_docker_client(docker_client_kwargs, docker_tls_kwargs)
+elif execution_mode == utils.EXECUTION_MODE_KUBERNETES:
+ # incluster config is the config given by a service account and it's role permissions
+ config.load_incluster_config()
+ kubernetes_client = client.CoreV1Api()
+
+hub_name = utils.ENV_HUB_NAME
+origin_label = "{}={}".format(utils.LABEL_MLHUB_ORIGIN, hub_name)
+origin_label_filter = {"label": origin_label}
+
+class UnifiedContainer():
+
+ def __init__(self, resource):
+ self.remove = lambda: logging.info("Remove property is not defined")
+ self.resource = resource
+
+ def with_id(self, id):
+ self.id = id
+ return self
+
+ def with_name(self, name):
+ self.name = name
+ return self
+
+ def with_labels(self, labels):
+ self.labels = labels
+ return self
+
+ def with_remove(self, func):
+ self.remove = lambda: func(self.resource)
+ return self
+
+def extract_container(resource):
+ if execution_mode == utils.EXECUTION_MODE_LOCAL:
+ unified_container = UnifiedContainer(resource) \
+ .with_id(resource.id) \
+ .with_name(resource.name) \
+ .with_labels(resource.labels) \
+ .with_remove(lambda container: container.remove(v=True, force=True))
+ elif execution_mode == utils.EXECUTION_MODE_KUBERNETES:
+ unified_container = UnifiedContainer(resource) \
+ .with_id(resource.metadata.uid) \
+ .with_name(resource.metadata.name) \
+ .with_labels(resource.metadata.labels)
+
+ if unified_container == None:
+ raise UserWarning("The execution mode environment variable is not set correctly")
+
+ return unified_container
+
+def get_hub_docker_resources(docker_client_obj):
+ return docker_client_obj.list(filters=origin_label_filter)
+
+def get_hub_kubernetes_resources(namespaced_list_command, **kwargs):
+ return namespaced_list_command(hub_name, **kwargs).items
+
+def get_hub_containers():
+ if execution_mode == utils.EXECUTION_MODE_LOCAL:
+ hub_containers = get_hub_docker_resources(docker_client.containers)
+ elif execution_mode == utils.EXECUTION_MODE_KUBERNETES:
+ hub_containers = get_hub_kubernetes_resources(kubernetes_client.list_namespaced_pod, field_selector="status.phase=Running", label_selector=origin_label)
+
+ return hub_containers
+
+def remove_deleted_user_resources(existing_user_names: []):
+ """Remove resources for which no user exists anymore by checking whether the label of user name occurs in the existing
+ users list.
+
+ Args:
+ existing_user_names: list of user names that exist in the JupyterHub database
+
+ Raises:
+ UserWarning: in Kubernetes mode, the function does not work
+ """
+
+ if execution_mode == utils.EXECUTION_MODE_KUBERNETES:
+ raise UserWarning("This method cannot be used in following hub execution mode " + execution_mode)
+
+ def try_to_remove(remove_callback, resource) -> bool:
+ """Call the remove callback until the call succeeds or until the number of tries is exceeded.
+
+ Returns:
+ bool: True if it could be removed, False if it was not removable within the number of tries
+ """
+
+ for i in range(3):
+ try:
+ remove_callback()
+ return True
+ except docker.errors.APIError:
+ time.sleep(3)
+
+ logging.info("Could not remove " + resource.name)
+ return False
+
+
+ def find_and_remove(docker_client_obj, get_labels, action_callback) -> None:
+ """List all resources belonging to `docker_client_obj` which were created by MLHub.
+ Then check the list of resources for resources that belong to a user who does not exist anymore
+ and call the remove function on them.
+
+ Args:
+ docker_client_obj: A Python docker client object, such as docker_client.containers, docker_client.networks,... It must implement a .list() function (check https://docker-py.readthedocs.io/en/stable/containers.html)
+ get_labels (func): function to call on the docker resource to get the labels
+ remove (func): function to call on the docker resource to remove it
+ """
+
+ resources = get_hub_docker_resources(docker_client_obj)
+ for resource in resources:
+ user_label = get_labels(resource)[utils.LABEL_MLHUB_USER]
+ if user_label not in existing_user_names:
+ action_callback(resource)
+ # successful = try_to_remove(remove, resource)
+
+ def container_action(container):
+ try_to_remove(
+ lambda: container.remove(v=True, force=True),
+ container
+ )
+
+ find_and_remove(
+ docker_client.containers,
+ lambda res: res.labels,
+ container_action
+ )
+
+ def network_action(network):
+ try:
+ network.disconnect(hub_name)
+ except docker.errors.APIError:
+ pass
+
+ try_to_remove(network.remove, network)
+
+ find_and_remove(
+ docker_client.networks,
+ lambda res: res.attrs["Labels"],
+ network_action
+ )
+
+ find_and_remove(
+ docker_client.volumes,
+ lambda res: res.attrs["Labels"],
+ lambda res: try_to_remove(res.remove, res)
+ )
+
+def get_hub_usernames() -> []:
+ r = http.request('GET', jupyterhub_api_url + "/users",
+ headers = {**auth_header}
+ )
+
+ data = json.loads(r.data.decode("utf-8"))
+ existing_user_names = []
+ for user in data:
+ existing_user_names.append(user["name"])
+
+ return existing_user_names
+
+def remove_expired_workspaces():
+ hub_containers = get_hub_containers()
+ for container in hub_containers:
+ unified_container = extract_container(container)
+ lifetime_timestamp = utils.get_lifetime_timestamp(unified_container.labels)
+ if lifetime_timestamp != 0:
+ difference = math.ceil(lifetime_timestamp - time.time())
+ # container lifetime is exceeded (remaining lifetime is negative)
+ if difference < 0:
+ user_name = unified_container.labels[utils.LABEL_MLHUB_USER]
+ server_name = unified_container.labels[utils.LABEL_MLHUB_SERVER_NAME]
+ url = jupyterhub_api_url + "/users/{user_name}/servers/{server_name}".format(user_name=user_name, server_name=server_name)
+ r = http.request('DELETE', url,
+ body = json.dumps({"remove": True}).encode('utf-8'),
+ headers = {**auth_header}
+ )
+
+ if r.status == 202 or r.status == 204:
+ logging.info("Delete expired container " + unified_container.name)
+ unified_container.remove()
+
+class CleanupUserResources(HubAuthenticated, web.RequestHandler):
+
+ @web.authenticated
+ def get(self):
+ current_user = self.get_current_user()
+ if current_user["admin"] is False:
+ self.set_status(401)
+ self.finish()
+ return
+
+ try:
+ remove_deleted_user_resources(get_hub_usernames())
+ except UserWarning as e:
+ self.finish(str(e))
+
+class CleanupExpiredContainers(HubAuthenticated, web.RequestHandler):
+
+ @web.authenticated
+ def get(self):
+ current_user = self.get_current_user()
+ if current_user["admin"] is False:
+ self.set_status(401)
+ self.finish()
+ return
+
+ remove_expired_workspaces()
+
+app = web.Application([
+ (r"{}users".format(prefix), CleanupUserResources),
+ (r"{}expired".format(prefix), CleanupExpiredContainers)
+])
+
+service_port = int(service_url.split(":")[-1])
+app.listen(service_port)
+
+def internal_service_caller():
+ clean_interval_seconds = int(os.getenv(utils.ENV_NAME_CLEANUP_INTERVAL_SECONDS))
+ while True and clean_interval_seconds != -1:
+ time.sleep(clean_interval_seconds)
+ try:
+ remove_deleted_user_resources(get_hub_usernames())
+ except UserWarning:
+ pass
+ remove_expired_workspaces()
+
+Thread(target=internal_service_caller).start()
+
+ioloop.IOLoop.current().start()
diff --git a/resources/jupyterhub-mod/info-dialog-snippet.html b/resources/jupyterhub-mod/info-dialog-snippet.html
new file mode 100644
index 0000000..2770d71
--- /dev/null
+++ b/resources/jupyterhub-mod/info-dialog-snippet.html
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+{% call modal('Workspace Info', btn_label='', btn_class='hidden') %}
+ Workspace Info for :
+
+
+
+{% endcall %}
diff --git a/resources/jupyterhub-mod/jsonpresenter/jquery.jsonPresenter.css b/resources/jupyterhub-mod/jsonpresenter/jquery.jsonPresenter.css
new file mode 100644
index 0000000..2098418
--- /dev/null
+++ b/resources/jupyterhub-mod/jsonpresenter/jquery.jsonPresenter.css
@@ -0,0 +1,59 @@
+/**
+ * jQuery Json Presenter Plugin v1.0.0
+ *
+ * Copyright 2014 Steven Pease
+ * Released under the MIT license:
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+.parsed-json {
+ font-size: 11px !important;
+ font-family: Menlo, monospace;
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
+.parsed-json-expandable-ellipsis:hover,
+.parsed-json-property-expandable:hover,
+.parsed-json-property-toggleable:hover,
+.parsed-json-has-alternate-value:hover {
+ cursor: hand;
+ cursor: pointer;
+}
+
+.parsed-json-property-name {
+ color: rgb(136, 19, 145);
+}
+
+.parsed-json-object-comma {
+ color: #333;
+}
+
+.parsed-json-value-boolean {
+ color: #0000ff;
+}
+
+.parsed-json-value-function,
+.parsed-json-array-bracket,
+.parsed-json-object-bracket {
+ color: #333;
+}
+
+.parsed-json-value-null,
+.parsed-json-value-undefined {
+ color: rgb(128, 128, 128);
+}
+
+.parsed-json-value-number {
+ color: #5FB526;
+}
+
+.parsed-json-value-regexp,
+.parsed-json-value-string {
+ color: rgb(196, 26, 22);
+ white-space: pre;
+ unicode-bidi: -webkit-isolate;
+}
+
+.parsed-json .hidden {
+ display: none;
+}
diff --git a/resources/jupyterhub-mod/jsonpresenter/jquery.jsonPresenter.js b/resources/jupyterhub-mod/jsonpresenter/jquery.jsonPresenter.js
new file mode 100644
index 0000000..a3837bc
--- /dev/null
+++ b/resources/jupyterhub-mod/jsonpresenter/jquery.jsonPresenter.js
@@ -0,0 +1,347 @@
+/**
+ * jQuery Json Presenter Plugin v1.0.0
+ *
+ * Copyright 2014 Steven Pease
+ * Released under the MIT license:
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+( function( $ ) {
+ /**
+ * @param numberOfIndents
+ */
+ function getIndentString( numberOfIndents ) {
+ if ( typeof numberOfIndents === "undefined" ) {
+ numberOfIndents = 1;
+ }
+
+ var result = '';
+ for ( var i = 0; i < numberOfIndents; i++ ) {
+
+ // Use two spaces to represent an indentation
+ result += ' ';
+ }
+ return result;
+ }
+
+ function isJsonArray( jsonValue ) {
+ return jsonValue && typeof jsonValue === 'object' && typeof jsonValue.length === 'number' && !jsonValue.propertyIsEnumerable( 'length' );
+ }
+
+ /**
+ * @param {unknown_type} jsonValue The JSON value to test
+ * @return {Boolean} Whether the provided JSON value is a Date object
+ */
+ var isJsonDate = ( function() {
+ var dateObject = new Date();
+
+ return function( jsonValue ) {
+ return jsonValue && jsonValue.constructor === dateObject.constructor;
+ };
+ } )();
+
+ /**
+ * @param {unknown_type} jsonValue The JSON value to test
+ * @return {Boolean} Whether the provided JSON value is a NULL value
+ */
+ var isJsonNull = function( jsonValue ) {
+ return jsonValue === null;
+ };
+
+ /**
+ * @param {unknown_type} jsonValue The JSON value to test
+ * @return {Boolean} Whether the provided JSON value is a RegExp object
+ */
+ var isJsonRegExp = ( function() {
+ var regExpObject = new RegExp();
+
+ return function( jsonValue ) {
+ return jsonValue && jsonValue.constructor === regExpObject.constructor;
+ };
+ } )();
+
+ function processJsonPrimitive( className, value, alternateDisplayValue ) {
+ var cleanValue = function( value ) {
+ var result = value;
+
+ // Remove any "<" or ">" characters that could be interpretted as HTML
+ if ( typeof result === 'string' ) {
+ result = result.replace( //g, '>' );
+ }
+
+ return result;
+ };
+
+ if ( alternateDisplayValue ) {
+ value = '' + cleanValue( value ) + '' + cleanValue( alternateDisplayValue ) + '';
+ } else {
+ value = cleanValue( value );
+ }
+
+ return '' + value + '';
+ }
+
+ function processJsonValue( settings, jsonValue, indentLevel, propertyName ) {
+ if ( typeof indentLevel === 'undefined' ) {
+ indentLevel = 0;
+ }
+
+ var isExpandable = false,
+ isToggleable = false,
+ result = '';
+
+ if ( isJsonArray( jsonValue ) ) {
+ if ( jsonValue.length ) {
+ result += '[]';
+ isExpandable = true;
+ } else {
+ result += '[]';
+ }
+ } else {
+ var valueType = typeof jsonValue;
+
+ switch ( valueType ) {
+ case 'object':
+ if ( isJsonNull( jsonValue ) ) {
+ result += processJsonPrimitive( 'null', null );
+ } else if ( isJsonDate( jsonValue ) ) {
+ result += processJsonPrimitive( 'date', 'new Date(' + jsonValue.getTime() + ')', jsonValue.toString() );
+ isToggleable = true;
+ } else if ( isJsonRegExp( jsonValue ) ) {
+ result += processJsonPrimitive( 'regexp', jsonValue );
+ } else {
+
+ // Determine the number of properties this object has
+ var propertyCount = ( function() {
+ var result = 0;
+ for ( var i in jsonValue ) { // jshint ignore:line
+ result++;
+ }
+ return result;
+ } )();
+
+ if ( propertyCount > 0 ) {
+ result += '{}';
+ isExpandable = true;
+ } else {
+ result += '{}';
+ }
+ }
+ break;
+ case 'number':
+ result += processJsonPrimitive( 'number', jsonValue );
+ break;
+ case 'boolean':
+ result += processJsonPrimitive( 'boolean', jsonValue );
+ break;
+ case 'function':
+ var expandedFunction = ( jsonValue.toString() ).replace( /\n/g, "\n" + getIndentString( indentLevel ) ),
+ nonExpandedFunction = ( jsonValue.toString() ).replace( /\s+/g, ' ' );
+
+ if ( expandedFunction !== nonExpandedFunction ) {
+ result += processJsonPrimitive( 'function', nonExpandedFunction, expandedFunction );
+ isToggleable = true;
+ } else {
+ result += processJsonPrimitive( 'function', nonExpandedFunction );
+ }
+ break;
+ case 'undefined':
+ result += processJsonPrimitive( 'undefined', jsonValue );
+ break;
+ default:
+ var displayValue = '"' + jsonValue.replace( /\n/g, "\\n" ) + '"',
+ alternateDisplayValue = '"' + jsonValue + '"';
+
+ if ( displayValue !== alternateDisplayValue ) {
+ result += processJsonPrimitive( 'string', displayValue, alternateDisplayValue );
+ isToggleable = true;
+ } else {
+ result += processJsonPrimitive( 'string', displayValue );
+ }
+
+ break;
+ }
+ }
+
+ var resultPrefix = ( indentLevel !== 0 ? "\n" : '' ) + getIndentString( indentLevel );
+ if ( typeof propertyName !== 'undefined' ) {
+ var propertyNameLabel = settings.wrapPropertiesInQuotes ? '"' + propertyName + '"' : propertyName;
+ resultPrefix += ': ';
+ }
+
+ result = resultPrefix + result;
+
+ if ( isExpandable || isToggleable ) {
+ return '';
+ } else {
+ return result;
+ }
+ }
+
+ function expandNode( expandableNodeElement ) {
+ if ( expandableNodeElement.children( '.parsed-json-expandable' ).is( ':not(:visible)' ) ) {
+ toggleExpandNode( expandableNodeElement );
+ }
+ }
+
+ function collapseNode( expandableNodeElement ) {
+ if ( expandableNodeElement.children( '.parsed-json-expandable' ).is( ':visible' ) ) {
+ toggleExpandNode( expandableNodeElement );
+ }
+ }
+
+ function toggleExpandNode( expandableNodeElement ) {
+ expandableNodeElement.children( '.parsed-json-expandable,.parsed-json-expandable-ellipsis' ).toggleClass( 'hidden' );
+ }
+
+ function togglePresentationNode( toggleableNodeElement ) {
+ toggleableNodeElement.children( '.parsed-json-has-alternate-value' ).find( 'span' ).toggleClass( 'hidden' );
+ }
+
+ function getExpandableChildNodes( expandableNodeElement ) {
+ return expandableNodeElement.find( '> .parsed-json-expandable > .parsed-json-node-expandable' );
+ }
+
+ function expandAll( expandableElement ) {
+ expand( expandableElement );
+ }
+
+ function collapseAll( expandableElement ) {
+ collapse( expandableElement );
+ }
+
+ function expand( expandableNodeElement, depth ) {
+ expandNode( expandableNodeElement );
+ if ( !( typeof depth === 'number' && depth <= 0 ) ) {
+ getExpandableChildNodes( expandableNodeElement ).each( function() {
+ expandNode( $( this ) );
+ expand( $( this ), typeof depth !== 'undefined' ? depth - 1 : depth );
+ } );
+ }
+ }
+
+ function collapse( expandableNodeElement, depth ) {
+ if ( !( typeof depth === 'number' && depth <= 0 ) ) {
+ getExpandableChildNodes( expandableNodeElement ).each( function() {
+ collapse( $( this ), typeof depth !== 'undefined' ? depth - 1 : depth );
+ collapseNode( $( this ) );
+ } );
+ }
+ collapseNode( expandableNodeElement );
+ }
+
+ function getRootNode( containerElement ) {
+ return containerElement.find( '> .parsed-json > .parsed-json-node-expandable' );
+ }
+
+ function onToggleableValueClick( event ) {
+ togglePresentationNode( $( $( event.currentTarget ).parents( '.parsed-json-node-toggleable' ).get( 0 ) ) );
+ event.stopPropagation();
+ }
+
+ function onExpandableValueClick( event ) {
+ toggleExpandNode( $( $( event.currentTarget ).parents( '.parsed-json-node-expandable' ).get( 0 ) ) );
+ event.stopPropagation();
+ }
+
+ function onExpandablePropertyClick( event ) {
+ toggleExpandNode( $( event.currentTarget ).parent() );
+ event.stopPropagation();
+ }
+
+ function onToggleablePropertyClick( event ) {
+ togglePresentationNode( $( event.currentTarget ).parent() );
+ event.stopPropagation();
+ }
+
+ function destroy( containerElement ) {
+ containerElement
+ .off( 'click', '.parsed-json-has-alternate-value span', onToggleableValueClick )
+ .off( 'click', '.parsed-json-property-expandable', onExpandablePropertyClick )
+ .off( 'click', '.parsed-json-expandable-ellipsis', onExpandableValueClick )
+ .off( 'click', '.parsed-json-property-toggleable', onToggleablePropertyClick );
+
+ containerElement.html( '' );
+ }
+
+ function create( containerElement, settings ) {
+
+ // Make sure that the JSON Presenter is not stacking event listeners on top of existing ones
+ if ( isAlreadyPresentingJson( containerElement ) ) {
+ destroy( containerElement );
+ }
+
+ containerElement
+ .on( 'click', '.parsed-json-has-alternate-value span', onToggleableValueClick )
+ .on( 'click', '.parsed-json-property-expandable', onExpandablePropertyClick )
+ .on( 'click', '.parsed-json-expandable-ellipsis', onExpandableValueClick )
+ .on( 'click', '.parsed-json-property-toggleable', onToggleablePropertyClick );
+
+ containerElement.html( '' + processJsonValue( settings, settings.json ) + '' ); + } + + /** + * @param {DOMNode} containerElement The container element to check whether it already has JSON being presented within it + * @return {Boolean} Whether the provided container element already has JSON being presented within it + */ + function isAlreadyPresentingJson( containerElement ) { + return !!containerElement.find( '> pre.parsed-json' ).length; + } + + $.fn.jsonPresenter = function( options ) { + if ( options && typeof options === 'object' ) { + var defaults = { + json: {}, + wrapPropertiesInQuotes: false + }; + + var settings = $.extend( {}, defaults, options ); + + return this.each( function() { + create( $( this ), settings ); + + if ( typeof settings.expand !== 'undefined' ) { + $( this ).jsonPresenter( 'expand', settings.expand ); + } + } ); + } else if ( arguments[ 0 ] === 'destroy' ) { + return this.each( function() { + destroy( $( this ) ); + } ); + } else if ( arguments[ 0 ] === 'expandAll' ) { + return this.each( function() { + expandAll( getRootNode( $( this ) ) ); + } ); + } else if ( arguments[ 0 ] === 'collapseAll' ) { + return this.each( function() { + collapseAll( getRootNode( $( this ) ) ); + } ); + } else if ( arguments[ 0 ] === 'expand' ) { + var depth = arguments[ 1 ]; + return this.each( function() { + collapseAll( getRootNode( $( this ) ) ); + expand( getRootNode( $( this ) ), depth ); + } ); + } + }; +} )( jQuery ); diff --git a/resources/jupyterhub-mod/ssh-dialog-snippet.html b/resources/jupyterhub-mod/ssh-dialog-snippet.html new file mode 100644 index 0000000..6b65b24 --- /dev/null +++ b/resources/jupyterhub-mod/ssh-dialog-snippet.html @@ -0,0 +1,38 @@ + + + + +{% call modal('SSH Setup', btn_label="Copy to Clipboard", btn_class='btn-primary copy-clipboard-button') %} + Execute this command to setup the SSH connection to server : + +{% endcall %} diff --git a/resources/jupyterhub-mod/template-admin.html b/resources/jupyterhub-mod/template-admin.html index eb94b11..61fc45d 100644 --- a/resources/jupyterhub-mod/template-admin.html +++ b/resources/jupyterhub-mod/template-admin.html @@ -49,7 +49,6 @@ {%- if spawner.name -%} /{{ spawner.name }} {%- endif -%} - {{ spawner.get_container_metadata() if spawner.get_container_metadata is defined }} {# comment {{ current_user.spawner_class().get_days_to_live() }} #}