You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/13 11:02:54 UTC
[incubator-dlab] branch DLAB-1086 updated (cd9934b -> 87072df)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from cd9934b fixed issue with terminating;
add d7859fe DLAB-1087 - [AWS]: RStudio with TensorFlow creation fails due to 'conf_service_base_name' is not defined fixed DLAB-1084 - [Debian]: Notebook/spark cluster creations stuck using shared image
add c87b0e1 Merge branch 'develop' into DLAB-748
add 9374ad1 Merge pull request #293 from bodnarmykola/DLAB-748
add de14f04 [DLAB-984]: added error message in case of project starting issues
add 5443d06 [DLAB-984]: added error message in case of project starting issues
add 5485a3a [DLAB-984]: added tooltip to project name on Manage environment popup
add d8dcf20 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1044
add e4cddfa Merge pull request #292 from apache/DLAB-1044
add 637b408 [DLAB-1038]: fixed overlaps and collapse markdown
add 3355feb [DLAB-977]: added extra check for active resources termination list
add d6426ed [DLAB-842]: dictionary labels replaced
add 27423df Merge pull request #295 from apache/DLAB-1038
add 03d7a32 [DLAB-1081]: Fixed bug with scheduler by inactivity
add cf8fb16 Merge pull request #291 from ofuks/DLAB-1081
add a3c3e23 [DLAB-1066]: endpoint grid alignment
add 70d6a45 added project parameter to ami request on notebook creation
add 7e07166 Merge pull request #297 from apache/DLAB-1066
add a7efd37 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-terraform
add 292443f Added Endpoint for GCP by infrastructure-provisioning/terraform/gcp/endpoint
add 8bdb086 Update provisioning.yml
add 61006fa Merge pull request #303 from apache/merge_gcp_endpoint_terraform
add 0c36b2a [DLAB-1054]: Added possibility to retrieve custom images per project
add e611e76 Added space
add 5e5ded1 Code review
add 852175f Merge pull request #294 from ofuks/DLAB-1054
add df48bb4 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
add 864c4db Merge pull request #300 from apache/DLAB-1037
add a555c58 [DLAB-1090] Include EMR disk name cluster_name, instead of instance_name on GCP.
add 8032f1f minor fix
add 9821a56 Merge pull request #296 from apache/DLAB-1090
add c1663b0 [DLAB-1090]:Fixed name of primary disk for dataproc.
add fe5e433 Merge pull request #301 from apache/fix-dataproc
add 310b9c5 DLAB-000 billing mock on gcp implemented
add 5a9566f DLAB-23 added gcp billing + refactored current billing implementation
add 105ef3a DLAB-23 billing updated for aws
add ccfa823 DLAB-23 dictionary updated
add 236e8b6 DLAB-23 added billing for gcp
add 0522016 DLAB-000 license headers updated
add 217462d DLAB-23 billing updated
add f5563be DLAB-23 fixed merge conflicts
add eed9091 DLAB-23 pom fixed
add f79696d DLAB-23 removed copping billing jar
add 807bbe4 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 82e2820 Merge remote-tracking branch 'remotes/origin/develop' into bil-2
add 99b7c2d DLAB-23 added billing on GCP
add a42e071 DLAB-23 added possibility to export billing on GCP
add 461b6b7 DLAB-23 added project to billable resource
add b2ccd81 DLAB-23 additional log added
add c012d21 Devops gcp billing
add 1971736 Devops gcp billing. Added billing_dataset_name.
add d43c4f4 Devops gcp billing. Added RedHat support.
add 8320e93 Fixed MongoDB password parsing.
add db65309 Set billing service on 8088 port in billing.yml
add e319c0e Fixed blling.yml
add 8d4a972 Merge pull request #298 from apache/bil-devops
add adedd5e Merge pull request #302 from apache/bil-2
add ec83eae Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-terraform
new 87072df Merge branch 'DLAB-terraform' of github.com:apache/incubator-dlab into DLAB-1086
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/scripts/deploy_dlab.py | 2 +
.../src/general/lib/gcp/actions_lib.py | 29 +-
.../src/general/lib/os/debian/common_lib.py | 54 +--
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../general/scripts/aws/common_prepare_notebook.py | 3 +-
.../scripts/aws/tensor-rstudio_configure.py | 2 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/ssn_configure.py | 6 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
.../{bin/deploy => gcp/endpoint}/daemon.json | 10 +-
.../main/modules/gke => endpoint/main}/iam.tf | 37 +-
.../{aws => gcp}/endpoint/main/instance.tf | 53 ++-
.../terraform/{aws => gcp}/endpoint/main/main.tf | 9 +-
.../terraform/gcp/endpoint/main/network.tf | 74 ++++
.../terraform/gcp/endpoint/main/variables.tf | 144 +++++++
.../endpoint/provisioning.py} | 37 +-
.../{bin/deploy => gcp/endpoint}/provisioning.yml | 302 +++++++-------
.../deploy => gcp/endpoint}/supervisor_svc.conf | 0
pom.xml | 15 +-
services/billing-gcp/billing.yml | 40 +-
services/billing-gcp/pom.xml | 84 ++--
...licationGcp.java => BillingGcpApplication.java} | 17 +-
.../gcp/conf/BillingApplicationConfiguration.java} | 18 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 20 +-
.../com/epam/dlab/billing/gcp/dao/BillingDAO.java} | 12 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 ++++++
.../epam/dlab/billing/gcp/documents/Project.java} | 15 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 +++
.../epam/dlab/billing/gcp/model/BillingData.java | 70 ++++
.../dlab/billing/gcp/model/BillingHistory.java | 13 +
.../dlab/billing/gcp/model/GcpBillingData.java} | 20 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../billing/gcp/repository/BillingRepository.java | 12 +-
.../billing/gcp/repository/ProjectRepository.java | 11 +-
.../gcp/repository/UserInstanceRepository.java} | 14 +-
.../billing/gcp/scheduler/BillingScheduler.java} | 28 +-
.../dlab/billing/gcp/service/BillingService.java} | 7 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 ++++++++
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 +++++
.../billing-gcp/src/main/resources/application.yml | 18 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
services/self-service/self-service.yml | 41 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +++------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++-------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../backendapi/modules/GcpSelfServiceModule.java | 59 +--
.../resources/ImageExploratoryResource.java | 8 +-
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../BillingResourceGcp.java} | 28 +-
.../dlab/backendapi/service/BillingService.java | 87 ++--
.../service/ImageExploratoryService.java | 2 +-
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 ++++---
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../src/main/resources/webapp/package-lock.json | 458 ++++++++++-----------
.../management/endpoints/endpoints.component.scss | 17 +
.../manage-environment-dilog.component.html | 4 +-
.../administration/project/project.component.ts | 3 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 2 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +
.../create-environment.component.ts | 2 +-
.../resources-grid/resources-grid.component.scss | 13 +-
.../resources-grid/resources-grid.component.ts | 4 +-
.../confirmation-dialog.component.ts | 13 +-
.../resources/webapp/src/assets/styles/_theme.scss | 17 +-
.../webapp/src/dictionary/aws.dictionary.ts | 8 +-
.../webapp/src/dictionary/azure.dictionary.ts | 8 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 10 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
85 files changed, 2281 insertions(+), 1296 deletions(-)
copy infrastructure-provisioning/terraform/{bin/deploy => gcp/endpoint}/daemon.json (69%)
copy infrastructure-provisioning/terraform/gcp/{ssn-gke/main/modules/gke => endpoint/main}/iam.tf (55%)
copy infrastructure-provisioning/terraform/{aws => gcp}/endpoint/main/instance.tf (50%)
copy infrastructure-provisioning/terraform/{aws => gcp}/endpoint/main/main.tf (86%)
create mode 100644 infrastructure-provisioning/terraform/gcp/endpoint/main/network.tf
create mode 100644 infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
copy infrastructure-provisioning/terraform/{bin/deploy/endpoint_fab.py => gcp/endpoint/provisioning.py} (93%)
copy infrastructure-provisioning/terraform/{bin/deploy => gcp/endpoint}/provisioning.yml (95%)
copy infrastructure-provisioning/terraform/{bin/deploy => gcp/endpoint}/supervisor_svc.conf (100%)
rename services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/{BillingApplicationGcp.java => BillingGcpApplication.java} (58%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/auth/SecurityUnauthorizedHandler.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/BillingApplicationConfiguration.java} (65%)
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/conf/DlabConfiguration.java} (69%)
copy services/{self-service/src/main/java/com/epam/dlab/backendapi/service/ApplicationSettingService.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java} (78%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
copy services/{billing-azure/src/main/java/com/epam/dlab/billing/azure/usage/UsageAggregateResponse.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/Project.java} (80%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/documents/UserInstance.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingData.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java
copy services/{dlab-model/src/main/java/com/epam/dlab/dto/InfrastructureMetaInfoDTO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java} (69%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java
copy integration-tests/src/main/java/com/epam/dlab/automation/exceptions/CloudException.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingRepository.java (72%)
copy integration-tests/src/main/java/com/epam/dlab/automation/exceptions/CloudException.java => services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/ProjectRepository.java (76%)
copy services/{dlab-webapp-common/src/main/java/com/epam/dlab/auth/UserInfoDAO.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/UserInstanceRepository.java} (70%)
copy services/{dlab-utils/src/main/java/com/epam/dlab/util/SecurityUtils.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/scheduler/BillingScheduler.java} (58%)
copy services/{dlab-mongo-migration/src/main/java/com/epam/dlab/migration/DbMigration.java => billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java} (88%)
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingServiceImpl.java
create mode 100644 services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
create mode 100644 services/billing-gcp/src/main/resources/application.yml
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/{azure/AzureBillingFilter.java => gcp/GcpBillingFilter.java} (78%)
copy services/self-service/src/main/java/com/epam/dlab/backendapi/resources/{azure/BillingResourceAzure.java => gcp/BillingResourceGcp.java} (77%)
create mode 100644 services/self-service/src/main/java/com/epam/dlab/backendapi/service/gcp/GcpBillingService.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 branch 'DLAB-terraform' of
github.com:apache/incubator-dlab into DLAB-1086
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 87072dfeaf00437cf59828b83fc8ebf64de5600b
Merge: cd9934b ec83eae
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Sep 13 14:02:36 2019 +0300
Merge branch 'DLAB-terraform' of github.com:apache/incubator-dlab into DLAB-1086
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/gcp/actions_lib.py | 29 +-
.../src/general/lib/os/debian/common_lib.py | 54 +--
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../general/scripts/aws/common_prepare_notebook.py | 3 +-
.../scripts/aws/tensor-rstudio_configure.py | 2 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/ssn_configure.py | 6 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
.../terraform/gcp/endpoint/daemon.json | 5 +
.../terraform/gcp/endpoint/main/iam.tf | 49 ++
.../terraform/gcp/endpoint/main/instance.tf | 60 +++
.../terraform/gcp/endpoint/main/main.tf | 7 +
.../terraform/gcp/endpoint/main/network.tf | 74 +++
.../terraform/gcp/endpoint/main/variables.tf | 144 ++++++
.../terraform/gcp/endpoint/provisioning.py | 495 +++++++++++++++++++++
.../terraform/gcp/endpoint/provisioning.yml | 151 +++++++
.../gcp/endpoint}/supervisor_svc.conf | 32 +-
pom.xml | 15 +-
services/billing-gcp/billing.yml | 40 +-
services/billing-gcp/pom.xml | 84 ++--
...licationGcp.java => BillingGcpApplication.java} | 17 +-
.../BillingApplicationConfiguration.java} | 17 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 24 +-
.../BillingDAO.java} | 10 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 +++++
.../Project.java} | 13 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 +++
.../epam/dlab/billing/gcp/model/BillingData.java | 70 +++
.../dlab/billing/gcp/model/BillingHistory.java | 13 +
.../dlab/billing/gcp/model/GcpBillingData.java} | 25 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../BillingRepository.java} | 10 +-
.../ProjectRepository.java} | 9 +-
.../UserInstanceRepository.java} | 11 +-
.../BillingScheduler.java} | 21 +-
.../BillingService.java} | 8 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 ++++++++
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 ++++
.../billing-gcp/src/main/resources/application.yml | 18 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
services/self-service/self-service.yml | 41 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 ++++++++-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +-
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 ++-------
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +++------
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 ++--
.../backendapi/modules/GcpSelfServiceModule.java | 59 +--
.../resources/ImageExploratoryResource.java | 8 +-
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../resources/gcp/BillingResourceGcp.java | 76 ++++
.../dlab/backendapi/service/BillingService.java | 87 ++--
.../service/ImageExploratoryService.java | 2 +-
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 +++----
.../backendapi/service/gcp/GcpBillingService.java | 102 +++++
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../src/main/resources/webapp/package-lock.json | 458 +++++++++----------
.../management/endpoints/endpoints.component.scss | 17 +
.../manage-environment-dilog.component.html | 4 +-
.../administration/project/project.component.ts | 3 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 2 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +
.../create-environment.component.ts | 2 +-
.../resources-grid/resources-grid.component.scss | 13 +-
.../resources-grid/resources-grid.component.ts | 4 +-
.../confirmation-dialog.component.ts | 13 +-
.../resources/webapp/src/assets/styles/_theme.scss | 17 +-
.../webapp/src/dictionary/aws.dictionary.ts | 8 +-
.../webapp/src/dictionary/azure.dictionary.ts | 8 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 10 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
85 files changed, 2891 insertions(+), 1076 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org