You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/05/03 14:22:57 UTC
[incubator-dlab] 01/01: Merge remote-tracking branch
'remotes/origin/develop' into feature-DLAB-2
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature-DLAB-2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d9af2329583db92ac1c4dfa208998eb34b506121
Merge: 7a921ad ba2bd75
Author: bhliva <bo...@epam.com>
AuthorDate: Fri May 3 17:22:15 2019 +0300
Merge remote-tracking branch 'remotes/origin/develop' into feature-DLAB-2
# Conflicts:
# services/self-service/self-service.yml
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 ++++++
.../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 +
.../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/tensor_Dockerfile | 3 +
.../src/general/files/azure/zeppelin_Dockerfile | 3 +
.../files/gcp/dataengine-service_Dockerfile | 3 +
.../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/tensor_Dockerfile | 3 +
.../src/general/files/gcp/zeppelin_Dockerfile | 3 +
.../src/general/lib/os/fab.py | 25 +++
.../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 +-
.../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/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 +
.../os/update_inactivity_on_start.py} | 39 ++--
.../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_ssn_node.py | 14 +-
.../src/ssn/templates/docker_build.py | 73 +++++++
.../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 +
.../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 +-
.../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 +-
.../service/CheckInactivityService.java} | 18 +-
.../service/impl/CheckInactivityService.java | 103 ---------
.../service/impl/CheckInactivityServiceImpl.java | 114 ++++++++++
.../backendapi/service/impl/DockerService.java | 3 +
.../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/self-service.yml | 9 +-
.../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 | 14 +-
.../callback/CheckInactivityCallback.java | 40 ++--
.../resources/callback/ComputationalCallback.java | 45 ++--
.../resources/callback/ExploratoryCallback.java | 3 +-
.../schedulers/CheckInactivityScheduledJob.java | 12 +-
.../dlab/backendapi/service/InactivityService.java | 14 +-
.../backendapi/service/SchedulerJobService.java | 5 -
.../service/impl/InactivityServiceImpl.java | 94 ++++-----
.../service/impl/SchedulerJobServiceImpl.java | 94 ++++++---
.../epam/dlab/backendapi/util/RequestBuilder.java | 25 +++
.../services/dataengineConfiguration.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 +-
.../detail-dialog/detail-dialog.component.html | 16 +-
.../scheduler/scheduler.calculations.ts} | 28 ++-
.../resources/scheduler/scheduler.component.html | 190 ++++++++++-------
.../resources/scheduler/scheduler.component.scss | 68 +++++-
.../app/resources/scheduler/scheduler.component.ts | 235 ++++++++++++---------
.../src/app/resources/scheduler/scheduler.model.ts | 25 ++-
.../shared/form-controls/dropdowns.component.scss | 2 +-
.../src/app/shared/navbar/navbar.component.html | 23 +-
.../src/app/shared/navbar/navbar.component.scss | 13 +-
.../shared/time-picker/time-picker.component.scss | 3 +
.../src/main/resources/webapp/src/styles.scss | 3 +-
.../service/impl/InactivityServiceImplTest.java | 187 ----------------
.../service/impl/SchedulerJobServiceImplTest.java | 82 +++----
138 files changed, 1970 insertions(+), 1085 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org