You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2020/10/19 15:25:36 UTC
[incubator-datalab] branch DLAB-2104 created (now d8ac9c1)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-2104
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at d8ac9c1 [DATALAB-2104]: Fixed total instance number for Compute
This branch includes the following new commits:
new 152d2aa Merge remote-tracking branch 'origin/develop' into develop
new d8ac9c1 [DATALAB-2104]: Fixed total instance number for Compute
The 2 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: Merge remote-tracking branch
'origin/develop' into develop
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2104
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 152d2aa630aef0a8f56411d8cc0adbb1a3393123
Merge: f97508c 6fbb300
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Oct 19 15:16:25 2020 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../scripts/aws/common_create_notebook_image.py | 2 +
.../general/scripts/aws/common_prepare_notebook.py | 2 +
.../general/scripts/aws/common_start_notebook.py | 2 +
.../scripts/aws/common_terminate_notebook_image.py | 2 +
.../scripts/aws/dataengine-service_prepare.py | 2 +
.../src/general/scripts/aws/dataengine_prepare.py | 2 +
.../general/scripts/aws/deeplearning_configure.py | 2 +
.../src/general/scripts/aws/edge_start.py | 2 +
.../src/general/scripts/aws/edge_status.py | 3 +-
.../src/general/scripts/aws/edge_stop.py | 2 +
.../src/general/scripts/aws/jupyter_configure.py | 2 +
.../general/scripts/aws/jupyterlab_configure.py | 2 +
.../src/general/scripts/aws/project_prepare.py | 371 +++++++++++----------
.../src/general/scripts/aws/rstudio_configure.py | 2 +
.../src/general/scripts/aws/ssn_prepare.py | 2 +
.../scripts/aws/tensor-rstudio_configure.py | 2 +
.../src/general/scripts/aws/tensor_configure.py | 2 +
.../src/general/scripts/aws/zeppelin_configure.py | 2 +
.../scripts/azure/common_create_notebook_image.py | 2 +
.../azure/common_notebook_configure_dataengine.py | 2 +
.../scripts/azure/common_prepare_notebook.py | 2 +
.../general/scripts/azure/common_start_notebook.py | 2 +
.../azure/common_terminate_notebook_image.py | 2 +
.../general/scripts/azure/dataengine_prepare.py | 2 +
.../scripts/azure/deeplearning_configure.py | 2 +
.../src/general/scripts/azure/edge_start.py | 2 +
.../src/general/scripts/azure/edge_status.py | 3 +-
.../src/general/scripts/azure/edge_stop.py | 3 +
.../src/general/scripts/azure/jupyter_configure.py | 2 +
.../general/scripts/azure/jupyterlab_configure.py | 2 +
.../src/general/scripts/azure/rstudio_configure.py | 2 +
.../src/general/scripts/azure/tensor_configure.py | 2 +
.../general/scripts/azure/zeppelin_configure.py | 2 +
.../scripts/gcp/common_create_notebook_image.py | 2 +
...common_notebook_configure_dataengine-service.py | 2 +
.../gcp/common_notebook_configure_dataengine.py | 2 +
.../general/scripts/gcp/common_prepare_notebook.py | 2 +
.../general/scripts/gcp/common_start_notebook.py | 2 +
.../scripts/gcp/common_terminate_notebook_image.py | 2 +
.../scripts/gcp/dataengine-service_prepare.py | 2 +
.../src/general/scripts/gcp/dataengine_prepare.py | 2 +
.../general/scripts/gcp/deeplearning_configure.py | 2 +
.../src/general/scripts/gcp/edge_configure.py | 2 +
.../src/general/scripts/gcp/edge_start.py | 2 +
.../src/general/scripts/gcp/edge_stop.py | 2 +
.../src/general/scripts/gcp/jupyter_configure.py | 2 +
.../general/scripts/gcp/jupyterlab_configure.py | 2 +
.../src/general/scripts/gcp/project_prepare.py | 2 +
.../src/general/scripts/gcp/rstudio_configure.py | 2 +
.../src/general/scripts/gcp/ssn_configure.py | 2 +
.../src/general/scripts/gcp/ssn_prepare.py | 2 +
.../src/general/scripts/gcp/superset_configure.py | 2 +
.../scripts/gcp/tensor-rstudio_configure.py | 2 +
.../src/general/scripts/gcp/tensor_configure.py | 2 +
.../src/general/scripts/gcp/zeppelin_configure.py | 2 +
.../src/ssn/scripts/configure_ui.py | 1 +
.../login/resources/css/login.css | 0
.../login/resources/img/favicon.ico | Bin
.../resources/img/feedback-error-arrow-down.png | Bin
.../login/resources/img/feedback-error-sign.png | Bin
.../resources/img/feedback-success-arrow-down.png | Bin
.../login/resources/img/feedback-success-sign.png | Bin
.../resources/img/feedback-warning-arrow-down.png | Bin
.../login/resources/img/feedback-warning-sign.png | Bin
.../login/resources/img/keycloak-logo.png | Bin
.../login/resources/img/login-background.png | Bin
.../login/resources/img/login-background1.png | Bin
.../login/resources/img/login-icons.png | Bin
.../{dlab => datalab}/login/resources/img/logo.png | Bin
.../{dlab => datalab}/login/theme.properties | 0
services/self-service/self-service.yml | 1 +
.../conf/SelfServiceApplicationConfiguration.java | 7 +
.../backendapi/resources/dto/BillingFilter.java | 1 -
.../service/impl/BillingServiceImpl.java | 6 +-
.../management-grid/management-grid.component.scss | 1 +
.../audit/audit-grid/audit-grid.component.scss | 4 +
.../reporting-grid/reporting-grid.component.scss | 1 +
.../webapp/src/assets/styles/_general.scss | 2 +-
.../resources/webapp/src/assets/styles/_theme.scss | 10 +
.../service/impl/BillingServiceImplTest.java | 19 +-
80 files changed, 342 insertions(+), 193 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-2104]: Fixed total instance
number for Compute
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2104
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit d8ac9c1a4e9630965e2a1f656d67c3d88b6853bd
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Oct 19 18:24:58 2020 +0300
[DATALAB-2104]: Fixed total instance number for Compute
---
.../computational/cluster-details/cluster-details.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index c9b048f..0b4e072 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -73,7 +73,7 @@
</ng-template>
<div class="col">
<span *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'aws'">{{ resource.totalInstanceCount > 0 ? resource.totalInstanceCount : resource.dataengine_instance_count}}</span>
- <span *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'gcp'">1</span>
+ <span *ngIf="DICTIONARY[PROVIDER].cloud_provider === 'gcp' || DICTIONARY[PROVIDER].cloud_provider === 'azure'">{{resource.dataengine_instance_count}}</span>
</div>
</div>
<div class="row-wrap"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org