Ver Fonte

AMBARI-11203. MySQL Database host field is not shown when using non-default DB (alexantonenko)

Alex Antonenko há 10 anos atrás
pai
commit
55b6f78582

+ 0 - 3
ambari-web/app/data/BIGTOP/site_properties.js

@@ -2611,7 +2611,6 @@ module.exports =
       "displayType": "host",
       "isOverridable": false,
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "HIVE",
       "filename": "hive-env.xml",
@@ -2627,7 +2626,6 @@ module.exports =
       "displayType": "host",
       "isOverridable": false,
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "HIVE",
       "filename": "hive-env.xml",
@@ -2643,7 +2641,6 @@ module.exports =
       "displayType": "host",
       "isOverridable": false,
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "HIVE",
       "filename": "hive-env.xml",

+ 0 - 12
ambari-web/app/data/HDP2/site_properties.js

@@ -3457,7 +3457,6 @@ var hdp2properties = [
     "defaultValue": "",
     "displayType": "host",
     "isOverridable": false,
-    "isRequiredByAgent": false,
     "isVisible": false,
     "isObserved": true,
     "serviceName": "HIVE",
@@ -3473,7 +3472,6 @@ var hdp2properties = [
     "defaultValue": "",
     "displayType": "host",
     "isOverridable": false,
-    "isRequiredByAgent": false,
     "isVisible": false,
     "isObserved": true,
     "serviceName": "HIVE",
@@ -3489,7 +3487,6 @@ var hdp2properties = [
     "defaultValue": "",
     "displayType": "host",
     "isOverridable": false,
-    "isRequiredByAgent": false,
     "isVisible": false,
     "isObserved": true,
     "serviceName": "HIVE",
@@ -3522,7 +3519,6 @@ var hdp2properties = [
     "defaultValue": "",
     "displayType": "host",
     "isOverridable": false,
-    "isRequiredByAgent": false,
     "isVisible": false,
     "isObserved": true,
     "serviceName": "HIVE",
@@ -3538,7 +3534,6 @@ var hdp2properties = [
     "defaultValue": "",
     "displayType": "host",
     "isOverridable": false,
-    "isRequiredByAgent": false,
     "isVisible": false,
     "isObserved": true,
     "serviceName": "HIVE",
@@ -3710,7 +3705,6 @@ var hdp2properties = [
     "description": "Using an existing Oracle database for Oozie Metastore",
     "displayType": "masterHost",
     "isVisible": false,
-    "isRequiredByAgent": false,
     "isObserved": true,
     "isReconfigurable": false,
     "isOverridable": false,
@@ -3730,7 +3724,6 @@ var hdp2properties = [
     "displayType": "masterHost",
     "isOverridable": false,
     "isVisible": false,
-    "isRequiredByAgent": false,
     "isReconfigurable": false,
     "serviceName": "OOZIE",
     "filename": "oozie-env.xml",
@@ -3747,7 +3740,6 @@ var hdp2properties = [
     "description": "MySQL will be installed by Ambari",
     "displayType": "masterHost",
     "isVisible": false,
-    "isRequiredByAgent": false,
     "isReconfigurable": false,
     "isOverridable": false,
     "serviceName": "OOZIE",
@@ -3904,7 +3896,6 @@ var hdp2properties = [
     "isOverridable": false,
     "displayType": "host",
     "isVisible": false,
-    "isRequiredByAgent": false,
     "isObserved": true,
     "serviceName": "OOZIE",
     "filename": "oozie-env.xml",
@@ -3920,7 +3911,6 @@ var hdp2properties = [
     "isOverridable": false,
     "displayType": "host",
     "isVisible": false,
-    "isRequiredByAgent": false,
     "isObserved": true,
     "serviceName": "OOZIE",
     "filename": "oozie-env.xml",
@@ -3936,7 +3926,6 @@ var hdp2properties = [
     "isOverridable": false,
     "displayType": "host",
     "isVisible": false,
-    "isRequiredByAgent": false,
     "isObserved": true,
     "serviceName": "OOZIE",
     "filename": "oozie-env.xml",
@@ -3955,7 +3944,6 @@ var hdp2properties = [
     "displayType": "masterHost",
     "isVisible": false,
     "isRequiredByAgent": false,
-    "isRequiredByAgent": false,
     "serviceName": "OOZIE",
     "filename": "oozie-env.xml",
     "category": "OOZIE_SERVER"

+ 0 - 6
ambari-web/app/data/PHD/site_properties.js

@@ -2459,7 +2459,6 @@ module.exports =
       "displayType": "host",
       "isOverridable": false,
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "HIVE",
       "filename": "hive-env.xml",
@@ -2475,7 +2474,6 @@ module.exports =
       "displayType": "host",
       "isOverridable": false,
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "HIVE",
       "filename": "hive-env.xml",
@@ -2491,7 +2489,6 @@ module.exports =
       "displayType": "host",
       "isOverridable": false,
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "HIVE",
       "filename": "hive-env.xml",
@@ -2818,7 +2815,6 @@ module.exports =
       "isOverridable": false,
       "displayType": "host",
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "OOZIE",
       "filename": "oozie-env.xml",
@@ -2834,7 +2830,6 @@ module.exports =
       "isOverridable": false,
       "displayType": "host",
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "OOZIE",
       "filename": "oozie-env.xml",
@@ -2850,7 +2845,6 @@ module.exports =
       "isOverridable": false,
       "displayType": "host",
       "isVisible": false,
-      "isRequiredByAgent": false,
       "isObserved": true,
       "serviceName": "OOZIE",
       "filename": "oozie-env.xml",

+ 10 - 1
ambari-web/app/utils/config.js

@@ -538,7 +538,16 @@ App.config = Em.Object.create({
           // host names or some misc properties that won't be persisted.
           if (Em.get(preDefined, 'isRequiredByAgent') !== false && !isAdvanced &&
               Em.get(preDefined, 'filename') != 'alert_notification' &&
-              !['hive_hostname', 'oozie_hostname'].contains(Em.get(preDefined, 'name'))) {
+              ![
+                'hive_hostname',
+                'oozie_hostname',
+                'hive_existing_oracle_host',
+                'hive_existing_postgresql_host',
+                'hive_existing_mysql_host',
+                'oozie_existing_oracle_host',
+                'oozie_existing_postgresql_host',
+                'oozie_existing_mysql_host'
+              ].contains(Em.get(preDefined, 'name'))) {
             return;
           }
           configData.isRequiredByAgent = (configData.isRequiredByAgent !== undefined) ? configData.isRequiredByAgent : true;