Ambari 23193. Merge UI branch 'branch-feature-AMBARI-14714-ui' into 'branch-feature-AMBARI-14714'.

.gitignore

@@ -1,3 +1,4 @@
+.ignore
 .classpath
 .project
 .settings

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepoDefinitionEntity.java

@@ -37,6 +37,7 @@
 
 import org.apache.ambari.server.state.RepositoryInfo;
 import org.apache.ambari.server.state.stack.RepoTag;
+
 import com.google.common.base.Objects;
 
 /**

ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py

@@ -1,4 +1,4 @@
-"""
+  """
 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

ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/metainfo.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<!--
+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.
+-->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>ZEPPELIN</name>
+      <displayName>Zeppelin Notebook</displayName>
+      <comment>A web-based notebook that enables interactive data analytics. It enables you to
+        make beautiful data-driven, interactive and collaborative documents with SQL, Scala
+        and more.
+      </comment>
+      <version>0.6.0</version>
+      <components>
+        <component>
+          <name>ZEPPELIN_MASTER</name>
+          <displayName>Zeppelin Notebook</displayName>
+          <category>MASTER</category>
+          <cardinality>1</cardinality>
+          <versionAdvertised>true</versionAdvertised>
+          <commandScript>
+            <script>scripts/master.py</script>
+            <scriptType>PYTHON</scriptType>
+            <timeout>10000</timeout>
+          </commandScript>
+          <dependencies>
+            <dependency>
+              <name>SPARK/SPARK_CLIENT</name>
+              <scope>host</scope>
+              <auto-deploy>
+                <enabled>true</enabled>
+              </auto-deploy>
+            </dependency>
+            <dependency>
+              <name>YARN/YARN_CLIENT</name>
+              <scope>host</scope>
+              <auto-deploy>
+                <enabled>true</enabled>
+              </auto-deploy>
+            </dependency>
+          </dependencies>
+          <logs>
+            <log>
+              <logId>zeppelin</logId>
+              <primary>true</primary>
+            </log>
+          </logs>
+        </component>
+      </components>
+
+      <osSpecifics>
+        <osSpecific>
+          <osFamily>any</osFamily>
+          <packages>
+            <package>
+              <name>zeppelin</name>
+            </package>
+          </packages>
+        </osSpecific>
+      </osSpecifics>
+
+      <commandScript>
+        <script>scripts/service_check.py</script>
+        <scriptType>PYTHON</scriptType>
+        <timeout>300</timeout>
+      </commandScript>
+
+      <requiredServices>
+        <service>HDFS</service>
+      </requiredServices>
+
+      <configuration-dependencies>
+        <config-type>zeppelin-config</config-type>
+        <config-type>zeppelin-env</config-type>
+        <config-type>zeppelin-shiro-ini</config-type>
+        <config-type>zeppelin-log4j-properties</config-type>
+      </configuration-dependencies>
+      <restartRequiredAfterChange>true</restartRequiredAfterChange>
+
+      <quickLinksConfigurations>
+        <quickLinksConfiguration>
+          <fileName>quicklinks.json</fileName>
+          <default>true</default>
+        </quickLinksConfiguration>
+      </quickLinksConfigurations>
+    </service>
+  </services>
+</metainfo>

ambari-web/app/app.js

@@ -371,7 +371,8 @@ module.exports = Em.Application.create({
 
     addableMasterInstallerWizard: function () {
       return App.StackServiceComponent.find().filterProperty('isMasterAddableInstallerWizard').mapProperty('componentName')
-    }.property('App.router.clusterController.isLoaded'),
+    }.property(),
+    //.property('App.router.clusterController.isLoaded'),
 
     multipleMasters: function () {
       return App.StackServiceComponent.find().filterProperty('isMasterWithMultipleInstances').mapProperty('componentName')

ambari-web/app/assets/data/users/privileges_admin.json

@@ -3,11 +3,65 @@
   "items" : [
     {
       "href" : "http://c6401.ambari.apache.org:8080/api/v1/privileges/1",
-      "PrivilegeInfo" : {
+      "AuthorizationInfo" : {
         "permission_name" : "AMBARI.ADMINISTRATOR",
         "principal_name" : "admin",
         "principal_type" : "USER",
-        "privilege_id" : 1
+        "authorization_id" : "AMBARI.ADMINISTRATOR"
+      }
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/privileges/2",
+      "AuthorizationInfo" : {
+        "permission_name" : "CLUSTER.TOGGLE_KERBEROS",
+        "principal_name" : "admin",
+        "principal_type" : "USER",
+        "authorization_id" : "CLUSTER.TOGGLE_KERBEROS"
+      }
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/privileges/3",
+      "AuthorizationInfo" : {
+        "permission_name" : "CLUSTER.MODIFY_CONFIGS",
+        "principal_name" : "admin",
+        "principal_type" : "USER",
+        "authorization_id" : "CLUSTER.MODIFY_CONFIGS"
+      }
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/privileges/4",
+      "AuthorizationInfo" : {
+        "permission_name" : "SERVICE.START_STOP",
+        "principal_name" : "admin",
+        "principal_type" : "USER",
+        "authorization_id" : "SERVICE.START_STOP"
+      }
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/privileges/5",
+      "AuthorizationInfo" : {
+        "permission_name" : "SERVICE.SET_SERVICE_USERS_GROUPS",
+        "principal_name" : "admin",
+        "principal_type" : "USER",
+        "authorization_id" : "SERVICE.SET_SERVICE_USERS_GROUPS"
+      }
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/privileges/6",
+      "AuthorizationInfo" : {
+        "permission_name" : "CLUSTER.UPGRADE_DOWNGRADE_STACK",
+        "principal_name" : "admin",
+        "principal_type" : "USER",
+        "authorization_id" : "CLUSTER.UPGRADE_DOWNGRADE_STACK"
+      }
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/privileges/7",
+      "AuthorizationInfo" : {
+        "permission_name" : "CLUSTER.VIEW_STACK_DETAILS",
+        "principal_name" : "admin",
+        "principal_type" : "USER",
+        "authorization_id" : "CLUSTER.VIEW_STACK_DETAILS"
       }
     }
   ]

ambari-web/app/assets/index.html

@@ -29,10 +29,10 @@
   <script src="javascripts/app.js"></script>
   <script>
       $(document).ready(function() {
-          require('initialize');
-          // make favicon work in firefox
-          $('link[type*=icon]').detach().appendTo('head');
-          $('#loading').remove();
+        require('initialize');
+        // make favicon work in firefox
+        $('link[type*=icon]').detach().appendTo('head');
+        $('#loading').remove();
       });
   </script>
   <title>Ambari</title>

ambari-web/app/assets/test/tests.js

@@ -97,6 +97,13 @@ var files = [
   'test/controllers/main/admin/highAvailability/journalNode/step8_controller_test',
   'test/controllers/main/admin/highAvailability/journalNode/wizard_controller_test',
   'test/controllers/main/admin/highAvailability/rangerAdmin/step3_controller_test',
+  'test/controllers/main/admin/mpack_upgrade_controller_test',
+  'test/controllers/main/admin/mpackUpgrade/downloadOptions_controller_test',
+  'test/controllers/main/admin/mpackUpgrade/selectUpgradeOptions_controller_test',
+  'test/controllers/main/admin/mpackUpgrade/downloadMpacks_controller_test',
+  'test/controllers/main/admin/mpackUpgrade/reviewConfigs_controller_test',
+  'test/controllers/main/admin/mpackUpgrade/selectUpgradeType_controller_test',
+  'test/controllers/main/admin/mpackUpgrade/upgradeSummary_controller_test',
   'test/controllers/main/dashboard/config_history_controller_test',
   'test/controllers/main/charts/heatmap_test',
   'test/controllers/main/charts/heatmap_metrics/heatmap_metric_test',
@@ -135,6 +142,12 @@ var files = [
   'test/controllers/login_controller_test',
   'test/controllers/experimental_test',
   'test/controllers/wizard_test',
+  'test/controllers/wizard/configureDownload_test',
+  'test/controllers/wizard/selectMpacks_test',
+  'test/controllers/wizard/downloadMpacks_test',
+  'test/controllers/wizard/customProductRepos_test',
+  'test/controllers/wizard/verifyProducts_test',
+  'test/controllers/wizard/wizardStep_test',
   'test/controllers/wizard/step0_test',
   'test/controllers/wizard/step1_test',
   'test/controllers/wizard/step2_test',
@@ -246,6 +259,7 @@ var files = [
   'test/views/common/configs/widgets/list_config_widget_view_test',
   'test/views/common/configs/widgets/slider_config_widget_view_test',
   'test/views/common/configs/widgets/toggle_config_widget_view_test',
+  'test/views/common/helpers/format_date_view_test',
   'test/views/common/helpers/format_word_break_view_test',
   'test/views/common/ajax_default_error_popup_body_test',
   'test/views/common/filter_combo_cleanable_test',
@@ -257,6 +271,8 @@ var files = [
   'test/views/common/modal_popup_test',
   'test/views/common/sort_view_test',
   'test/views/common/progress_bar_view_test',
+  'test/views/common/dashrow_view_test',
+  'test/views/common/timeline_view_test',
   'test/views/common/select_custom_date_view_test',
   'test/views/common/widget/graph_widget_view_test',
   'test/views/common/widget/number_widget_view_test',
@@ -385,6 +401,9 @@ var files = [
   'test/views/wizard/step3/hostLogPopupBody_view_test',
   'test/views/wizard/step3/hostWarningPopupBody_view_test',
   'test/views/wizard/step3/hostWarningPopupFooter_view_test',
+  'test/views/wizard/configureDownload_view_test',
+  'test/views/wizard/customMpackRepos_view_test',
+  'test/views/wizard/customProductRepos_view_test',
   'test/views/wizard/step0_view_test',
   'test/views/wizard/step1_view_test',
   'test/views/wizard/step2_view_test',

ambari-web/app/controllers.js

@@ -86,6 +86,7 @@ require('controllers/main/admin/highAvailability/journalNode/step7_controller');
 require('controllers/main/admin/highAvailability/journalNode/step8_controller');
 require('controllers/main/admin/stack_and_upgrade_controller');
 require('controllers/main/admin/stack_upgrade_history_controller');
+require('controllers/main/admin/serviceGroups_controller');
 require('controllers/main/admin/serviceAccounts_controller');
 require('utils/polling');
 require('controllers/main/admin/kerberos');
@@ -100,6 +101,13 @@ require('controllers/main/admin/kerberos/step5_controller');
 require('controllers/main/admin/kerberos/step6_controller');
 require('controllers/main/admin/kerberos/step7_controller');
 require('controllers/main/admin/kerberos/step8_controller');
+require('controllers/main/admin/mpack_upgrade_controller');
+require('controllers/main/admin/mpackUpgrade/downloadOptions_controller');
+require('controllers/main/admin/mpackUpgrade/downloadMpacks_controller');
+require('controllers/main/admin/mpackUpgrade/selectUpgradeOptions_controller');
+require('controllers/main/admin/mpackUpgrade/reviewConfigs_controller');
+require('controllers/main/admin/mpackUpgrade/selectUpgradeType_controller');
+require('controllers/main/admin/mpackUpgrade/upgradeSummary_controller');
 require('controllers/main/alert_definitions_controller');
 require('controllers/main/alerts/alert_definitions_actions_controller');
 require('controllers/main/alerts/add_alert_definition/add_alert_definition_controller');
@@ -145,10 +153,17 @@ require('controllers/main/service/info/heatmap');
 require('controllers/main/service/info/metric');
 require('controllers/main/views_controller');
 require('controllers/main/views/details_controller');
+require('controllers/wizard/wizardStep_controller');
 require('controllers/wizard/step0_controller');
 require('controllers/wizard/step1_controller');
 require('controllers/wizard/step2_controller');
 require('controllers/wizard/step3_controller');
+require('controllers/wizard/configureDownload_controller');
+require('controllers/wizard/selectMpacks_controller');
+require('controllers/wizard/customMpackRepos_controller');
+require('controllers/wizard/downloadMpacks_controller');
+require('controllers/wizard/customProductRepos_controller');
+require('controllers/wizard/verifyProducts_controller');
 require('controllers/wizard/step4_controller');
 require('controllers/wizard/step5_controller');
 require('controllers/wizard/step6_controller');