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/04/26 08:53:10 UTC

[incubator-dlab] branch develop updated (97e9cbe -> 234f465)

This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from 97e9cbe  Merge pull request #114 from apache/DLAB-579
     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
     new 234f465  Merge pull request #109 from apache/inactivity_integration

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:
 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 +-
 .../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 +-
 ...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/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 +--
 .../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 +-
 .../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}           |   8 +-
 .../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             |  11 +-
 .../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 +-
 .../scheduler/scheduler.calculations.ts}           |  33 +--
 .../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/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 +++----
 131 files changed, 1658 insertions(+), 1092 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
 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
 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
 copy services/self-service/src/main/resources/webapp/src/app/{core/util/fileUtils.ts => resources/scheduler/scheduler.calculations.ts} (53%)
 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 #109 from apache/inactivity_integration

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 234f465505f3ab9cb895735bc377900920178f41
Merge: 97e9cbe 9a56ccb
Author: bhliva <bo...@ukr.net>
AuthorDate: Fri Apr 26 11:53:04 2019 +0300

    Merge pull request #109 from apache/inactivity_integration
    
     [DLAB-454]: added Inactivity integration

 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}              |  40 ++--
 .../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/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             |  11 +-
 .../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 +-
 .../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/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 +++----
 131 files changed, 1835 insertions(+), 1070 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org