Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BFA5D121 for ; Sun, 9 Dec 2012 14:12:03 +0000 (UTC) Received: (qmail 95968 invoked by uid 500); 9 Dec 2012 14:12:03 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 95888 invoked by uid 500); 9 Dec 2012 14:12:02 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 95822 invoked by uid 99); 9 Dec 2012 14:12:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 14:12:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2012 14:11:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8398A2388B43; Sun, 9 Dec 2012 14:11:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1418965 [1/2] - in /incubator/ambari/branches/AMBARI-666/ambari-web: ./ app/ app/assets/data/hosts/ app/controllers/ app/controllers/global/ app/controllers/main/ app/controllers/main/charts/ app/controllers/main/host/ app/controllers/main... Date: Sun, 09 Dec 2012 14:11:25 -0000 To: ambari-commits@incubator.apache.org From: yusaku@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121209141129.8398A2388B43@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: yusaku Date: Sun Dec 9 14:11:19 2012 New Revision: 1418965 URL: http://svn.apache.org/viewvc?rev=1418965&view=rev Log: AMBARI-1059. Refactor cluster management. (yusaku) Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/client_summary.hbs Removed: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/dashboard.js Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/hosts/hosts.json incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/charts/heatmap.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/host/add_controller.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service/add_controller.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step10_controller.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js incubator/ambari/branches/AMBARI-666/ambari-web/app/data/review_configs.js incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/hosts_mapper.js incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host_component.js incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_host_routes.js incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_service_routes.js incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/apps.less incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/common/chart/linear_time.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/admin/user/edit.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/apps_view.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/host.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/menu.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/item.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/controls_view.js incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step9_view.js incubator/ambari/branches/AMBARI-666/ambari-web/pom.xml Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/hosts/hosts.json URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/hosts/hosts.json?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/hosts/hosts.json (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/assets/data/hosts/hosts.json Sun Dec 9 14:11:19 2012 @@ -14,6 +14,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -88,7 +93,11 @@ "host_name" : "dev2.hortonworks.com", "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, - "os_type" : "centos6", + "os_type" : "centos6","load" : { + "load_fifteen" : 9.13213888889, + "load_five" : 8.68588888889 + }, + "ip" : "10.0.2.15" }, "host_components" : [ @@ -164,6 +173,10 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -238,6 +251,10 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -304,6 +321,9 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -370,6 +390,9 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -436,6 +459,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -502,6 +530,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -568,6 +601,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -634,6 +672,10 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -700,6 +742,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -766,6 +813,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ @@ -832,6 +884,11 @@ "disk_info" : "[{\"available\":\"47295056\",\"mountpoint\":\"/\",\"used\":\"3786948\",\"percent\":\"8%\",\"size\":\"51606140\",\"type\":\"ext4\"},{\"available\":\"1542800\",\"mountpoint\":\"/dev/shm\",\"used\":\"248\",\"percent\":\"1%\",\"size\":\"1543048\",\"type\":\"tmpfs\"},{\"available\":\"432210\",\"mountpoint\":\"/boot\",\"used\":\"38034\",\"percent\":\"9%\",\"size\":\"495844\",\"type\":\"ext4\"},{\"available\":\"44459872\",\"mountpoint\":\"/home\",\"used\":\"184220\",\"percent\":\"1%\",\"size\":\"47033288\",\"type\":\"ext4\"},{\"available\":\"902105496\",\"mountpoint\":\"/media/sf_ambari\",\"used\":\"74551908\",\"percent\":\"8%\",\"size\":\"976657404\",\"type\":\"vboxsf\"}]", "last_heartbeat_time" : 1352461939047, "os_type" : "centos6", + "load" : { + "load_fifteen" : 9.13213888889, + "load_one" : 8.24583333333, + "load_five" : 8.68588888889 + }, "ip" : "10.0.2.15" }, "host_components" : [ Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers.js Sun Dec 9 14:11:19 2012 @@ -42,7 +42,6 @@ require('controllers/main/alert'); require('controllers/main/host'); require('controllers/main/host/details'); require('controllers/main/host/add_controller'); -require('controllers/main/dashboard'); require('controllers/main/charts'); require('controllers/main/charts/heatmap_metrics/heatmap_metric'); require('controllers/main/charts/heatmap_metrics/heatmap_metric_processrun'); Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/global/cluster_controller.js Sun Dec 9 14:11:19 2012 @@ -97,8 +97,7 @@ App.ClusterController = Em.Controller.ex if (nagiosSvcComponent) { var hostName = nagiosSvcComponent.get('host.hostName'); if (hostName) { - return null; - //return "http://"+hostName+"/nagios"; + return "http://"+hostName+"/nagios"; } } } @@ -198,7 +197,7 @@ App.ClusterController = Em.Controller.ex console.log('update finished') setTimeout(function(){ self.updateStatus(); - }, 1000); + }, 3000); } }, null); }, @@ -370,7 +369,7 @@ App.ClusterController = Em.Controller.ex setTimeout(function(){ self.updateStatus(); - }, 1000); + }, 8000); }, Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/installer.js Sun Dec 9 14:11:19 2012 @@ -772,7 +772,11 @@ App.InstallerController = Em.Controller. * Generate clients list for selected services and save it to model * called form stepController step8WizardController or step9WizardController */ - installServices: function () { + installServices: function (isRetry) { + if(!isRetry && this.get('content.cluster.requestId')){ + return; + } + var self = this; var clusterName = this.get('content.cluster.name'); var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT'; Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/charts/heatmap.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/charts/heatmap.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/charts/heatmap.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/charts/heatmap.js Sun Dec 9 14:11:19 2012 @@ -27,7 +27,13 @@ App.MainChartsHeatmapController = Em.Con }) ], selectedMetric: null, - + /** + * route on host detail page + * @param event + */ + routeHostDetail: function(event){ + App.router.transitionTo('main.hostDetails.summary', event.context) + }, showHeatMapMetric: function (event) { var metricItem = event.context; if (metricItem) { Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/host/add_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/host/add_controller.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/host/add_controller.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/host/add_controller.js Sun Dec 9 14:11:19 2012 @@ -199,6 +199,17 @@ App.AddHostController = Em.Controller.ex }, /** + * save status of the cluster. This is called from step8 and step9 to persist install and start requestId + * @param clusterStatus object with status, isCompleted, requestId, isInstallError and isStartError field. + */ + saveClusterStatus: function (clusterStatus) { + clusterStatus.name = this.get('content.cluster.name'); + this.set('content.cluster', clusterStatus); + console.log('called saveClusterStatus ' + JSON.stringify(clusterStatus)); + App.db.setClusterStatus(clusterStatus); + }, + + /** * Temporary function for wizardStep9, before back-end integration */ setInfoForStep9: function () { @@ -728,7 +739,11 @@ App.AddHostController = Em.Controller.ex * Generate clients list for selected services and save it to model * @param stepController step8WizardController or step9WizardController */ - installServices: function () { + installServices: function (isRetry) { + if(!isRetry && this.get('content.cluster.requestId')){ + return; + } + var self = this; var clusterName = this.get('content.cluster.name'); var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT'; @@ -757,7 +772,7 @@ App.AddHostController = Em.Controller.ex isCompleted: false, installStartTime: installSartTime }; - //self.saveClusterStatus(clusterStatus); + self.saveClusterStatus(clusterStatus); } else { console.log('ERROR: Error occurred in parsing JSON data'); } @@ -773,7 +788,7 @@ App.AddHostController = Em.Controller.ex isInstallError: true, isCompleted: false }; - //self.saveClusterStatus(clusterStatus); + self.saveClusterStatus(clusterStatus); }, statusCode: require('data/statusCodes') Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service.js Sun Dec 9 14:11:19 2012 @@ -20,5 +20,6 @@ var App = require('app'); App.MainServiceController = Em.ArrayController.extend({ name:'mainServiceController', - content: App.Service.find() + content: App.Service.find(), + additionalMenuItem:Em.Object.create({ id:'Clients', displayName:'Clients', isClients:true }) }) \ No newline at end of file Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service/add_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service/add_controller.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service/add_controller.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/main/service/add_controller.js Sun Dec 9 14:11:19 2012 @@ -287,7 +287,11 @@ App.AddServiceController = Em.Controller }); this.set('content.services', servicesInfo); console.log('AddServiceController.loadServices: loaded data ', servicesInfo); - console.log('selected services ', servicesInfo.filterProperty('isSelected', true).filterProperty('isDisabled', false).mapProperty('serviceName')); + + var serviceNames = servicesInfo.filterProperty('isSelected', true).filterProperty('isDisabled', false).mapProperty('serviceName'); + console.log('selected services ', serviceNames); + + this.set('content.missSlavesStep', !serviceNames.contains('MAPREDUCE') && !serviceNames.contains('HBASE')); }, /** @@ -304,6 +308,8 @@ App.AddServiceController = Em.Controller this.set('content.selectedServiceNames', serviceNames); App.db.setSelectedServiceNames(serviceNames); console.log('AddServiceController.selectedServiceNames:', serviceNames); + + this.set('content.missSlavesStep', !serviceNames.contains('MAPREDUCE') && !serviceNames.contains('HBASE')); }, /** @@ -328,6 +334,8 @@ App.AddServiceController = Em.Controller console.log("AddServiceController.saveMasterComponentHosts: saved hosts ", masterComponentHosts); App.db.setMasterComponentHosts(masterComponentHosts); this.set('content.masterComponentHosts', masterComponentHosts); + + this.set('content.missMasterStep', this.get('content.masterComponentHosts').everyProperty('isInstalled', true)); }, /** @@ -348,6 +356,8 @@ App.AddServiceController = Em.Controller } this.set("content.masterComponentHosts", masterComponentHosts); console.log("AddServiceController.loadMasterComponentHosts: loaded hosts ", masterComponentHosts); + + this.set('content.missMasterStep', this.get('content.masterComponentHosts').everyProperty('isInstalled', true)); }, /** @@ -556,12 +566,16 @@ App.AddServiceController = Em.Controller dataLoading: function(){ var dfd = $.Deferred(); this.connectOutlet('loading'); - var interval = setInterval(function(){ - if (App.router.get('clusterController.isLoaded')){ - dfd.resolve(); - clearInterval(interval); - } - },50); + if (App.router.get('clusterController.isLoaded')){ + dfd.resolve(); + } else{ + var interval = setInterval(function(){ + if (App.router.get('clusterController.isLoaded')){ + dfd.resolve(); + clearInterval(interval); + } + },50); + } return dfd.promise(); }, /** @@ -666,7 +680,11 @@ App.AddServiceController = Em.Controller * Generate clients list for selected services and save it to model * @param stepController step8WizardController or step9WizardController */ - installServices: function () { + installServices: function (isRetry) { + if(!isRetry && this.get('content.cluster.requestId')){ + return; + } + var self = this; var clusterName = this.get('content.cluster.name'); var url = (App.testMode) ? '/data/wizard/deploy/poll_1.json' : App.apiPrefix + '/clusters/' + clusterName + '/services?state=INIT'; Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step10_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step10_controller.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step10_controller.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step10_controller.js Sun Dec 9 14:11:19 2012 @@ -275,7 +275,7 @@ App.WizardStep10Controller = Em.Controll loadOozieServer: function (component) { if (component.get('hostName')) { - var statement = 'Hive Metastore installed on ' + component.get('hostName'); + var statement = 'Oozie Server installed on ' + component.get('hostName'); this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({ id: 1, color: 'text-info', Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step6_controller.js Sun Dec 9 14:11:19 2012 @@ -152,6 +152,10 @@ App.WizardStep6Controller = Em.Controlle console.log("WizardStep6Controller: Loading step6: Assign Slaves"); this.clearStep(); this.renderSlaveHosts(); + + if(this.get('content.missSlavesStep')){ + App.router.send('next'); + } }, /** Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step8_controller.js Sun Dec 9 14:11:19 2012 @@ -514,7 +514,8 @@ App.WizardStep8Controller = Em.Controlle this.loadOozieServerValue(_component); break; case 'Database': - this.loadOozieDbValue(_component); + // TODO: uncomment when ready to integrate with Oozie Database other than Derby + // this.loadOozieDbValue(_component); break; default: } @@ -600,13 +601,15 @@ App.WizardStep8Controller = Em.Controlle //return; } - this.createCluster(); - this.createSelectedServices(); - this.createConfigurations(); - this.applyCreatedConfToServices(); - this.createComponents(); - this.registerHostsToCluster(); - this.createHostComponents(); + if(!this.get('content.cluster.requestId')){ + this.createCluster(); + this.createSelectedServices(); + this.createConfigurations(); + this.applyCreatedConfToServices(); + this.createComponents(); + this.registerHostsToCluster(); + this.createHostComponents(); + } App.router.send('next'); }, Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/controllers/wizard/step9_controller.js Sun Dec 9 14:11:19 2012 @@ -43,6 +43,10 @@ App.WizardStep9Controller = Em.Controlle } }.property('hosts.@each.status'), + showRetry: function(){ + return this.get('status') == 'failed'; + }.property('status'), + navigateStep: function () { if (this.get('content.cluster.isCompleted') === false) { this.loadStep(); Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/config_properties.js Sun Dec 9 14:11:19 2012 @@ -1874,6 +1874,7 @@ module.exports = "serviceName": "OOZIE", "category": "Oozie Server" }, + /* { "id": "puppet var", "name": "oozie_database", @@ -1947,7 +1948,6 @@ module.exports = "serviceName": "OOZIE", "category": "Oozie Server" }, - { "id": "puppet var", "name": "oozie_database_name", @@ -1984,6 +1984,7 @@ module.exports = "serviceName": "OOZIE", "category": "Oozie Server" }, + */ { "id": "puppet var", "name": "oozie_data_dir", @@ -2021,18 +2022,6 @@ module.exports = "serviceName": "OOZIE", "category": "Advanced" }, - /*{ - "id": "puppet var", - "name": "oozie-site.xml", - "displayName": "Custom Oozie Configs", - "description": "If you wish to set configuration parameters not exposed through this page, you can specify them here.
The text you specify here will be injected into oozie-site.xml verbatim.", - "defaultValue": "", - "isRequired": false, - "displayType": "custom", - "isVisible": true, - "serviceName": "OOZIE", - "category": "Advanced" - },*/ { "id": "puppet var", "name": "zookeeperserver_hosts", Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/data/review_configs.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/data/review_configs.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/data/review_configs.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/data/review_configs.js Sun Dec 9 14:11:19 2012 @@ -114,11 +114,12 @@ module.exports = [ Ember.Object.create({ display_name: 'Server', component_value: '' - }), - Ember.Object.create({ - display_name: 'Database', - component_value: '' }) + // TODO: uncomment when ready to integrate with database other than Derby + // Ember.Object.create({ + // display_name: 'Database', + // component_value: '' + // }) ] }), Ember.Object.create({ Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/hosts_mapper.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/hosts_mapper.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/hosts_mapper.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/hosts_mapper.js Sun Dec 9 14:11:19 2012 @@ -39,7 +39,9 @@ App.hostsMapper = App.QuickDataMapper.cr disk_info: 'Hosts.disk_info', $disk_usage: '-', health_status: 'Hosts.host_status', - $load_avg: '-', + load_one: 'Hosts.load.load_one', + load_five: 'Hosts.load.load_five', + load_fifteen: 'Hosts.load.load_fifteen', $cpu_usage: 33, $memory_usage: 26, $network_usage: 36, @@ -53,7 +55,6 @@ App.hostsMapper = App.QuickDataMapper.cr if (!this.get('model')) { return; } - if (json.items) { var result = []; Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/users_mapper.js Sun Dec 9 14:11:19 2012 @@ -22,6 +22,6 @@ App.usersMapper = App.QuickDataMapper.cr config : { user_name : 'Users.user_name', roles : 'Users.roles', - type: 'Users.type' + is_ldap: 'Users.ldap_user' } }); Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/messages.js Sun Dec 9 14:11:19 2012 @@ -231,6 +231,7 @@ Em.I18n.translations = { 'services.service.summary.averageLoad':'Average Load', 'services.service.summary.masterHeap':'Master Heap', 'services.service.summary.moreStats':'more stats here', + 'services.service.summary.clientCount': '{0} Client Hosts', 'services.service.actions.run.rebalancer':'Run Rebalancer', 'services.service.actions.run.compaction':'Run Compaction', 'services.service.actions.run.smoke':'Run Smoke Test', @@ -351,5 +352,6 @@ Em.I18n.translations = { 'timeRange.presets.1month':'1mo', 'timeRange.presets.1year':'1yr', - 'apps.filters.customRunDate':'Run Date custom filter' + 'apps.filters.customRunDate':'Run Date custom filter', + 'apps.dagCharts.popup':'DAG/Charts' }; \ No newline at end of file Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js Sun Dec 9 14:11:19 2012 @@ -28,7 +28,6 @@ App.Host = DS.Model.extend({ cpu: DS.attr('string'), memory: DS.attr('string'), diskUsage: DS.attr('string'), - loadAvg: DS.attr('string'), osArch: DS.attr('string'), ip: DS.attr('string'), rack: DS.attr('string'), @@ -40,6 +39,9 @@ App.Host = DS.Model.extend({ lastHeartBeatTime: DS.attr('number'), osType: DS.attr("string"), diskInfo: DS.attr('string'), + loadOne:DS.attr('number'), + loadFive:DS.attr('number'), + loadFifteen:DS.attr('number'), /** @@ -55,6 +57,13 @@ App.Host = DS.Model.extend({ return ((new Date()).getTime() - this.get('lastHeartBeatTime')) > 180 * 1000; }.property('lastHeartBeatTime'), + loadAvg: function() { + console.log(this.get('loadOne'), this.get('loadFive'), this.get('loadFifteen')); + if (this.get('loadOne') != null) return this.get('loadOne'); + if (this.get('loadFive') != null) return this.get('loadFive'); + if (this.get('loadFifteen') != null) return this.get('loadFifteen'); + }.property('loadOne', 'loadFive', 'loadFifteen'), + updateHostStatus: function(){ /** Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host_component.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host_component.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host_component.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host_component.js Sun Dec 9 14:11:19 2012 @@ -23,7 +23,9 @@ App.HostComponent = DS.Model.extend({ componentName: DS.attr('string'), host: DS.belongsTo('App.Host'), service: DS.belongsTo('App.Service'), - + isClient:function () { + return Boolean(this.get('componentName').match(/_client/gi)); + }.property('componentName'), isRunning: function(){ return (this.get('workStatus') == 'STARTED' || this.get('workStatus') == 'STARTING'); }.property('workStatus'), Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js Sun Dec 9 14:11:19 2012 @@ -55,7 +55,37 @@ App.Service = DS.Model.extend({ var components = this.get('components').filterProperty('isMaster', true); return components.everyProperty('workStatus', App.Component.Status.started); }.property('components.@each.workStatus'), - + isMaintained: function(){ + var maintainedServices = [ + "HDFS", + "MAPREDUCE", + "HBASE", + "OOZIE", + "HIVE", + "ZOOKEEPER", + "PIG", + "SQOOP" + ]; + for(var i in maintainedServices){ + if(this.get('serviceName') == maintainedServices[i]) return true; + } + }.property('serviceName'), + isConfigurable:function(){ + var configurableServices = [ + "HDFS", + "MAPREDUCE", + "HBASE", + "OOZIE", + "HIVE", + "ZOOKEEPER", + "PIG", + "SQOOP", + "NAGIOS" + ]; + for(var i in configurableServices){ + if(this.get('serviceName') == configurableServices[i]) return true; + } + }.property('serviceName'), displayName: function () { switch (this.get('serviceName').toLowerCase()) { case 'hdfs': Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/user.js Sun Dec 9 14:11:19 2012 @@ -27,7 +27,13 @@ App.UserModel = Em.Object.extend({ App.User = DS.Model.extend({ userName:DS.attr('string'), roles:DS.attr('string'), - type:DS.attr('string'), + isLdap:DS.attr('boolean'), + type: function(){ + if(this.get('isLdap')){ + return 'LDAP'; + } + return 'Local'; + }.property('isLdap'), auditItems:DS.hasMany('App.ServiceAudit'), admin:function () { return !!(/^admin/.test(this.get('roles'))) @@ -45,7 +51,8 @@ App.EditUserForm = App.Form.extend({ { name:"old_password", displayName:"Old Password", displayType:"password", isRequired: function(){ return this.get('form.isObjectNew'); }.property('form.isObjectNew') }, { name:"new_password", displayName:"New Password", displayType:"password", isRequired: false }, { name:"admin", displayName:"Admin", displayType:"checkbox", isRequired:false }, - { name:"roles", displayName:"Role", isRequired:false, isHidden:true } + { name:"roles", displayName:"Role", isRequired:false, isHidden:true }, + { name:"isLdap", displayName:"Type", isRequired:false, isHidden:true } ], fields:[], disableUsername:function () { Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_host_routes.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_host_routes.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_host_routes.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_host_routes.js Sun Dec 9 14:11:19 2012 @@ -209,8 +209,11 @@ module.exports = Em.Route.extend({ retry: function(router,context) { var addHostController = router.get('addHostController'); var wizardStep9Controller = router.get('wizardStep9Controller'); - addHostController.installServices(); - wizardStep9Controller.navigateStep(); + if (!wizardStep9Controller.get('isSubmitDisabled')) { + addHostController.installServices(true); + addHostController.setInfoForStep9(); + wizardStep9Controller.navigateStep(); + } }, next: function (router) { var addHostController = router.get('addHostController'); Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_service_routes.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_service_routes.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_service_routes.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/add_service_routes.js Sun Dec 9 14:11:19 2012 @@ -92,7 +92,7 @@ module.exports = Em.Route.extend({ }, back: function(router){ var controller = router.get('addServiceController'); - if(controller.get('content.masterComponentHosts').someProperty('isInstalled', false)){ + if(!controller.get('content.missMasterStep')){ router.transitionTo('step2'); } else { router.transitionTo('step1'); @@ -123,7 +123,16 @@ module.exports = Em.Route.extend({ controller.connectOutlet('wizardStep7', controller.get('content')); }) }, - back: Em.Router.transitionTo('step3'), + back: function(router){ + var controller = router.get('addServiceController'); + if(!controller.get('content.missSlavesStep')){ + router.transitionTo('step3'); + } else if(!controller.get('content.missMasterStep')) { + router.transitionTo('step2'); + } else { + router.transitionTo('step1'); + } + }, next: function (router) { var addServiceController = router.get('addServiceController'); var wizardStep7Controller = router.get('wizardStep7Controller'); @@ -169,7 +178,7 @@ module.exports = Em.Route.extend({ var addServiceController = router.get('addServiceController'); var wizardStep9Controller = router.get('wizardStep9Controller'); if (!wizardStep9Controller.get('isSubmitDisabled')) { - addServiceController.installServices(); + addServiceController.installServices(true); addServiceController.setInfoForStep9(); wizardStep9Controller.navigateStep(); } Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/installer.js Sun Dec 9 14:11:19 2012 @@ -271,7 +271,7 @@ module.exports = Em.Route.extend({ var installerController = router.get('installerController'); var wizardStep9Controller = router.get('wizardStep9Controller'); if (!wizardStep9Controller.get('isSubmitDisabled')) { - installerController.installServices(); + installerController.installServices(true); installerController.setInfoForStep9(); wizardStep9Controller.navigateStep(); } Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js Sun Dec 9 14:11:19 2012 @@ -97,7 +97,7 @@ module.exports = Em.Route.extend({ showDetails:function (router, event) { router.get('mainHostDetailsController').setBack(true); - router.transitionTo('hostDetails.summary', event.context) + router.transitionTo('hostDetails.index', event.context) }, addHost:function (router) { @@ -279,6 +279,9 @@ module.exports = Em.Route.extend({ service:Em.Route.extend({ route:'/:service_id', connectOutlets:function (router, service) { + if (service && service.get('id') == 'Clients') { + service = App.router.get('mainServiceController.additionalMenuItem'); + } router.get('mainServiceController').connectOutlet('mainServiceItem', service); router.transitionTo('summary'); }, @@ -289,6 +292,7 @@ module.exports = Em.Route.extend({ route:'/summary', connectOutlets:function (router, context) { var item = router.get('mainServiceItemController.content'); + var viewName = 'mainServiceInfoSummary'; router.get('mainServiceItemController').connectOutlet('mainServiceInfoSummary', item); } }), Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less Sun Dec 9 14:11:19 2012 @@ -643,6 +643,12 @@ a:focus { margin-top: 4px; } +.modal-graph-line { + .modal-body { + min-height: 320px !important; + } +} + /*end alerts summary*/ /*start chart/style graphs*/ @@ -1499,7 +1505,8 @@ ul.filter { } h4{ - color: #777; + color: #777777; + margin-top: 5px; } } Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/apps.less URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/apps.less?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/apps.less (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/apps.less Sun Dec 9 14:11:19 2012 @@ -214,3 +214,127 @@ -moz-border-radius: 4px; } +/*Big modal window*/ +.big-modal { + .modal { + width: 1150px; + margin: -350px 0 0 -575px; + } + + .clear { + clear:both; + } + > div > .dataTable { + border: 1px solid silver; + th { + border-top:none; + } + } + .content { + padding: 0; + } + + .page-bar { + border: 1px solid silver; + text-align:right; + div { + display: inline-block; + margin:0 10px; + } + .dataTables_length { + label { + display:inline; + } + select { + margin-bottom: 4px; + margin-top: 4px; + width:70px; + } + } + .dataTables_paginate { + a { + padding:0 5px; + } + } + } + + #graph1 { + margin-left: 30px; + width: 440px; + #legend_container { + margin: 40px 0 0 20px; + } + } + + #graph2 { + margin-right: 30px; + width: 500px; + #tasks_legend_container { + margin: 40px 0 0 20px; + } + } + + ul.nav-tabs{ + margin-bottom: 0; + } + + #jobs, #bars{ + border: 1px solid #ddd; + border-top: none; + background: #fff; + padding: 10px; + box-sizing: border-box; + width: auto; + } + + #jobs h2{ + margin-top: 0; + } +//fix stripped in inner table + .table-striped tbody tr:nth-child(odd) + td .table-striped tbody + tr:nth-child(odd) td, + tr:nth-child(even) th{ + background-color: none; + } + + .sorting_asc { background: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/bAIQAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAwMDAwMDAwMDAwEBAQEBAQECAQECAgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgAEwATAwERAAIRAQMRAf/EAHgAAAMBAQAAAAAAAAAAAAAAAAAFCAYKAQACAQUAAAAAAAAAAAAAAAAABQMCBAYHCBAAAQUAAQMEAwAAAAAAAAAAAwECBAUGABESByExIghBMxQRAAIBAwMDAwUAAAAAAAAAAAECAwAEBRESBiExUUHhB2GBIhMU/9oADAMBAAIRAxEAPwDvA8k+Qc54sxGj32qlNi0ucrjTj/JqGlmROyJXQ2u/bOsZTmBExPd70/HXmQcW41lOX5+145h0L391KEHhR3Z28Ii6sx9AKgubiO1gaeU6Io19h9TUg/S/7eP+wia3NbBIFbuqiyn3VTCjIMArHHTJarEDGGiNU8vOKVsc7/VxBuGR3yV683X86/Cq/GpssrhP2S8emiSKRm1JS5VfyLH0WfQug7KwZR0CilWHy39++ObQTgkgeV9ux+xq9uc6U8pLfZzP6mClZpKWrvq1DilJAt4Mewh/0hRyBOsaUMoVKLvXtVU6t6+nL/HZTJYi4/rxU81tdbSu+N2Rtp7jcpB0OnUa9aoeOOVdsgDL4I1pFS+NPHmcsQ2+fw+UpLWOwwwWNVQ1kCaIcgaiONkmLGEZrDDXtcnXo5PfjC+5VybKWrWWSyF5cWbEEpJNI6kqdQSrMRqD1B9KjS2t423xoqt5AArb8 QVPRwoo4UUcKK//2Q==) no-repeat 85% 50%; } + .sorting_desc { background: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/bAIQAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAwMDAwMDAwMDAwEBAQEBAQECAQECAgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgAEwATAwERAAIRAQMRAf/EAIEAAAIDAQAAAAAAAAAAAAAAAAAGBwgJCgEBAAIDAQAAAAAAAAAAAAAAAAMFBAYHCBAAAAUDAwMFAAAAAAAAAAAAAQIDBAUABgcSNTYRFQgTZFUWZhEAAAQEAggGAwAAAAAAAAAAAAECAxEhBAYSMjFBYRMzFDQFUZFSYmMHJFRk/9oADAMBAAIRAxEAPwDv4oAKACgCKc1tMmusb3Eph6cSgsgx7fucEZxGRks2llGIGVWgVm8q1dt0+6ogKaapSgdNbQPXTqAdwsN602bopk3vTnUW24rduwccbU2S5E8Sm1JM92czSZwNOKUYDFrCqTp1corDUFMpEcYap+Ipb4P5O8n81y9xXXlG50yY+thR3AEivqFvRDmduvSUrhuLtrFNXqCFvJm1LAQ5RMuchB6gBy13f7+tP6lsOipuz2jSGdy1ZJeNzmXnEtU+pWFTikmbxyTEjgglKKZpMU3ZanudYtTtSr8dMoYSKKvKMte0aUV5YGxgoASbD2iQ4Tyi6uB7Rvz/AHD9R8r7/wBWr64uta6/pKfq+JwUZP5/1/hwCFjIeTMrLo0np93q2xDtVCJh/9k=) no-repeat 85% 50%; } + .sorting { background: url(data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAZAAA/+4ADkFkb2JlAGTAAAAAAf/bAIQAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQICAgICAgICAgICAwMDAwMDAwMDAwEBAQEBAQECAQECAgIBAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD/8AAEQgAEwATAwERAAIRAQMRAf/EAGgAAAIDAQAAAAAAAAAAAAAAAAUHAAYICgEBAQAAAAAAAAAAAAAAAAAAAAEQAAEEAQIFAgcAAAAAAAAAAAECAwQFABEGIRI0NQcTFDFBMmNUZRYRAQEBAQAAAAAAAAAAAAAAAAABEUH/2gAMAwEAAhEDEQA/AO93cd/XbXpLC9tHQ1Dr46nljUBby/gzGZB+p+Q6QhA+ZOApfDnllW/ha1tv6Ee7iyH5kRlvlbTIqHndWkNJ0HO7XFQbWeJUkpUeOpySrZh65UUnyFUW1ztaexRmIbaPyzoLE6vg2UWW9GC1e0XHnsSGEqfQohCwApK9OIGuAjfBP9VuG0m39vGqINVUe4r2xF21TVsuXZOI9N9lMmLBYkttQ21auBKhqtSUngCMkW5xqjKiYASh6SR2Tulr2HpOvf6j9p+V9/mwDeB//9k=) no-repeat 85% 50%; } + + a.paginate_disabled_next, a.paginate_disabled_previous { + color: gray; + &:hover { + color: gray; + text-decoration: none; + } + } + + a.paginate_enabled_next, a.paginate_enabled_previous { + &:hover { + text-decoration: none; + } + } + + div.view-wrapper { + float: left; + } + + a.ui-icon-circle-close { + float: right; + opacity: 0.2; + padding: 1px; + position: relative; + top: -32px; + &:hover { + opacity: 0.7; + } + } + .notActive { + a.ui-icon-circle-close { + visibility: hidden; + } + } +} + +/*Big modal window end*/ \ No newline at end of file Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs Sun Dec 9 14:11:19 2012 @@ -44,8 +44,11 @@
{{#each rack.hosts}} +
{{view App.MainChartsHeatmapHostView contentBinding="this"}}
+ {{/each}} +
\ No newline at end of file Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/linear_time.hbs Sun Dec 9 14:11:19 2012 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -
+
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard.hbs Sun Dec 9 14:11:19 2012 @@ -60,60 +60,5 @@
-
-
-

Alerts

-
- - - -
-
-
    - {{#if controller.displayAlerts.length}} - {{#each controller.displayAlerts}} -
  • -
    -
    -
    - {{#if isOk}} - - {{else}} - - {{/if}} -
    -
    -
    -
    {{title}} - {{#if serviceLink}} - {{serviceName}} - {{/if}} -
    -
    {{dateDisplay}}
    -
    -
    {{message}}
    -
    -
    -
    -
    • - {{/each}} - {{else}} - {{#if controller.isNagiosInstalled}} -
    - No alerts -
    - {{else}} -
    - Nagios service required for viewing alerts -
    - {{/if}} - {{/if}} -
-
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hbase.hbs Sun Dec 9 14:11:19 2012 @@ -22,7 +22,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} {{view.service.displayName}} {{#if view.criticalAlertsCount}} - {{view.criticalAlertsCount}} + {{view.criticalAlertsCount}} {{/if}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hdfs.hbs Sun Dec 9 14:11:19 2012 @@ -22,7 +22,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} {{view.service.displayName}} {{#if view.criticalAlertsCount}} - {{view.criticalAlertsCount}} + {{view.criticalAlertsCount}} {{/if}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/hive.hbs Sun Dec 9 14:11:19 2012 @@ -21,7 +21,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} {{view.service.displayName}} {{#if view.criticalAlertsCount}} - {{view.criticalAlertsCount}} + {{view.criticalAlertsCount}} {{/if}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs Sun Dec 9 14:11:19 2012 @@ -22,7 +22,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} {{view.service.displayName}} {{#if view.criticalAlertsCount}} - {{view.criticalAlertsCount}} + {{view.criticalAlertsCount}} {{/if}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/oozie.hbs Sun Dec 9 14:11:19 2012 @@ -21,7 +21,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} {{view.service.displayName}} {{#if view.criticalAlertsCount}} - {{view.criticalAlertsCount}} + {{view.criticalAlertsCount}} {{/if}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/dashboard/service/zookeeper.hbs Sun Dec 9 14:11:19 2012 @@ -21,7 +21,7 @@ {{view App.MainDashboardServiceHealthView serviceBinding="view.service"}} {{view.service.displayName}} {{#if view.criticalAlertsCount}} - {{view.criticalAlertsCount}} + {{view.criticalAlertsCount}} {{/if}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/host.hbs Sun Dec 9 14:11:19 2012 @@ -41,7 +41,7 @@
{{view view.cpuFilterView viewName="cpuFilterViewInstance"}}
{{view view.ramFilterView viewName="ramFilterViewInstance"}}
- +
{{view view.loadAvgFilterView viewName="loadAvgFilterViewInstance"}}
{{view view.componentsFilterView viewName="componentsFilterViewInstance"}}
Added: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/client_summary.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/client_summary.hbs?rev=1418965&view=auto ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/client_summary.hbs (added) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/info/client_summary.hbs Sun Dec 9 14:11:19 2012 @@ -0,0 +1,111 @@ +{{! +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +}} + +
+
+ {{#if view.service.quickLinks.length}} + {{#view App.QuickViewLinks contentBinding="view.service"}} + + {{/view}} + {{/if}} + +
+
+

{{controller.content.label}} Summary

+
+
+ + + + {{#if controller.content.isClients}} + + + + + {{#if view.clientComponentsString}} + + + + {{/if}} + {{/if}} + +
Client Hosts{{view.clientHostsLength}}
+ {{view.clientComponentsString}} +
+
+
+
+
+
+
+

Alerts

+ +
+ +
+
+
    + {{#if controller.alerts.length}} + {{#each controller.alerts}} +
  • +
    +
    +
    + {{#if isOk}} + + {{else}} + + {{/if}} +
    +
    +
    +
    {{title}} +
    +
    {{dateDisplay}}
    +
    +
    {{message}}
    +
    +
    +
    +
    • + {{/each}} + {{else}} + {{#if controller.isNagiosInstalled}} +
    + No alerts +
    + {{else}} +
    + Nagios service required for viewing alerts +
    + {{/if}} + {{/if}} +
+
+
+
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/item.hbs Sun Dec 9 14:11:19 2012 @@ -16,8 +16,10 @@ * limitations under the License. }} -{{view App.MainServiceInfoMenuView}} +{{view App.MainServiceInfoMenuView configTabBinding="view.hasConfigTab"}} +{{#unless controller.content.isClients}}
+ {{#if view.hasMaintenanceControl}}
{{t services.service.actions.maintenance}} @@ -32,6 +34,7 @@ {{/each}}
+ {{/if}} @@ -43,4 +46,5 @@ Stop
+{{/unless}} {{outlet}} \ No newline at end of file Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/service/menu_item.hbs Sun Dec 9 14:11:19 2012 @@ -17,7 +17,11 @@ }} - {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}} {{unbound view.content.displayName}} + {{#if view.content.isClients}} + {{else}} + {{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}}  + {{/if}} + {{unbound view.content.displayName}} {{#if view.alertsCount}} {{view.alertsCount}} Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step7.hbs Sun Dec 9 14:11:19 2012 @@ -121,7 +121,7 @@ {{/if}}
- ← Back + ← Back Next → Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/wizard/step9.hbs Sun Dec 9 14:11:19 2012 @@ -39,10 +39,12 @@
+ {{#if controller.showRetry}} Retry + {{/if}} {{#if App.testMode}} mockData Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/utils/data_table.js Sun Dec 9 14:11:19 2012 @@ -20,7 +20,7 @@ jQuery.extend(jQuery.fn.dataTableExt.oSo "num-html-pre": function(date_string) { date_string = $(date_string).text(); - return parseInt(date_string, 10); + return parseFloat(date_string, 10); }, "num-html-asc": function (a, b) { @@ -156,6 +156,7 @@ jQuery.extend($.fn.dataTableExt.afnFilte var inputFilters = [ {iColumn: '0', elementId: 'star_filter', type: 'star'}, {iColumn: '2', elementId: 'cpu_filter', type: 'number'}, + {iColumn: '5', elementId: 'load_avg_filter', type: 'number'}, {iColumn: '4', elementId: 'user_filter', type: 'multiple'}, {iColumn: '6', elementId: 'components_filter', type: 'multiple'}, {iColumn: '5', elementId: 'jobs_filter', type: 'number' }, @@ -350,7 +351,7 @@ jQuery.extend($.fn.dataTableExt.afnFilte function numberFilter(rangeExp, rowValue) { var compareChar = rangeExp.charAt(0); - var compareValue = parseInt(rangeExp.substr(1, rangeExp.length - 1)); + var compareValue = parseFloat(rangeExp.substr(1, rangeExp.length - 1)); rowValue = (jQuery(rowValue).text()) ? jQuery(rowValue).text() : rowValue; match = false; switch (compareChar) { Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/common/chart/linear_time.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/common/chart/linear_time.js?rev=1418965&r1=1418964&r2=1418965&view=diff ============================================================================== --- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/common/chart/linear_time.js (original) +++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/common/chart/linear_time.js Sun Dec 9 14:11:19 2012 @@ -81,6 +81,10 @@ App.ChartLinearTimeView = Ember.View.ext */ _graph: null, + popupSuffix: '-popup', + + isPopup: false, + /** * Color palette used for this chart * @@ -103,6 +107,10 @@ App.ChartLinearTimeView = Ember.View.ext didInsertElement: function () { this._super(); + this.loadData(); + }, + + loadData: function() { var validUrl = this.get('url'); if (validUrl) { var hash = {}; @@ -129,6 +137,9 @@ App.ChartLinearTimeView = Ember.View.ext */ _showMessage: function(type, title, message){ var chartOverlayId = '#' + this.id + '-chart'; + if (this.get('isPopup')) { + chartOverlayId += this.get('popupSuffix'); + } var typeClass; switch (type) { case 'error': @@ -209,6 +220,41 @@ App.ChartLinearTimeView = Ember.View.ext _refreshGraph: function (jsonData) { var seriesData = this.transformToSeries(jsonData); if (seriesData instanceof Array && seriesData.length>0) { + this.draw(seriesData); + } + else { + this._showMessage('info', 'No Data', 'There was no data available.'); + } + }, + + /** + * @private + * + * When a graph is given a particular width and height,the lines are drawn + * in a slightly bigger area thereby chopping off some of the UI. Hence + * after the rendering, we adjust the SVGs size in the DOM to compensate. + * + * Opened https://github.com/shutterstock/rickshaw/issues/141 + * + * @type Function + */ + _adjustSVGHeight: function () { + if (this._graph && this._graph.element + && this._graph.element.firstChild) { + var svgElement = this._graph.element.firstChild; + svgElement.setAttribute('height', $(this._graph.element).height() + + "px"); + svgElement.setAttribute('width', $(this._graph.element).width() + + "px"); + } + }, + + draw: function(seriesData) { + var isPopup = this.get('isPopup'); + var p = ''; + if (isPopup) { + p = this.get('popupSuffix'); + } var palette = new Rickshaw.Color.Palette({ scheme: this._paletteScheme }); @@ -216,19 +262,17 @@ App.ChartLinearTimeView = Ember.View.ext series.color = this.colorForSeries(series) || palette.color(); series.stroke = 'rgba(0,0,0,0.3)'; }.bind(this)); - - if (this._graph == null) { - var chartId = "#" + this.id + "-chart"; - var chartOverlayId = "#" + this.id + "-overlay"; - var xaxisElementId = "#" + this.id + "-xaxis"; - var yaxisElementId = "#" + this.id + "-yaxis"; - var legendElementId = "#" + this.id + "-legend"; + var chartId = "#" + this.id + "-chart" + p; + var chartOverlayId = "#" + this.id + "-overlay" + p; + var xaxisElementId = "#" + this.id + "-xaxis" + p; + var yaxisElementId = "#" + this.id + "-yaxis" + p; + var legendElementId = "#" + this.id + "-legend" + p; + var chartElement = document.querySelector(chartId); var overlayElement = document.querySelector(chartOverlayId); var xaxisElement = document.querySelector(xaxisElementId); var yaxisElement = document.querySelector(yaxisElementId); var legendElement = document.querySelector(legendElementId); - this._graph = new Rickshaw.Graph({ height: 150, element: chartElement, @@ -276,33 +320,44 @@ App.ChartLinearTimeView = Ember.View.ext // this._graph.onUpdate(jQuery.proxy(function () { // this._adjustSVGHeight(); // }, this)); - } - this._graph.render(); - }else{ - this._showMessage('info', 'No Data', 'There was no data available.'); - } + + this._graph.render(); + this._graph = null; + this.set('isPopup', false); }, - /** - * @private - * - * When a graph is given a particular width and height,the lines are drawn - * in a slightly bigger area thereby chopping off some of the UI. Hence - * after the rendering, we adjust the SVGs size in the DOM to compensate. - * - * Opened https://github.com/shutterstock/rickshaw/issues/141 - * - * @type Function - */ - _adjustSVGHeight: function () { - if (this._graph && this._graph.element - && this._graph.element.firstChild) { - var svgElement = this._graph.element.firstChild; - svgElement.setAttribute('height', $(this._graph.element).height() - + "px"); - svgElement.setAttribute('width', $(this._graph.element).width() - + "px"); - } + showGraphInPopup: function() { + this.set('isPopup', true); + App.ModalPopup.show({ + template: Ember.Handlebars.compile([ + '
' + ].join('\n')), + + header: this.get('title'), + primary: 'OK', + onPrimary: function() { + this.hide(); + } + }); + var self = this; + Ember.run.next(function() { + self.loadData(); + }); } });