AMBARI-5529. hive + oozie postgres option should say PostgreSQL. (Denys Buzhor via akovalenko)

ambari-web/app/assets/data/dashboard/HDP2/master_components.json

@@ -1,6 +1,86 @@
 {
   "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/?ServiceComponentInfo/category=MASTER&fields=ServiceComponentInfo/MasterActiveTime,host_components/metrics/jvm/memHeapUsedM,host_components/metrics/jvm/memHeapCommittedM,host_components/metrics/mapred/jobtracker/trackers_decommissioned,host_components/metrics/cpu/cpu_wio,host_components/metrics/rpc/RpcQueueTime_avg_time,host_components/metrics/dfs/FSNamesystem/HAState,host_components/metrics/dfs/FSNamesystem/CapacityUsed,host_components/metrics/dfs/FSNamesystem/CapacityTotal,host_components/metrics/dfs/FSNamesystem/CapacityRemaining,host_components/metrics/dfs/FSNamesystem/BlocksTotal,host_components/metrics/dfs/FSNamesystem/CorruptBlocks,host_components/metrics/dfs/FSNamesystem/MissingBlocks,host_components/metrics/dfs/FSNamesystem/UnderReplicatedBlocks,host_components/metrics/dfs/namenode/Version,host_components/metrics/dfs/namenode/LiveNodes,host_components/metrics/dfs/namenode/DeadNodes,host_components/metrics/dfs/namenode/DecomNodes,host_components/metrics/dfs/namenode/TotalFiles,host_components/metrics/dfs/namenode/UpgradeFinalized,host_components/metrics/dfs/namenode/Safemode,host_components/metrics/runtime/StartTime,host_components/metrics/flume/flume,host_components/metrics/yarn/Queue,host_components/metrics/hbase/master/IsActiveMaster,host_components/HostRoles/state",
   "items" : [
+    {
+      "ServiceComponentInfo" : {
+        "component_name" : "FLUME_HANDLER",
+        "service_name" : "FLUME"
+      },
+      "host_components" : [
+        {
+          "HostRoles" : {
+            "component_name" : "FLUME_HANDLER",
+            "host_name" : "dev01.hortonworks.com",
+            "maintenance_state" : "OFF",
+            "stale_configs" : false,
+            "state" : "STARTED"
+          },
+          "metrics" : {
+            "cpu" : {
+              "cpu_wio" : 0.0347222222222
+            },
+            "flume" : {
+              "flume" : {
+                "CHANNEL" : {
+                  "c1" : {
+                    "ChannelCapacity" : 10000.0,
+                    "ChannelFillPercentage" : 0.0,
+                    "ChannelSize" : 0.0,
+                    "EventPutAttemptCount" : 0.0,
+                    "EventPutSuccessCount" : 0.0,
+                    "EventTakeAttemptCount" : 21.0434782609,
+                    "EventTakeSuccessCount" : 0.0,
+                    "StartTime" : 1.39817772503E12,
+                    "StopTime" : 0.0
+                  }
+                },
+                "SINK" : {
+                  "sink1" : {
+                    "BatchCompleteCount" : 0.0,
+                    "BatchEmptyCount" : 20.5594202899,
+                    "BatchUnderflowCount" : 0.0,
+                    "ConnectionClosedCount" : 0.0,
+                    "ConnectionCreatedCount" : 0.0,
+                    "ConnectionFailedCount" : 0.0,
+                    "EventDrainAttemptCount" : 0.0,
+                    "EventDrainSuccessCount" : 0.0,
+                    "StartTime" : 1.39817772504E12,
+                    "StopTime" : 0.0
+                  }
+                },
+                "SOURCE" : {
+                  "src1" : {
+                    "AppendAcceptedCount" : 0.0,
+                    "AppendBatchAcceptedCount" : 0.0,
+                    "AppendBatchReceivedCount" : 0.0,
+                    "AppendReceivedCount" : 0.0,
+                    "EventAcceptedCount" : 0.0,
+                    "EventReceivedCount" : 0.0,
+                    "OpenConnectionCount" : 0.0,
+                    "StartTime" : 1.39817772519E12,
+                    "StopTime" : 0.0
+                  }
+                }
+              }
+            }
+          },
+          "processes" : [
+            {
+              "HostComponentProcess" : {
+                "channels_count" : 1.0,
+                "cluster_name" : "mycluster",
+                "component_name" : "FLUME_HANDLER",
+                "host_name" : "dev01.hortonworks.com",
+                "name" : "agent",
+                "sinks_count" : 1.0,
+                "sources_count" : 1.0,
+                "status" : "RUNNING"
+              }
+            }
+          ]
+        }
+      ]
+    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/GANGLIA_SERVER",
       "ServiceComponentInfo" : {

ambari-web/app/controllers/main/service/info/configs.js

@@ -1054,7 +1054,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
         globals = globals.without(globals.findProperty('name', 'hive_existing_oracle_database'));
         globals = globals.without(globals.findProperty('name', 'hive_existing_postgresql_host'));
         globals = globals.without(globals.findProperty('name', 'hive_existing_postgresql_database'));
-      } else if (hiveDb.value === 'Existing Postgresql Database') {
+      } else if (hiveDb.value === Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
         var existingPostgreSqlHost = globals.findProperty('name', 'hive_existing_postgresql_host');
         if (existingPostgreSqlHost) {
           existingPostgreSqlHost.name = 'hive_hostname';
@@ -1123,7 +1123,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
         globals = globals.without(globals.findProperty('name', 'oozie_derby_database'));
         globals = globals.without(globals.findProperty('name', 'oozie_existing_postgresql_host'));
         globals = globals.without(globals.findProperty('name', 'oozie_existing_postgresql_database'));
-      } else if (oozieDb.value === 'Existing Postgresql Database') {
+      } else if (oozieDb.value === Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
         var existingPostgreSqlHost = globals.findProperty('name', 'oozie_existing_postgresql_host');
         if (existingPostgreSqlHost) {
           existingPostgreSqlHost.name = 'oozie_hostname';

ambari-web/app/controllers/wizard/step8_controller.js

@@ -270,7 +270,7 @@ App.WizardStep8Controller = Em.Controller.extend({
           'hive_existing_oracle_database', 'hive_existing_postgresql_host', 'hive_existing_postgresql_database']);
       }
       else {
-        if (hiveDb.value === 'Existing Postgresql Database') {
+        if (hiveDb.value === Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
           globals.findProperty('name', 'hive_hostname').value = globals.findProperty('name', 'hive_existing_postgresql_host').value;
           hiveDbType.value = 'postgresql';
           hive_properties = Em.A(['hive_ambari_host', 'hive_ambari_database', 'hive_existing_oracle_host',
@@ -320,7 +320,7 @@ App.WizardStep8Controller = Em.Controller.extend({
           'oozie_existing_oracle_database', 'oozie_derby_database', 'oozie_existing_postgresql_host', 'oozie_existing_postgresql_database']);
       }
       else {
-        if (oozieDb.value === 'Existing Postgresql Database') {
+        if (oozieDb.value === Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
           globals.findProperty('name', 'oozie_hostname').value = globals.findProperty('name', 'oozie_existing_postgresql_host').value;
           oozieDbType.value = 'postgresql';
           oozie_properties = Em.A(['oozie_ambari_host', 'oozie_ambari_database', 'oozie_existing_oracle_host',
@@ -697,7 +697,7 @@ App.WizardStep8Controller = Em.Controller.extend({
         dbComponent.set('component_value', db.value + ' (' + hiveDb.value + ')');
       }
       else {
-        if (hiveDb.value === 'Existing Postgresql Database') {
+        if (hiveDb.value === Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
           db = this.get('wizardController').getDBProperty('serviceConfigProperties').findProperty('name', 'hive_existing_postgresql_database');
           dbComponent.set('component_value', db.value + ' (' + hiveDb.value + ')');
         }
@@ -756,7 +756,7 @@ App.WizardStep8Controller = Em.Controller.extend({
         dbComponent.set('component_value', db.value + ' (' + oozieDb.value + ')');
       }
       else {
-        if (oozieDb.value === 'Existing Postgresql Database') {
+        if (oozieDb.value === Em.I18n.t('services.service.config.hive.oozie.postgresql')) {
           db = this.get('wizardController').getDBProperty('serviceConfigProperties').findProperty('name', 'oozie_existing_postgresql_database');
           dbComponent.set('component_value', db.value + ' (' + oozieDb.value + ')');
         }

ambari-web/app/data/HDP2/global_properties.js

@@ -583,14 +583,14 @@ module.exports =
       "category": "Hive Metastore",
       "index": 1
     },
-    // for existing Postgresql
+    // for existing PostgreSQL
     {
       "id": "puppet var",
       "name": "hive_existing_postgresql_database",
       "displayName": "Database Type",
       "value": "",
-      "defaultValue": "Postgresql",
-      "description": "Using an existing Postgresql database for Hive Metastore",
+      "defaultValue": "PostgreSQL",
+      "description": "Using an existing PostgreSQL database for Hive Metastore",
       "displayType": "masterHost",
       "isOverridable": false,
       "isVisible": false,
@@ -646,7 +646,7 @@ module.exports =
           foreignKeys: ['hive_existing_mysql_database', 'hive_existing_mysql_host']
         },
         {
-            displayName: 'Existing Postgresql Database',
+            displayName: 'Existing PostgreSQL Database',
             foreignKeys: ['hive_existing_postgresql_database', 'hive_existing_postgresql_host']
         },
         {
@@ -895,14 +895,14 @@ module.exports =
       "category": "Oozie Server",
       "index": 1
     },
-    // for existing Postgresql
+    // for existing PostgreSQL
     {
       "id": "puppet var",
       "name": "oozie_existing_postgresql_database",
       "displayName": "Database Type",
       "value": "",
-      "defaultValue": "Postgresql",
-      "description": "Using an existing Postgresql database for Oozie Metastore",
+      "defaultValue": "PostgreSQL",
+      "description": "Using an existing PostgreSQL database for Oozie Metastore",
       "displayType": "masterHost",
       "isOverridable": false,
       "isVisible": false,
@@ -980,7 +980,7 @@ module.exports =
           hidden: !App.supports.hiveOozieExtraDatabases
         },
                 {
-          displayName: 'Existing Postgresql Database',
+          displayName: 'Existing PostgreSQL Database',
           foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'],
           hidden: !App.supports.hiveOozieExtraDatabases
         },

ambari-web/app/data/global_properties.js

@@ -554,14 +554,14 @@ module.exports =
       "category": "Hive Metastore",
       "index": 1
     },
-    // for existing Postgresql
+    // for existing PostgreSQL
     {
       "id": "puppet var",
       "name": "hive_existing_postgresql_database",
       "displayName": "Database Type",
       "value": "",
-      "defaultValue": "Postgresql",
-      "description": "Using an existing Postgresql database for Hive Metastore",
+      "defaultValue": "PostgreSQL",
+      "description": "Using an existing PostgreSQL database for Hive Metastore",
       "displayType": "masterHost",
       "isOverridable": false,
       "isVisible": false,
@@ -617,7 +617,7 @@ module.exports =
           foreignKeys: ['hive_existing_mysql_database', 'hive_existing_mysql_host']
         },
         {
-          displayName: 'Existing Postgresql Database',
+          displayName: 'Existing PostgreSQL Database',
           foreignKeys: ['hive_existing_postgresql_database', 'hive_existing_postgresql_host'],
           },
         {
@@ -835,14 +835,14 @@ module.exports =
       "category": "Oozie Server",
       "index": 0
     },
-    // for existing Postgresql
+    // for existing PostgreSQL
     {
       "id": "puppet var",
       "name": "oozie_existing_postgresql_database",
       "displayName": "Database Type",
       "value": "",
-      "defaultValue": "Postgresql",
-      "description": "Using an existing Postgresql database for Oozie Metastore",
+      "defaultValue": "PostgreSQL",
+      "description": "Using an existing PostgreSQL database for Oozie Metastore",
       "displayType": "masterHost",
       "isOverridable": false,
       "isVisible": false,
@@ -917,7 +917,7 @@ module.exports =
           hidden: !App.supports.hiveOozieExtraDatabases
         },
                 {
-          displayName: 'Existing Postgresql Database',
+          displayName: 'Existing PostgreSQL Database',
           foreignKeys: ['oozie_existing_postgresql_database', 'oozie_existing_postgresql_host'],
           },
         {

ambari-web/app/messages.js

@@ -1246,6 +1246,7 @@ Em.I18n.translations = {
   'services.service.config.exitPopup.body':'You have unsaved changes. Save changes or discard?',
   'services.service.config.propertyFilterPopover.title':'Properties filter',
   'services.service.config.propertyFilterPopover.content':'Enter keywords to filter properties by property name, value, or description.',
+  'services.service.config.hive.oozie.postgresql': 'Existing PostgreSQL Database',
 
   'services.add.header':'Add Service Wizard',
   'services.reassign.header':'Move Master Wizard',

ambari-web/app/views/wizard/controls_view.js

@@ -222,7 +222,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend({
               connectionUrl.set('value', "jdbc:mysql://" + this.get('hostName') + "/" + this.get('databaseName') + "?createDatabaseIfNotExist=true");
               dbClass.set('value', "com.mysql.jdbc.Driver");
               break;
-            case 'Existing Postgresql Database':
+            case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
               connectionUrl.set('value', "jdbc:postgresql://" + this.get('hostName') + ":5432/" + this.get('databaseName'));
               dbClass.set('value', "org.postgresql.Driver");
               break;
@@ -241,7 +241,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend({
               connectionUrl.set('value', "jdbc:mysql://" + this.get('hostName') + "/" + this.get('databaseName'));
               dbClass.set('value', "com.mysql.jdbc.Driver");
               break;
-            case 'Existing Postgresql Database':
+            case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
               connectionUrl.set('value', "jdbc:postgresql://" + this.get('hostName') + ":5432/" + this.get('databaseName'));
               dbClass.set('value', "org.postgresql.Driver");
               break;
@@ -282,7 +282,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend({
         case 'Existing MySQL Database':
           hostname = this.get('categoryConfigsAll').findProperty('name', 'hive_existing_mysql_host');
           break;
-        case 'Existing Postgresql Database':
+        case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
           hostname = this.get('categoryConfigsAll').findProperty('name', 'hive_existing_postgresql_host');
           break;
         case 'Existing Oracle Database':
@@ -303,7 +303,7 @@ App.ServiceConfigRadioButtons = Ember.View.extend({
         case 'Existing MySQL Database':
           hostname = this.get('categoryConfigsAll').findProperty('name', 'oozie_existing_mysql_host');
           break;
-        case 'Existing Postgresql Database':
+        case Em.I18n.t('services.service.config.hive.oozie.postgresql'):
           hostname = this.get('categoryConfigsAll').findProperty('name', 'oozie_existing_postgresql_host');
           break;
         case 'Existing Oracle Database':