ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-9844. Alerts. "Ambari Agent Disk Usage" instances don't contain hostname (onechiporenko)
Date Sat, 28 Feb 2015 15:48:36 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 709e17a88 -> ec90b074f


AMBARI-9844. Alerts. "Ambari Agent Disk Usage" instances don't contain hostname (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec90b074
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec90b074
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec90b074

Branch: refs/heads/trunk
Commit: ec90b074f442671f44f771223cd02f5b63ff030e
Parents: 709e17a
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Sat Feb 28 17:45:35 2015 +0200
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Sat Feb 28 17:45:35 2015 +0200

----------------------------------------------------------------------
 .../app/templates/common/modal_popups/alerts_popup.hbs   |  8 +++++++-
 .../app/templates/main/alerts/definition_details.hbs     | 11 ++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ec90b074/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
index b921657..9019597 100644
--- a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
@@ -36,7 +36,13 @@
                       {{#if alertInstance.service.displayName}}
                         &nbsp;/&nbsp;
                       {{/if}}
-                      <a {{action "goToHostAlerts" alertInstance.host target="view"}}
href="#">{{alertInstance.host.hostName}}</a>
+                      <a {{action "goToHostAlerts" alertInstance.host target="view"}}
href="#">
+                        {{#if alertInstance.host.hostName}}
+                          {{alertInstance.host.hostName}}
+                        {{else}}
+                          {{alertInstance.host.id}}
+                        {{/if}}
+                      </a>
                     {{/if}}
                   </div>
                   <div class="name-text">

http://git-wip-us.apache.org/repos/asf/ambari/blob/ec90b074/ambari-web/app/templates/main/alerts/definition_details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs
index d1dc321..27e579c 100644
--- a/ambari-web/app/templates/main/alerts/definition_details.hbs
+++ b/ambari-web/app/templates/main/alerts/definition_details.hbs
@@ -194,8 +194,13 @@
                     {{#if instance.service.displayName}}
                       &nbsp;/&nbsp;
                     {{/if}}
-                    <a {{action goToHostAlerts instance.host target="controller"}}
-                        href="#">{{instance.host.hostName}}</a>
+                    <a {{action goToHostAlerts instance.host target="controller"}} href="#">
+                      {{#if instance.host.hostName}}
+                      {{instance.host.hostName}}
+                    {{else}}
+                      {{instance.host.id}}
+                    {{/if}}
+                    </a>
                   {{/if}}
                 </td>
                 <td>{{{instance.status}}}
@@ -241,4 +246,4 @@
   </div>
 {{else}}
   <div class="spinner"></div>
-{{/if}}
\ No newline at end of file
+{{/if}}


Mime
View raw message