AMBARI-7573. Slider View: Rename view parameters to shorter forms

contrib/views/slider/docs/index.md

@@ -71,7 +71,7 @@ Restart HDFS and YARN services.
 From *Ambari-Admin* create a *Slider Apps View* with the below parameters populated
 
 * slider.security.enabled = true
-* yarn.resourcemanager.principal = `rm/_HOST@EXAMPLE.COM`
+* yarn.rm.kerberos.principal = `rm/_HOST@EXAMPLE.COM`
 * dfs.namenode.kerberos.principal = `nn/_HOST@EXAMPLE.COM`
 * view.kerberos.principal = `view-principal`
 * view.kerberos.principal.keytab = `/etc/security/keytabs/view-principal.headless.keytab`

contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java

@@ -31,16 +31,16 @@ import com.google.inject.ImplementedBy;
 @ImplementedBy(SliderAppsViewControllerImpl.class)
 public interface SliderAppsViewController {
 
-  public static final String PROPERTY_HDFS_ADDRESS = "hdfs.address";
-  public static final String PROPERTY_YARN_RM_ADDRESS = "yarn.resourcemanager.address";
-  public static final String PROPERTY_YARN_RM_WEBAPP_ADDRESS = "yarn.resourcemanager.webapp.address";
-  public static final String PROPERTY_YARN_RM_SCHEDULER_ADDRESS = "yarn.resourcemanager.scheduler.address";
+  public static final String PROPERTY_HDFS_ADDRESS = "hdfs.url";
+  public static final String PROPERTY_YARN_RM_ADDRESS = "yarn.rm.url";
+  public static final String PROPERTY_YARN_RM_WEBAPP_ADDRESS = "yarn.rm.webapp.url";
+  public static final String PROPERTY_YARN_RM_SCHEDULER_ADDRESS = "yarn.rm.scheduler.url";
   public static final String PROPERTY_ZK_QUOROM = "zookeeper.quorum";
   public static final String PROPERTY_GANGLIA_SERVER_HOSTNAME = "ganglia.server.hostname";
-  public static final String PROPERTY_GANGLIA_CUSTOM_CLUSTERS = "ganglia.custom.clusters";
+  public static final String PROPERTY_GANGLIA_CUSTOM_CLUSTERS = "ganglia.additional.clusters";
   public static final String PROPERTY_SLIDER_USER = "slider.user";
   public static final String PROPERTY_SLIDER_SECURITY_ENABLED = "slider.security.enabled";
-  public static final String PROPERTY_YARN_RM_PRINCIPAL = "yarn.resourcemanager.principal";
+  public static final String PROPERTY_YARN_RM_PRINCIPAL = "yarn.rm.kerberos.principal";
   public static final String PROPERTY_HDFS_NN_PRINCIPAL = "dfs.namenode.kerberos.principal";
   public static final String PROPERTY_VIEW_PRINCIPAL = "view.kerberos.principal";
   public static final String PROPERTY_VIEW_PRINCIPAL_KEYTAB= "view.kerberos.principal.keytab";

contrib/views/slider/src/main/resources/ui/app/assets/data/resource/slider-properties.json

@@ -13,19 +13,19 @@
     "visible" : true,
     "instance_data" : { },
     "properties" : {
-      "hdfs.address" : "hdfs://slider-1.c.pramod-thangali.internal:8020",
-      "yarn.resourcemanager.address" : "slider-2.c.pramod-thangali.internal:8050",
-      "yarn.resourcemanager.scheduler.address" : "slider-2.c.pramod-thangali.internal:8030",
-      "yarn.resourcemanager.webapp.address" : "slider-2.c.pramod-thangali.internal:8088",
+      "hdfs.url" : "hdfs://slider-1.c.pramod-thangali.internal:8020",
+      "yarn.rm.url" : "slider-2.c.pramod-thangali.internal:8050",
+      "yarn.rm.scheduler.url" : "slider-2.c.pramod-thangali.internal:8030",
+      "yarn.rm.webapp.url" : "slider-2.c.pramod-thangali.internal:8088",
       "zookeeper.quorum" : "slider-1.c.pramod-thangali.internal:2181,slider-2.c.pramod-thangali.internal:2181,slider-3.c.pramod-thangali.internal:2181",
       "ganglia.server.hostname" : "bvc",
-      "ganglia.custom.clusters" : "'HBaseCluster1','7000','AccumuloCluster1','7001','HBaseCluster2','7002'",
+      "ganglia.additional.clusters" : "'HBaseCluster1','7000','AccumuloCluster1','7001','HBaseCluster2','7002'",
       "slider.user" : "John Dow",
       "slider.security.enabled" : "false",
       "dfs.namenode.kerberos.principal" : null,
       "view.kerberos.principal" : null,
       "view.kerberos.principal.keytab" : null,
-      "yarn.resourcemanager.principal" : null
+      "yarn.rm.kerberos.principal" : null
     }
   },
   "resources" : [

contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js

@@ -72,7 +72,7 @@ App.SliderController = Ember.Controller.extend({
    */
   initGangliaProperties: function () {
     var sliderConfigs = App.SliderApp.store.all('sliderConfig'),
-      gangliaClusters = sliderConfigs.findBy('viewConfigName', 'ganglia.custom.clusters'),
+      gangliaClusters = sliderConfigs.findBy('viewConfigName', 'ganglia.additional.clusters'),
       gangliaHost = sliderConfigs.findBy('viewConfigName', 'ganglia.server.hostname');
     App.set('gangliaClusters', this.formatGangliaClusters(gangliaClusters.get('value')));
     App.set('gangliaHost', gangliaHost.get('value'));

contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js

@@ -169,7 +169,7 @@ App.SliderAppsMapper = App.Mapper.createWithMixins(App.RunPeriodically, {
     var yarnUI = "http://"+window.location.hostname+":8088";
     var viewConfigs = App.SliderApp.store.all('sliderConfig');
     if (!Em.isNone(viewConfigs)) {
-      var viewConfig = viewConfigs.findBy('viewConfigName', 'yarn.resourcemanager.webapp.address');
+      var viewConfig = viewConfigs.findBy('viewConfigName', 'yarn.rm.webapp.url');
       if (!Em.isNone(viewConfig)) {
         yarnUI = viewConfig.get('value');
       }

contrib/views/slider/src/main/resources/ui/app/routes/main.js

@@ -52,16 +52,16 @@ App.SliderAppsRoute = Ember.Route.extend({
 
     // Load sliderConfigs to storage
     App.SliderApp.store.pushMany('sliderConfig', Em.A([
-      Em.Object.create({id: 1, required: true, viewConfigName: 'hdfs.address', displayName: 'hdfsAddress', linkedService: 'HDFS'}),
-      Em.Object.create({id: 2, required: true, viewConfigName: 'yarn.resourcemanager.address', displayName: 'yarnResourceManager', linkedService: 'YARN'}),
-      Em.Object.create({id: 3, required: true, viewConfigName: 'yarn.resourcemanager.webapp.address', displayName: 'yarnResourceManagerWebapp', linkedService: 'YARN'}),
-      Em.Object.create({id: 4, required: true, viewConfigName: 'yarn.resourcemanager.scheduler.address',  displayName: 'yarnResourceManagerScheduler'}),
+      Em.Object.create({id: 1, required: true, viewConfigName: 'hdfs.url', displayName: 'hdfsAddress', linkedService: 'HDFS'}),
+      Em.Object.create({id: 2, required: true, viewConfigName: 'yarn.rm.url', displayName: 'yarnResourceManager', linkedService: 'YARN'}),
+      Em.Object.create({id: 3, required: true, viewConfigName: 'yarn.rm.webapp.url', displayName: 'yarnResourceManagerWebapp', linkedService: 'YARN'}),
+      Em.Object.create({id: 4, required: true, viewConfigName: 'yarn.rm.scheduler.url',  displayName: 'yarnResourceManagerScheduler'}),
       Em.Object.create({id: 5, required: true, viewConfigName: 'zookeeper.quorum', displayName: 'zookeeperQuorum', linkedService: 'ZOOKEEPER'}),
       Em.Object.create({id: 6, required: false, viewConfigName: 'ganglia.server.hostname', displayName: 'gangliaServer'}),
-      Em.Object.create({id: 7, required: false, viewConfigName: 'ganglia.custom.clusters', displayName: 'gangliaClusters'}),
+      Em.Object.create({id: 7, required: false, viewConfigName: 'ganglia.additional.clusters', displayName: 'gangliaClusters'}),
       Em.Object.create({id: 8, required: false, viewConfigName: 'slider.user', displayName: 'sliderUser'}),
       Em.Object.create({id: 9, required: true, viewConfigName: 'slider.security.enabled', displayName: 'sliderSecurityEnabled'}),
-      Em.Object.create({id: 10, required: false, requireDependsOn: 9, viewConfigName: 'yarn.resourcemanager.principal', displayName: 'yarnResourceManagerPrincipal'}),
+      Em.Object.create({id: 10, required: false, requireDependsOn: 9, viewConfigName: 'yarn.rm.kerberos.principal', displayName: 'yarnResourceManagerPrincipal'}),
       Em.Object.create({id: 11, required: false, requireDependsOn: 9, viewConfigName: 'dfs.namenode.kerberos.principal', displayName: 'dfsNamenodeKerberosPrincipal'}),
       Em.Object.create({id: 12, required: false, requireDependsOn: 9, viewConfigName: 'view.kerberos.principal', displayName: 'viewKerberosPrincipal'}),
       Em.Object.create({id: 13, required: false, requireDependsOn: 9, viewConfigName: 'view.kerberos.principal.keytab', displayName: 'ViewKerberosPrincipalKeytab'})

contrib/views/slider/src/main/resources/view.xml

@@ -19,22 +19,22 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
   <label>Slider Apps View</label>
   <version>1.0.0</version>
   <parameter>
-    <name>hdfs.address</name>
+    <name>hdfs.url</name>
     <description>The URL to access HDFS service via its protocol. Typically this is the fs.defaultFS property in the core-site.xml configuration file. For example: hdfs://hdfs.namenode.host:8020.</description>
     <required>true</required>
   </parameter>
   <parameter>
-    <name>yarn.resourcemanager.address</name>
+    <name>yarn.rm.url</name>
     <description>The URL to the YARN ResourceManager, used to provide YARN Application data. For example: http://yarn.resourcemanager.host:8050</description>
     <required>true</required>
   </parameter>
   <parameter>
-    <name>yarn.resourcemanager.webapp.address</name>
+    <name>yarn.rm.webapp.url</name>
     <description>The URL to the YARN ResourceManager Web Application, used to provide YARN UI. Typically this is the yarn.resourcemanager.webapp.address config from yarn-site.xml configuration file. For example: http://yarn.resourcemanager.host:8088</description>
     <required>true</required>
   </parameter>
   <parameter>
-    <name>yarn.resourcemanager.scheduler.address</name>
+    <name>yarn.rm.scheduler.url</name>
     <description>The URL to the YARN ResourceManager Scheduler, which schedules YARN Applications. For example: http://yarn.resourcemanager.host:8030</description>
     <required>true</required>
   </parameter>
@@ -49,8 +49,8 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
     <required>false</required>
   </parameter>
   <parameter>
-    <name>ganglia.custom.clusters</name>
-    <description>Custom Ganglia clusters which can be used by applications created in Slider Apps view. Value is comma separated list of cluster-name and port pairs. Typically this is the additional_clusters in the ganglia-env configuration. For example: Application1:8881,Application2:8882</description>
+    <name>ganglia.additional.clusters</name>
+    <description>Ganglia clusters which can be used by applications created in Slider Apps view. Value is comma separated list of cluster-name and port pairs. Typically this is the additional_clusters in the ganglia-env configuration. For example: Application1:8881,Application2:8882</description>
     <required>false</required>
   </parameter>
   <parameter>
@@ -64,13 +64,13 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
     <required>true</required>
   </parameter>
   <parameter>
-    <name>yarn.resourcemanager.principal</name>
+    <name>yarn.rm.kerberos.principal</name>
     <description>Kerberos principal used to access YARN ResourceManager. For example: rm/_HOST@EXAMPLE.COM</description>
     <required>optional</required>
   </parameter>
   <parameter>
     <name>dfs.namenode.kerberos.principal</name>
-    <description>Kerberos principal used to access YARN ResourceManager. For example: nn/_HOST@EXAMPLE.COM</description>
+    <description>Kerberos principal used to access HDFS NameNode. For example: nn/_HOST@EXAMPLE.COM</description>
     <required>optional</required>
   </parameter>
   <parameter>
@@ -80,7 +80,7 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
   </parameter>
   <parameter>
     <name>view.kerberos.principal.keytab</name>
-    <description>Path to the Kerberos principal keytab. For example: /etc/security/keytabs/ambari.headless.keytab</description>
+    <description>Path to the Kerberos principal keytab used for view's user. For example: /etc/security/keytabs/ambari.headless.keytab</description>
     <required>optional</required>
   </parameter>
   <resource>