Explorar el Código

AMBARI-15247 ASW: User name properties are enabled to edit and override for installed services.(ababiichuk)

ababiichuk hace 9 años
padre
commit
db7945d204
Se han modificado 34 ficheros con 46 adiciones y 1 borrados
  1. 1 0
      ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
  2. 1 0
      ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
  3. 1 0
      ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
  4. 1 0
      ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
  5. 1 0
      ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
  6. 1 0
      ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
  7. 1 0
      ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
  8. 3 0
      ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
  9. 1 0
      ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
  10. 1 0
      ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
  11. 1 0
      ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
  12. 1 0
      ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
  13. 1 0
      ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
  14. 1 0
      ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
  15. 1 0
      ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
  16. 1 0
      ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
  17. 1 0
      ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml
  18. 1 0
      ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
  19. 1 0
      ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
  20. 1 0
      ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
  21. 2 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
  22. 1 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
  23. 1 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
  24. 1 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml
  25. 3 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml
  26. 1 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml
  27. 1 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
  28. 1 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
  29. 1 0
      ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
  30. 2 0
      ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
  31. 1 0
      ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
  32. 1 0
      ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml
  33. 2 0
      ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
  34. 6 1
      ambari-web/app/controllers/wizard/step7_controller.js

+ 1 - 0
ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml

@@ -100,6 +100,7 @@
     <description>User for running Accumulo server processes.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml

@@ -27,6 +27,7 @@
     <description>Ambari Metrics User Name.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml

@@ -37,6 +37,7 @@
     <description>Metadata User Name.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml

@@ -27,6 +27,7 @@
     <description>Falcon user.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml

@@ -55,6 +55,7 @@
     <description>Flume User</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml

@@ -99,6 +99,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
     <description>HBase User Name.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml

@@ -181,6 +181,7 @@
     <description>User to run HDFS as</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 3 - 0
ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml

@@ -121,6 +121,7 @@
     <description>Hive User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 
@@ -156,6 +157,7 @@
     <description>HCat User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>
@@ -166,6 +168,7 @@
     <description>WebHCat User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml

@@ -29,6 +29,7 @@
     <description></description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml

@@ -44,6 +44,7 @@
     <description>Knox Username.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml

@@ -29,6 +29,7 @@
         <description>Mahout user</description>
         <value-attributes>
             <type>user</type>
+            <overridable>false</overridable>
         </value-attributes>
     </property>
 </configuration>

+ 1 - 0
ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml

@@ -29,6 +29,7 @@
     <description>Oozie User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml

@@ -28,6 +28,7 @@
     <description>Kms username</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml

@@ -28,6 +28,7 @@
     <property-type>USER</property-type>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml

@@ -56,6 +56,7 @@ export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:
     <value>sqoop</value>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml

@@ -29,6 +29,7 @@
     <description></description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml

@@ -29,6 +29,7 @@
     <description></description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml

@@ -50,6 +50,7 @@
     <description>Mapreduce User</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml

@@ -50,6 +50,7 @@
     <description>YARN User</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml

@@ -29,6 +29,7 @@
     <description>ZooKeeper User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 2 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml

@@ -47,6 +47,7 @@
         <description>User executing service checks</description>
         <value-attributes>
             <type>user</type>
+            <overridable>false</overridable>
         </value-attributes>
     </property>
     <property>
@@ -62,6 +63,7 @@
         <description>Hadoop user group.</description>
         <value-attributes>
             <type>user</type>
+            <overridable>false</overridable>
         </value-attributes>
     </property>
 </configuration>

+ 1 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml

@@ -39,6 +39,7 @@
     <description>Flume User</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml

@@ -69,6 +69,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
     <description>HBase User Name.</description>
     <value-attributes>
        <type>user</type>
+       <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 1 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml

@@ -89,6 +89,7 @@
     <description>User to run HDFS as</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 

+ 3 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml

@@ -69,6 +69,7 @@
     <description>Hive User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 
@@ -92,6 +93,7 @@
     <description>HCat User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>
@@ -102,6 +104,7 @@
     <description>WebHCat User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   

+ 1 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml

@@ -29,6 +29,7 @@
     <description>Oozie User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml

@@ -39,6 +39,7 @@
     <description>Mapreduce User</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml

@@ -39,6 +39,7 @@
     <description>YARN User</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml

@@ -29,6 +29,7 @@
     <description>ZooKeeper User.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 2 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml

@@ -50,6 +50,7 @@
         <description>User executing service checks</description>
         <value-attributes>
             <type>user</type>
+            <overridable>false</overridable>
         </value-attributes>
     </property>
     <property>
@@ -65,6 +66,7 @@
         <description>Hadoop user group.</description>
         <value-attributes>
             <type>user</type>
+            <overridable>false</overridable>
         </value-attributes>
     </property>
     <property>

+ 1 - 0
ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml

@@ -69,6 +69,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
     <description>HBase User Name.</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 1 - 0
ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/configuration/hadoop-env.xml

@@ -42,6 +42,7 @@
     <description>ECS bucket owner user</description>
     <value-attributes>
       <type>user</type>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>

+ 2 - 0
ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml

@@ -77,6 +77,7 @@
     <value-attributes>
       <type>user</type>
       <visible>false</visible>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
   <property>
@@ -93,6 +94,7 @@
     <value-attributes>
       <type>user</type>
       <visible>false</visible>
+      <overridable>false</overridable>
     </value-attributes>
   </property>
 </configuration>

+ 6 - 1
ambari-web/app/controllers/wizard/step7_controller.js

@@ -522,7 +522,12 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
   _updateIsEditableFlagForConfig: function (serviceConfigProperty, defaultGroupSelected) {
     if (App.isAuthorized('AMBARI.ADD_DELETE_CLUSTERS')) {
       if (defaultGroupSelected && !this.get('isHostsConfigsPage') && !Em.get(serviceConfigProperty, 'group')) {
-        serviceConfigProperty.set('isEditable', serviceConfigProperty.get('isReconfigurable'));
+        if (serviceConfigProperty.get('serviceName') === 'MISC') {
+          var service = App.config.get('serviceByConfigTypeMap')[App.config.getConfigTagFromFileName(serviceConfigProperty.get('filename'))];
+          serviceConfigProperty.set('isEditable', service && !this.get('installedServiceNames').contains(service.get('serviceName')));
+        } else {
+          serviceConfigProperty.set('isEditable', serviceConfigProperty.get('isReconfigurable'));
+        }
       } else if (Em.get(serviceConfigProperty, 'group') && Em.get(serviceConfigProperty, 'group.name') == this.get('selectedConfigGroup.name')) {
         serviceConfigProperty.set('isEditable', true);
       } else {