You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/03/10 14:13:05 UTC
[incubator-dlab] branch odahu-integration updated: [DLAB-1616]:
Added grafana credential
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new e1a15ea [DLAB-1616]: Added grafana credential
new 469484a Merge remote-tracking branch 'origin/odahu-integration' into odahu-integration
e1a15ea is described below
commit e1a15ea5bc34be5bfef443f10f4a2025ab69e80f
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Mar 10 16:12:35 2020 +0200
[DLAB-1616]: Added grafana credential
---
.../detail-dialog/detail-dialog.component.html | 19 +++++++++----
.../detail-dialog/detail-dialog.component.scss | 33 ++++++++++++++++------
.../resources-grid/resources-grid.model.ts | 9 +++---
3 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 5902d27..e74bad9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -146,12 +146,19 @@
<div class="content-box">
<div class="detail-info" *ngIf="!legion.error_message">
<div class="links_block">
- <p *ngFor="let url of legion.url">
- <span class="description">{{url.description}}: </span>
- <a class="ellipsis" matTooltip="{{ url.url}}" matTooltipPosition="above" href="{{ url.url}}"
- target="_blank">{{ url.url}}
- </a>
- </p>
+ <div *ngFor="let url of legion.url" class="odahu-links">
+ <div class="odahu-link">
+ <span class="description">{{url.description }}: </span>
+ <a class="ellipsis" matTooltip="{{ url.url}}" matTooltipPosition="above" href="{{ url.url}}"
+ target="_blank">{{ url.url}}
+ </a>
+ </div>
+ <div class="grafana" *ngIf="url.description === 'Grafana'">
+ <div><span>Gafana user: </span><span class="creds">{{legion.bucket_name}}</span></div>
+ <div><span>Gafana password: </span><span class="creds">{{legion.shared_bucket_name}}</span></div>
+ </div>
+
+ </div>
</div>
</div>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index 2849ce0..94c8384 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -26,17 +26,34 @@
}
.links_block {
+ .odahu-links:not(:last-child){
+ margin-bottom: 20px;
+ }
+ .grafana{
+ white-space: nowrap;
+ padding-left: 30px;
- >p {
- display: flex;
-
- .description {
- white-space: nowrap;
- padding-left: 7px;
- font-weight: 600;
- color: $blue-grey-color;
+ color: $blue-grey-color;
+ div{
+ display: flex;
+ span{
+ font-size: 13px;
+ font-weight: 500;
+ &.creds{
+ font-weight: 600;
+ }
+ }
}
}
+ >p, .odahu-link {
+ display: flex;
+ .description {
+ white-space: nowrap;
+ padding-left: 7px;
+ font-weight: 600;
+ color: $blue-grey-color;
+ }
+ }
}
.checkbox-group {
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
index 74fb326..7d40063 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
@@ -89,7 +89,7 @@ export class ExploratoryModel {
el.project,
el.endpoint,
el.tags
- )
+ );
});
const odahu = value.odahu.map(el => {
@@ -113,8 +113,8 @@ export class ExploratoryModel {
el.private_ip,
el.exploratory_user,
el.exploratory_pass,
- '',
- '',
+ el.grafana_admin,
+ el.grafana_pass,
el.error_message,
el[DICTIONARY[provider].billing.cost],
el[DICTIONARY[provider].billing.currencyCode],
@@ -127,7 +127,8 @@ export class ExploratoryModel {
'',
el.project,
el.endpoint,
- el.tags)});
+ el.tags
+ )});
return {
project: value.project,
exploratory: [...exploratory, ...odahu]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org