You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/05/08 15:26:19 UTC
[ambari] branch trunk updated: AMBARI-23776 Service summary style
tweaks
This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 88f5dc3 AMBARI-23776 Service summary style tweaks
88f5dc3 is described below
commit 88f5dc389e86218fab04069932d334ecb490a3cb
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Mon May 7 14:03:55 2018 +0300
AMBARI-23776 Service summary style tweaks
---
ambari-web/app/messages.js | 5 ++---
ambari-web/app/styles/application.less | 1 +
.../main/service/info/summary/hdfs/slaves.hbs | 4 +---
.../main/service/info/summary/hdfs/widgets.hbs | 4 +---
.../app/templates/main/service/services/yarn.hbs | 21 ++++-----------------
ambari-web/app/templates/wizard/step10.hbs | 2 +-
6 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 497fbe3..27aa950 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1087,9 +1087,8 @@ Em.I18n.translations = {
'installer.step10.header':'Summary',
'installer.step10.body':'Here is the summary of the install process.',
- 'installer.step10.staleServicesRestartRequired':' You may also need to restart other services for the newly added ' +
- 'services to function properly (for example, HDFS and YARN/MapReduce need to be restarted after adding Oozie). After closing this ' +
- 'wizard, please restart all services that have the restart indicator <i class="glyphicon glyphicon-refresh"></i> next to the service name.',
+ 'installer.step10.staleServicesRestartRequired':' After closing this wizard, please restart all services ' +
+ 'that have the restart indicator <i class="glyphicon glyphicon-refresh"></i> next to the service name.',
'installer.step10.hostsSummary':'The cluster consists of {0} hosts',
'installer.step10.installedAndStarted':'Installed and started services successfully on {0} new ',
'installer.step10.installed':'Installed services successfully on {0} new ',
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 7f21e1c..99ccc8a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -888,6 +888,7 @@ a:focus {
font-size: 12px;
text-transform: uppercase;
margin-top: 5px;
+ margin-bottom: 5px;
}
.summary-value {
color: #333333;
diff --git a/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs b/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
index 5ce4cc9..7ac47f2 100644
--- a/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/hdfs/slaves.hbs
@@ -86,6 +86,7 @@
{{/if}}
{{! indent next row}}
<div class="row"></div>
+ <div class="summary-label col-md-12">{{t dashboard.services.hdfs.datanodecounts}}</div>
{{! Data Node Counts live }}
<div class="row datanode-count-live col-md-3">
<div class="summary-value">
@@ -101,7 +102,6 @@
<div class="info-desc">{{t dashboard.services.hdfs.nodes.live}}</div>
{{/if}}
</div>
- <div class="summary-label">{{t dashboard.services.hdfs.datanodecounts}}</div>
</div>
{{! Data Node Counts dead }}
<div class="row datanode-count-dead col-md-3">
@@ -118,7 +118,6 @@
<div class="info-desc">{{t dashboard.services.hdfs.nodes.dead}}</div>
{{/if}}
</div>
- <div class="summary-label">{{t dashboard.services.hdfs.datanodecounts}}</div>
</div>
{{! Data Node Counts decommission }}
<div class="row datanode-count-decommission col-md-3">
@@ -135,7 +134,6 @@
<div class="info-desc">{{t dashboard.services.hdfs.nodes.decom}}</div>
{{/if}}
</div>
- <div class="summary-label">{{t dashboard.services.hdfs.datanodecounts}}</div>
</div>
</div>
</div>
diff --git a/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs b/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs
index 58e9814..e81e284 100644
--- a/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs
@@ -75,13 +75,13 @@
</div>
{{! indent next row}}
<div class="row"></div>
+ <div class="summary-label col-md-12">{{t services.service.summary.blockErrors}}</div>
{{! Block Errors corrupt }}
<div class="row block-errors-corrupt col-md-3">
<div class="summary-value main-info">
<div class="main-info">{{view.dfsCorruptBlocks}}</div>
<div class="info-desc">{{t dashboard.services.hdfs.blockErrors.corrupt}}</div>
</div>
- <div class="summary-label">{{t services.service.summary.blockErrors}}</div>
</div>
{{! Block Errors missing }}
<div class="row block-errors-missing col-md-3">
@@ -89,7 +89,6 @@
<div class="main-info">{{view.dfsMissingBlocks}}</div>
<div class="info-desc">{{t dashboard.services.hdfs.blockErrors.missing}}</div>
</div>
- <div class="summary-label">{{t services.service.summary.blockErrors}}</div>
</div>
{{! Block Errors replicated }}
<div class="row block-errors-replicated col-md-3">
@@ -97,7 +96,6 @@
<div class="main-info">{{view.dfsUnderReplicatedBlocks}}</div>
<div class="info-desc">{{t dashboard.services.hdfs.blockErrors.replicated}}</div>
</div>
- <div class="summary-label">{{t services.service.summary.blockErrors}}</div>
</div>
{{! indent next row}}
<div class="row"></div>
diff --git a/ambari-web/app/templates/main/service/services/yarn.hbs b/ambari-web/app/templates/main/service/services/yarn.hbs
index 4da3c6a..42502f0 100644
--- a/ambari-web/app/templates/main/service/services/yarn.hbs
+++ b/ambari-web/app/templates/main/service/services/yarn.hbs
@@ -66,6 +66,7 @@
</div>
{{! indent next row}}
<div class="row"></div>
+ <div class="summary-label col-md-12">{{t dashboard.services.yarn.nodeManagers.status}}</div>
{{! NodeManagers active }}
<div class="row col-md-3 nodemanager-active">
<span class="summary-value main-info"
@@ -74,7 +75,6 @@
{{view._nmActive}}
</span>
<div class="info-desc">{{t dashboard.services.yarn.nodeManagers.status.active}}</div>
- <div class="summary-label">{{t dashboard.services.yarn.nodeManagers.status}}</div>
</div>
{{! NodeManagers lost }}
<div class="row col-md-3 nodemanager-lost">
@@ -84,7 +84,6 @@
{{view._nmLost}}
</span>
<div class="info-desc">{{t dashboard.services.yarn.nodeManagers.status.lost}}</div>
- <div class="summary-label">{{t dashboard.services.yarn.nodeManagers.status}}</div>
</div>
{{! NodeManagers unhealthy }}
<div class="row col-md-3 nodemanager-unhealthy">
@@ -94,7 +93,6 @@
{{view._nmUnhealthy}}
</span>
<div class="info-desc">{{t dashboard.services.yarn.nodeManagers.status.unhealthy}}</div>
- <div class="summary-label">{{t dashboard.services.yarn.nodeManagers.status}}</div>
</div>
{{! NodeManagers rebooted }}
<div class="row col-md-3 nodemanager-rebooted">
@@ -104,7 +102,6 @@
{{view._nmRebooted}}
</span>
<div class="info-desc">{{t dashboard.services.yarn.nodeManagers.status.rebooted}}</div>
- <div class="summary-label">{{t dashboard.services.yarn.nodeManagers.status}}</div>
</div>
{{! NodeManagers decommissioned }}
<div class="row col-md-3 nodemanager-decommissioned">
@@ -114,7 +111,6 @@
{{view._nmDecom}}
</span>
<div class="info-desc">{{t dashboard.services.yarn.nodeManagers.status.decommissioned}}</div>
- <div class="summary-label">{{t dashboard.services.yarn.nodeManagers.status}}</div>
</div>
{{! indent next row}}
<div class="row"></div>
@@ -131,13 +127,13 @@
<div class="col-md-12 metrics-summary">
<div class="col-md-2">{{t dashboard.services.hdfs.summary.service-metrics}}</div>
<div class="col-md-10">
+ <div class="summary-label col-md-12">{{t dashboard.services.yarn.containers}}</div>
{{! Containers allocated }}
<div class="row col-md-3 yarn-containers-allocated">
<div class="summary-value">
<div class="main-info">{{view._allocated}}</div>
<div class="info-desc">{{t dashboard.services.yarn.containers.allocated}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.containers}}</div>
</div>
{{! Containers pending }}
<div class="row col-md-3 yarn-containers-pending">
@@ -145,7 +141,6 @@
<div class="main-info">{{view._pending}}</div>
<div class="info-desc">{{t dashboard.services.yarn.containers.pending}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.containers}}</div>
</div>
{{! Containers reserved }}
<div class="row col-md-3 yarn-containers-reserved">
@@ -153,17 +148,16 @@
<div class="main-info">{{view._reserved}}</div>
<div class="info-desc">{{t dashboard.services.yarn.containers.reserved}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.containers}}</div>
</div>
{{! indent next row}}
<div class="row"></div>
+ <div class="summary-label col-md-12">{{t dashboard.services.yarn.apps}}</div>
{{! Applications submitted }}
<div class="row col-md-3 yarn-applications-submitted">
<div class="summary-value">
<div class="main-info">{{view._appsSubmitted}}</div>
<div class="info-desc">{{t dashboard.services.yarn.apps.submitted}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.apps}}</div>
</div>
{{! Applications running }}
<div class="row col-md-3 yarn-applications-running">
@@ -171,7 +165,6 @@
<div class="main-info">{{view._appsRunning}}</div>
<div class="info-desc">{{t dashboard.services.yarn.apps.running}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.apps}}</div>
</div>
{{! Applications pending }}
<div class="row col-md-3 yarn-applications-pending">
@@ -179,7 +172,6 @@
<div class="main-info">{{view._appsPending}}</div>
<div class="info-desc">{{t dashboard.services.yarn.apps.pending}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.apps}}</div>
</div>
{{! Applications completed }}
<div class="row col-md-3 yarn-applications-completed">
@@ -187,7 +179,6 @@
<div class="main-info">{{view._appsCompleted}}</div>
<div class="info-desc">{{t dashboard.services.yarn.apps.completed}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.apps}}</div>
</div>
{{! Applications killed }}
<div class="row col-md-3 yarn-applications-killed">
@@ -195,7 +186,6 @@
<div class="main-info">{{view._appsKilled}}</div>
<div class="info-desc">{{t dashboard.services.yarn.apps.killed}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.apps}}</div>
</div>
{{! Applications failed }}
<div class="row col-md-3 yarn-applications-failed">
@@ -203,17 +193,16 @@
<div class="main-info">{{view._appsFailed}}</div>
<div class="info-desc">{{t dashboard.services.yarn.apps.failed}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.apps}}</div>
</div>
{{! indent next row}}
<div class="row"></div>
+ <div class="summary-label col-md-12">{{t dashboard.services.yarn.memory}}</div>
{{! Memory allocated }}
<div class="row col-md-3 yarn-memory-allocated">
<div class="summary-value">
<div class="main-info">{{view.allocatedMemoryFormatted}}</div>
<div class="info-desc">{{t dashboard.services.yarn.memory.used}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.memory}}</div>
</div>
{{! Memory reserved }}
<div class="row col-md-3 yarn-memory-reserved">
@@ -221,7 +210,6 @@
<div class="main-info">{{view.reservedMemoryFormatted}}</div>
<div class="info-desc">{{t dashboard.services.yarn.memory.reserved}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.memory}}</div>
</div>
{{! Memory available }}
<div class="row col-md-3 yarn-memory-available">
@@ -229,7 +217,6 @@
<div class="main-info">{{view.availableMemoryFormatted}}</div>
<div class="info-desc">{{t dashboard.services.yarn.memory.available}}</div>
</div>
- <div class="summary-label">{{t dashboard.services.yarn.memory}}</div>
</div>
{{! indent next row}}
<div class="row"></div>
diff --git a/ambari-web/app/templates/wizard/step10.hbs b/ambari-web/app/templates/wizard/step10.hbs
index fef02b4..531854b 100644
--- a/ambari-web/app/templates/wizard/step10.hbs
+++ b/ambari-web/app/templates/wizard/step10.hbs
@@ -18,7 +18,7 @@
<div id="deploy-summary" class="wizard-content col-md-9">
<h4 class="step-title">{{t installer.step10.header}}</h4>
{{#if view.serviceRestartText}}
- <div id="step10-alert-message" class="step-description">
+ <div id="step10-alert-message" class="alert alert-danger">
{{{view.serviceRestartText}}}
</div>
{{/if}}
--
To stop receiving notification emails like this one, please contact
atkach@apache.org.