You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2019/07/12 11:02:47 UTC
[incubator-dlab] 01/01: Merge pull request #156 from apache/develop
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 418cf91d8d611f6439bdae2c30c354f7d8df18c2
Merge: 98410a3 1147ddb
Author: Demyan Mysakovets <34...@users.noreply.github.com>
AuthorDate: Fri Jul 12 14:02:41 2019 +0300
Merge pull request #156 from apache/develop
Develop
README.md | 12 +-
infrastructure-provisioning/src/base/entrypoint.py | 4 +
.../src/deeplearning/fabfile.py | 16 ++
.../scripts/configure_deep_learning_node.py | 5 +
.../src/general/api/check_inactivity.py | 66 ++++++
.../src/general/conf/dlab.ini | 2 +-
.../files/aws/dataengine-service_Dockerfile | 3 +
.../src/general/files/aws/dataengine_Dockerfile | 1 +
.../src/general/files/aws/deeplearning_Dockerfile | 3 +
.../src/general/files/aws/jupyter_Dockerfile | 3 +
.../src/general/files/aws/rstudio_Dockerfile | 3 +
.../general/files/aws/tensor-rstudio_Dockerfile | 3 +
.../src/general/files/aws/tensor_Dockerfile | 3 +
.../src/general/files/aws/zeppelin_Dockerfile | 3 +
.../general/files/aws/zeppelin_description.json | 4 +-
.../src/general/files/azure/dataengine_Dockerfile | 1 +
.../general/files/azure/deeplearning_Dockerfile | 3 +
.../src/general/files/azure/jupyter_Dockerfile | 4 +
.../src/general/files/azure/rstudio_Dockerfile | 3 +
.../src/general/files/azure/ssn_Dockerfile | 1 +
.../src/general/files/azure/tensor_Dockerfile | 3 +
.../src/general/files/azure/zeppelin_Dockerfile | 3 +
.../general/files/azure/zeppelin_description.json | 4 +-
.../files/gcp/dataengine-service_Dockerfile | 3 +
.../files/gcp/dataengine-service_description.json | 2 +-
.../src/general/files/gcp/dataengine_Dockerfile | 1 +
.../src/general/files/gcp/deeplearning_Dockerfile | 3 +
.../src/general/files/gcp/jupyter_Dockerfile | 3 +
.../src/general/files/gcp/rstudio_Dockerfile | 3 +
.../src/general/files/gcp/ssn_Dockerfile | 1 +
.../src/general/files/gcp/tensor_Dockerfile | 3 +
.../src/general/files/gcp/zeppelin_Dockerfile | 3 +
.../general/files/gcp/zeppelin_description.json | 4 +-
.../src/general/lib/aws/actions_lib.py | 8 +
.../src/general/lib/os/fab.py | 25 +++
.../src/general/lib/os/redhat/common_lib.py | 2 +-
.../src/general/lib/os/redhat/notebook_lib.py | 2 +-
.../aws/common_notebook_configure_dataengine.py | 6 +-
.../general/scripts/aws/common_start_notebook.py | 14 ++
.../scripts/aws/dataengine-service_configure.py | 1 +
.../src/general/scripts/aws/dataengine_start.py | 52 +++--
.../general/scripts/aws/deeplearning_configure.py | 13 +-
.../src/general/scripts/aws/edge_prepare.py | 2 +-
.../src/general/scripts/aws/jupyter_configure.py | 21 +-
.../jupyter_dataengine-service_create_configs.py | 2 +
.../src/general/scripts/aws/rstudio_configure.py | 12 +-
.../src/general/scripts/aws/ssn_prepare.py | 4 +-
.../scripts/aws/tensor-rstudio_configure.py | 13 +-
.../src/general/scripts/aws/tensor_configure.py | 9 +-
.../src/general/scripts/aws/zeppelin_configure.py | 22 +-
.../azure/common_notebook_configure_dataengine.py | 5 +-
.../general/scripts/azure/common_start_notebook.py | 14 ++
.../src/general/scripts/azure/dataengine_start.py | 20 ++
.../scripts/azure/deeplearning_configure.py | 14 +-
.../src/general/scripts/azure/edge_prepare.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 14 +-
.../src/general/scripts/azure/rstudio_configure.py | 13 +-
.../src/general/scripts/azure/tensor_configure.py | 10 +-
.../general/scripts/azure/zeppelin_configure.py | 22 +-
.../gcp/common_notebook_configure_dataengine.py | 6 +-
.../general/scripts/gcp/common_start_notebook.py | 14 ++
.../src/general/scripts/gcp/dataengine_start.py | 22 ++
.../src/general/scripts/gcp/rstudio_configure.py | 12 +-
.../src/general/scripts/gcp/ssn_prepare.py | 6 +-
.../src/general/scripts/gcp/zeppelin_configure.py | 4 +-
.../src/general/scripts/os/check_inactivity.py | 62 ++++++
.../general/scripts/os/common_clean_instance.py | 4 +
.../os/deeplearning_install_dataengine_kernels.py | 5 +
.../os/jupyter_install_dataengine_kernels.py | 5 +
.../scripts/os/notebook_inactivity_check.py | 73 ++++++
.../os/rstudio_install_dataengine_kernels.py | 5 +
.../tensor-rstudio_install_dataengine_kernels.py | 5 +
.../os/tensor_install_dataengine_kernels.py | 5 +
.../scripts/os/update_inactivity_on_start.py} | 49 ++---
.../os/zeppelin_install_dataengine_kernels.py | 5 +
.../os/inactive.service} | 19 +-
.../src/general/templates/os/inactive.sh | 49 +++++
.../os/inactive.timer} | 21 +-
.../src/general/templates/os/inactive_rs.sh | 48 ++++
infrastructure-provisioning/src/jupyter/fabfile.py | 16 ++
.../src/jupyter/scripts/configure_jupyter_node.py | 5 +
infrastructure-provisioning/src/rstudio/fabfile.py | 16 ++
.../src/rstudio/scripts/configure_rstudio_node.py | 7 +-
.../src/ssn/scripts/configure_docker.py | 44 ++++
.../src/ssn/scripts/configure_ssn_node.py | 14 +-
.../src/ssn/templates/docker_build.py | 73 ++++++
.../src/ssn/templates/ssn_nginx.conf | 1 +
.../src/tensor-rstudio/fabfile.py | 16 ++
.../scripts/configure_tensor-rstudio_node.py | 5 +
infrastructure-provisioning/src/tensor/fabfile.py | 16 ++
.../src/tensor/scripts/configure_tensor_node.py | 5 +
.../src/zeppelin/fabfile.py | 16 ++
.../zeppelin/scripts/configure_zeppelin_node.py | 5 +
.../zeppelin/zeppelin-notebook.json | 4 +-
.../ec2_templates/zeppelin/zeppelin-notebook.json | 4 +-
.../gcp_templates/zeppelin/zeppelin-notebook.json | 4 +-
.../epam/dlab/dto/InfrastructureMetaInfoDTO.java | 3 +
.../java/com/epam/dlab/dto/SchedulerJobDTO.java | 7 +
.../com/epam/dlab/dto/base/DataEngineType.java | 54 ++---
.../computational/CheckInactivityStatusDTO.java | 30 +--
...O.java => ComputationalCheckInactivityDTO.java} | 45 ++--
.../ExploratoryCheckInactivityAction.java} | 12 +-
.../dlab/dto/exploratory/ExploratoryStatusDTO.java | 12 +
.../com/epam/dlab/rest/contracts/ApiCallbacks.java | 4 +-
.../dlab/rest/contracts/InfrasctructureAPI.java | 3 +-
.../java/com/epam/dlab/rest/contracts/KeyAPI.java | 3 +-
.../backendapi/core/commands/RunDockerCommand.java | 5 +
.../handlers/CheckInactivityCallbackHandler.java | 94 ++++----
.../dlab/backendapi/modules/ProductionModule.java | 3 +
.../backendapi/modules/ProvisioningDevModule.java | 17 +-
.../resources/InfrastructureResource.java | 19 +-
.../backendapi/resources/base/KeyResource.java | 23 +-
.../service/CheckInactivityService.java} | 18 +-
.../service/impl/CheckInactivityService.java | 103 ---------
.../service/impl/CheckInactivityServiceImpl.java | 114 ++++++++++
.../backendapi/service/impl/DockerService.java | 3 +
.../{ReuploadKeyService.java => KeyService.java} | 29 ++-
.../aws/dataengine-service_check_inactivity.json | 8 +
.../aws/dataengine_check_inactivity.json | 8 +
.../aws/notebook_check_inactivity.json | 16 +-
.../azure/dataengine-service_check_inactivity.json | 8 +
.../azure/dataengine_check_inactivity.json | 8 +
.../azure/notebook_check_inactivity.json | 22 +-
.../gcp/dataengine-service_check_inactivity.json | 8 +
.../gcp/dataengine_check_inactivity.json | 8 +
.../gcp/notebook_check_inactivity.json | 22 +-
services/self-service/pom.xml | 8 +-
services/self-service/self-service.yml | 16 +-
.../dlab/backendapi/SelfServiceApplication.java | 30 +++
.../SelfServiceApplicationConfiguration.java | 16 ++
.../epam/dlab/backendapi/dao/ComputationalDAO.java | 14 +-
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 5 +-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 33 +--
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 21 ++
.../epam/dlab/backendapi/modules/DevModule.java | 31 ++-
.../dlab/backendapi/modules/ProductionModule.java | 1 +
.../callback/CheckInactivityCallback.java | 40 ++--
.../resources/callback/ComputationalCallback.java | 45 ++--
.../resources/callback/ExploratoryCallback.java | 3 +-
.../schedulers/CheckInactivityScheduledJob.java | 12 +-
.../dlab/backendapi/service/GuacamoleService.java | 10 +
.../dlab/backendapi/service/InactivityService.java | 14 +-
.../backendapi/service/SchedulerJobService.java | 5 -
.../service/impl/GuacamoleServiceImpl.java | 61 ++++++
.../service/impl/InactivityServiceImpl.java | 94 ++++----
.../impl/InfrastructureInfoServiceBase.java | 8 +-
.../service/impl/SchedulerJobServiceImpl.java | 94 +++++---
.../servlet/guacamole/GuacamoleSecurityFilter.java | 56 +++++
.../servlet/guacamole/GuacamoleServlet.java | 32 +++
.../epam/dlab/backendapi/util/RequestBuilder.java | 25 +++
.../annotation/SchedulerJobDTOValid.java | 2 +-
.../src/main/resources/webapp/package-lock.json | 5 +
.../src/main/resources/webapp/package.json | 1 +
.../main/resources/webapp/src/app/app.module.ts | 2 +
.../resources/webapp/src/app/app.routing.module.ts | 4 +
.../services/dataengineConfiguration.service.ts | 2 +-
.../src/app/core/services/healthStatus.service.ts | 2 +-
.../src/app/core/services/scheduler.service.ts | 3 +-
.../webapp/src/app/core/util/checkUtils.ts | 9 +
...utational-resource-create-dialog.component.html | 6 +-
...mputational-resource-create-dialog.component.ts | 17 +-
.../computational-resources-list.component.html | 3 +-
.../detail-dialog/detail-dialog.component.html | 163 +++++++-------
.../resources/exploratory/detail-dialog/index.ts | 1 -
.../src/app/resources/resources-grid/index.ts | 3 +-
.../resources-grid/resources-grid.component.css | 8 +-
.../resources-grid/resources-grid.component.html | 6 +
.../resources-grid/resources-grid.component.ts | 5 -
.../scheduler/scheduler.calculations.ts} | 28 ++-
.../resources/scheduler/scheduler.component.html | 221 +++++++++++++------
.../resources/scheduler/scheduler.component.scss | 75 ++++++-
.../app/resources/scheduler/scheduler.component.ts | 244 +++++++++++++--------
.../src/app/resources/scheduler/scheduler.model.ts | 25 ++-
.../key-upload-dialog.component.ts | 2 +-
.../app/shared/modal-dialog/modal.component.html | 41 ++--
.../app/shared/modal-dialog/modal.component.scss | 17 --
.../notification-dialog.component.ts | 4 +-
.../src/app/shared/navbar/navbar.component.html | 23 +-
.../src/app/shared/navbar/navbar.component.scss | 24 +-
.../src/app/shared/navbar/navbar.component.ts | 2 +-
.../shared/time-picker/time-picker.component.scss | 3 +
.../detail-dialog => webterminal}/index.ts | 19 +-
.../src/app/webterminal/webterminal.component.html | 20 ++
.../webterminal.component.scss} | 19 +-
.../src/app/webterminal/webterminal.component.ts | 75 +++++++
.../webapp/src/assets/styles/_general.scss | 18 +-
.../src/main/resources/webapp/src/styles.scss | 3 +-
.../service/impl/InactivityServiceImplTest.java | 187 ----------------
.../service/impl/ReuploadKeyServiceImplTest.java | 10 +-
.../service/impl/SchedulerJobServiceImplTest.java | 82 ++-----
190 files changed, 2654 insertions(+), 1284 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org