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:46 UTC
[incubator-dlab] branch DLAB-433 updated (98410a3 -> 418cf91)
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a change to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 98410a3 [terraform] Updated legion image version
add 97af247 EPMCDLAB-000 changed logic for inactivity checking
add b497ae5 EPMCDLAB-000 inactivity bugfix
add 05f5143 add markers for spark and emr
add 29c1762 partial changes
add 2c7e43e correct names of notebooks
add 2b1edbf change function for other notebooks
add e5ea52f fixes for previous commit
add 56f36f8 remove java idle marker
add c16d3c4 create initial inactivity log
add 9b36fc1 create initial inactivity log
add a91f8bc changes in edge SG port range for spark application master
add 67c154a fix for rstudio
add e4342eb EPMCDLAB-000 fixed merge conflicts
add a3dda6b DLAB-406 prevent executing exploratory scheduler when it has corresponding computational with status creating/terminating/configuring
add 4e97969 Merge pull request #3 from apache/bugfix-DLAB-406
add db483d4 DLAB-401 last activity field is updated when any action was performed with instance
add b44c1f2 Merge pull request #4 from apache/bugfix-DLAB-401
add bb8056b DLAB-415 added possibility to consider cluster inactivity when executing stop scheduler for exploratory
add b2ebbcd Merge pull request #5 from apache/feature-DLAB-415
add ef7c735 [DLAB-402] Update last time inactivity after restarting by starting time [DLAB-405] Changes in names of idle_check parameters
add 7152eb7 Merge pull request #6 from ioleksandr/inactivity_integration
add 6108bbe DLAB-410 forbid to show reminder for inactivity scheduler
add 224b9d1 Merge pull request #7 from apache/bugfix-DLAB-410
add 1cb5c3c DLAB-444 fixed bug connected with scheduler with more than 1 computational
add 1b59798 Merge pull request #9 from apache/bugfix-DLAB-444
add cd949fd DLAB-442 fixed bug with scheduler when no computational resources exist on exploratory
add 5f80ab6 Merge pull request #10 from apache/bugfix-DLAB-442
add 0e2c6a4 DLAB-445 fixed bug connected with computational last activity updating
add 99b3e4b Merge pull request #13 from apache/bugfix-DLAB-445
add 2220603 merge develop into inactivity_integration
add eacac5e [DLAB-395]: removed days selection note
add 379d67b [DLAB-395]: removed base info notification in case scheduler is not set
add 1ce57d8 [DLAB-395]: close scheduler after inactivity settings is settled up
add d317e60 [DLAB-398]: changed inactivityLimits; Include max_inactivity in request
add 0ae19f3 [DLAB-398]: added switcher of scheduler by type
add ce9015c [DLAB-398]: select offset state fixes; time picker theme fixes
add 25598d0 [DLAB-398]: added force scheduler usage even some jobs are ran on computational resources
add 5b24b4d [DLAB-416]: removed inherit settings for notebook without active dataengines
add 7cda4ff [DLAB-465] Fix problem with Inactivity file which doesn't have ID for Data Engine Cluster in Azure and GCP
add 9d9562c Merge pull request #20 from ioleksandr/inactivity_integration
add f8460f3 DLAB-406 fixed bug with inactivity scheduler
add a7903eb DLAB-471 adding parameter that will remove docker container for check inactivity after it is executed
add 1422829 [DLAB-482] fix fail of Spark configuration on installing kernels step
add e249549 Merge pull request #23 from ioleksandr/inactivity_integration
add 47979d7 DLAB-527 fixed bug connected with azure billing
add 99a5829 Merge remote-tracking branch 'remotes/origin/develop' into inactivity_integration
add 121ffc5 DLAB-000 Licence headers updated
add 635251d [DLAB-480]: fixed action buttons overlapping in case of not selected hours
add 3c975be [DLAB-480]: added scheduler.calculations; setDefault for week selections model
add eef52dd [DLAB-480]: prevent float and negative numbers; inactivity validation fixes
add 7ca2e08 [DLAB-480]: error handling labeling fixes
add 102d497 [DLAB-480]: added consider_inactivity patameter to idle time scheduler
add 63b1b25 [DLAB-480]: moved general isNumeric Key check into utils
add 539bbcb [DLAB-480]: updated scheduler with set/reset actions separation
add f738195 DLAB-000 fixed bug connected with inactivity scheduler
add 9bacc95 [DLAB-454]: added controls for resources termination
add 04860fe [DLAB-454]: added controls for resources termination
add 4bb0fbc [DLAB-454]: added terminate_datetime request parameter
add f4fdcbe DLAB-000 fixed merge conflicts
add 6426d06 DLAB-000 fixed merge conflicts
add 5586273 Change copyrights due to new standards
add e7f029b [DLAB-454]: added terminate date validity check
add f168cd6 Merge branch 'develop' of github.com:apache/incubator-dlab into inactivity_integration
add 9a56ccb Merge remote-tracking branch 'origin/inactivity_integration' into inactivity_integration
add 234f465 Merge pull request #109 from apache/inactivity_integration
add bccbee4 [DLAB-583]: added meta data fixes
add b40c062 Merge pull request #115 from apache/DLAB-583
add 6ce6964 [DLAB-docker-script] Created script that rebuilds docker images on ssn
add b1f4eab [DLAB-docker-script] Added conditional for azure_auth.json.
add 04dd664 [DLAB-docker-script] Bugfix
add 7c232b5 [DLAB-docker-script] Changed name to more appropriate
add ad2aa2c [DLAB-docker-script] Parametrized docker-build script
add a9fc846 Merge pull request #116 from apache/docker-script
add ba2bd75 Update README.md
add 0533553 DLAB-0 added release notes link
add 107a039 [DLAB-592] Change dataproc and Zeppelin version because of bug in 0.8.1
add 9d8f298 Merge pull request #117 from apache/DLAB-592
add 764000d [DLAB-592] Change Zeppelin version to 0.8.0 in descriptions
add e42803a Merge pull request #119 from apache/DLAB-592
add f0d166f [DLAB-290]: metadata infolist fixes
add 87ddd9b Merge pull request #120 from apache/DLAB-290
add 15c5db6 DLAB-0 Changed manifest dlab version property name
add 7a921ad DLAB-2 added backend for web terminal
add d9af232 Merge remote-tracking branch 'remotes/origin/develop' into feature-DLAB-2
add c313203 Merge remote-tracking branch 'remotes/origin/feature-DLAB-2' into DLAB-4
add 9723af8 [DLAB-4]: added guacamole-common-js lib
add 3ba00ad [DLAB-4]: added web terminal component
add 2be1b5e [DLAB-4]: redirect to terminal with new tab by notebook ip
add 32ff5c1 [DLAB-4]: added routing to web terminal connection
add f2f0cdb DLAB-2 added possibility to use admin key during ssh connection
add 8492473 DLAB-2 disabled gzip handler for guacamole servlet
add 7639229 Merge remote-tracking branch 'remotes/origin/feature-DLAB-2' into DLAB-4
add 3213cf3 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-4
add 501c270 [DLAB-4]: added terminal per notebook on actions panel
add d5efe85 Merge pull request #121 from apache/DLAB-4
add 2ec9c37 [DLAB-4]: fixed location and token for connection
add 3b38426 [DLAB-290]: added hint for commit trimmed field
add 2953957 [DLAB-290]: fixed metadata error handling
add 1957891 Merge pull request #122 from apache/DLAB-4
add af06b0b [DLAB-619]: added possibility to terminate by schedule for Data Engine Services
add e1ea361 [DLAB-620]: fixed issue with consider inactivity check
add e47bde4 [DLAB-621]: added schedule validation if time termination is chosen but date - is not fetched
add 7a7b67e Merge pull request #123 from apache/DLAB-619
add d0c9806 change ssn primary drive size first configuration of guacamole
add 0d22e40 change ssn primary drive size first configuration of guacamole
add 8640b86 change ssn primary drive size first configuration of guacamole
add 616c4c0 change ssn primary drive size first configuration of guacamole
add 6f604a4 Update configure_docker.py
add 546ac58 Update configure_docker.py
add c14cc21 Merge remote-tracking branch 'origin/DLAB-3' into DLAB-3
add 8ac2297 Update configure_docker.py
add 4f09046 Update configure_docker.py
add 2e49780 Update configure_docker.py
add 4fe05f7 Update configure_docker.py
add 7b96471 Update configure_docker.py
add 146e250 Update configure_docker.py
add d2fd4dd Update configure_docker.py
add d094ac8 add cron reboot job and autorestart to dockers
add ef32ed9 add cron reboot job and autorestart to dockers
add c89eb75 add cron reboot job and autorestart to dockers
add 0496b4c Update configure_docker.py
add 1645fc8 Merge remote-tracking branch 'origin/DLAB-3' into DLAB-3
add 973ca43 add cron reboot job and autorestart to dockers
add 21344ef add cron reboot job and autorestart to dockers
add 2ce65bf final fixes
add c5b71de final fixes
add ccc00a3 final fixes
add d5e6e97 pass fix
add 7f6f1a0 change size of storage device for GCP also
add 5439b80 Merge pull request #124 from apache/DLAB-3
add 21a9bb0 DLAB-608 changed error message for scheduler validation
add aa88485 [DLAB-810] Truned off proxy buffering in nginx
add d2d1de3 Merge pull request #136 from apache/DLAB-810
add 3d3a281 [DLAB-176]: Fixed issue with install devtools R package
add 1147ddb Merge pull request #148 from apache/DLAB-176
new 418cf91 Merge pull request #156 from apache/develop
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 12 +-
infrastructure-provisioning/src/base/entrypoint.py | 4 +
.../src/deeplearning/fabfile.py | 16 ++
.../scripts/configure_deep_learning_node.py | 5 +
.../api/{git_creds.py => check_inactivity.py} | 2 +-
.../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 +-
...mmon_configure_proxy.py => check_inactivity.py} | 41 ++--
.../general/scripts/os/common_clean_instance.py | 4 +
.../os/deeplearning_install_dataengine_kernels.py | 5 +
.../os/jupyter_install_dataengine_kernels.py | 5 +
...igure_spark.py => notebook_inactivity_check.py} | 46 ++--
.../os/rstudio_install_dataengine_kernels.py | 5 +
.../tensor-rstudio_install_dataengine_kernels.py | 5 +
.../os/tensor_install_dataengine_kernels.py | 5 +
.../update_inactivity_on_start.py} | 18 +-
.../os/zeppelin_install_dataengine_kernels.py | 5 +
..._spark-defaults_local.conf => inactive.service} | 10 +-
.../src/general/templates/os/inactive.sh | 49 +++++
...ok_spark-defaults_local.conf => inactive.timer} | 12 +-
.../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 +--
.../ComputationalCheckInactivityDTO.java | 52 ++---
.../ExploratoryCheckInactivityAction.java} | 7 +-
.../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} | 8 +-
.../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} | 33 +--
.../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 +
.../login.module.ts => webterminal/index.ts} | 20 +-
.../webterminal.component.html} | 5 +-
.../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, 2465 insertions(+), 1295 deletions(-)
copy infrastructure-provisioning/src/general/api/{git_creds.py => check_inactivity.py} (97%)
copy infrastructure-provisioning/src/general/scripts/os/{common_configure_proxy.py => check_inactivity.py} (61%)
copy infrastructure-provisioning/src/general/scripts/os/{notebook_reconfigure_spark.py => notebook_inactivity_check.py} (68%)
copy infrastructure-provisioning/src/general/scripts/{gcp/common_download_git_certfile.py => os/update_inactivity_on_start.py} (76%)
copy infrastructure-provisioning/src/general/templates/os/{notebook_spark-defaults_local.conf => inactive.service} (88%)
create mode 100644 infrastructure-provisioning/src/general/templates/os/inactive.sh
copy infrastructure-provisioning/src/general/templates/os/{notebook_spark-defaults_local.conf => inactive.timer} (88%)
create mode 100644 infrastructure-provisioning/src/general/templates/os/inactive_rs.sh
create mode 100644 infrastructure-provisioning/src/ssn/templates/docker_build.py
copy integration-tests/src/main/java/com/epam/dlab/automation/model/DeployClusterDto.java => services/dlab-model/src/main/java/com/epam/dlab/dto/computational/ComputationalCheckInactivityDTO.java (55%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/rest/contracts/BackupAPI.java => dlab-model/src/main/java/com/epam/dlab/dto/exploratory/ExploratoryCheckInactivityAction.java} (84%)
copy services/{self-service/src/main/java/com/epam/dlab/backendapi/service/ExternalLibraryService.java => provisioning-service/src/main/java/com/epam/dlab/backendapi/service/CheckInactivityService.java} (69%)
delete mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/CheckInactivityService.java
create mode 100644 services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/CheckInactivityServiceImpl.java
rename services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/{ReuploadKeyService.java => KeyService.java} (82%)
create mode 100644 services/provisioning-service/src/main/resources/mock_response/aws/dataengine-service_check_inactivity.json
create mode 100644 services/provisioning-service/src/main/resources/mock_response/aws/dataengine_check_inactivity.json
create mode 100644 services/provisioning-service/src/main/resources/mock_response/azure/dataengine-service_check_inactivity.json
create mode 100644 services/provisioning-service/src/main/resources/mock_response/azure/dataengine_check_inactivity.json
create mode 100644 services/provisioning-service/src/main/resources/mock_response/gcp/dataengine-service_check_inactivity.json
create mode 100644 services/provisioning-service/src/main/resources/mock_response/gcp/dataengine_check_inactivity.json
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/GuacamoleService.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/servlet/guacamole/GuacamoleSecurityFilter.java
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/servlet/guacamole/GuacamoleServlet.java
copy services/self-service/src/main/resources/webapp/src/app/{core/util/fileUtils.ts => resources/scheduler/scheduler.calculations.ts} (53%)
copy services/self-service/src/main/resources/webapp/src/app/{login/login.module.ts => webterminal/index.ts} (74%)
copy services/self-service/src/main/resources/webapp/src/app/{app.component.html => webterminal/webterminal.component.html} (92%)
copy services/self-service/src/main/resources/webapp/src/app/{core/util/checkUtils.ts => webterminal/webterminal.component.scss} (81%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/webterminal/webterminal.component.ts
delete mode 100644 services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/InactivityServiceImplTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #156 from apache/develop
Posted by dm...@apache.org.
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