http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index edcb322..e2cb1cf 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1564,7 +1564,7 @@ module.exports = "name": "templeton.hive.archive", "displayName": "templeton.hive.archive", "isRequired": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "Advanced webhcat-site" }, { @@ -1572,7 +1572,7 @@ module.exports = "name": "templeton.pig.archive", "displayName": "templeton.pig.archive", "isRequired": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "Advanced webhcat-site" }, { @@ -1580,7 +1580,7 @@ module.exports = "name": "templeton.zookeeper.hosts", "displayName": "templeton.zookeeper.hosts", "displayType": "multiLine", - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "Advanced webhcat-site" }, /**********************************************pig.properties*****************************************/ @@ -2585,7 +2585,7 @@ module.exports = "filename": "hive-env.xml", "category": "Advanced hive-env" }, - /**********************************************WEBHCAT***************************************/ + /**********************************************HIVE***************************************/ { "id": "puppet var", "name": "webhcatserver_host", @@ -2597,7 +2597,7 @@ module.exports = "isOverridable": false, "isVisible": true, "isRequiredByAgent": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "filename": "webhcat-env.xml", "category": "WEBHCAT_SERVER" }, @@ -2611,7 +2611,7 @@ module.exports = "displayType": "directory", "isOverridable": false, "isVisible": true, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "filename": "webhcat-env.xml", "category": "Advanced webhcat-env" }, @@ -2625,7 +2625,7 @@ module.exports = "displayType": "directory", "isOverridable": false, "isVisible": true, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "filename": "webhcat-env.xml", "category": "Advanced webhcat-env" }, @@ -3334,7 +3334,7 @@ module.exports = "filename": "core-site.xml", "serviceName": "MISC", "category": "Users and Groups", - "belongsToService": ["HIVE", "WEBHCAT", "OOZIE", "FALCON"], + "belongsToService": ["HIVE", "OOZIE", "FALCON"], "index": 18 }, { @@ -3442,9 +3442,9 @@ module.exports = "isOverridable": false, "isVisible": true, "serviceName": "MISC", - "filename": "hcatalog-env.xml", + "filename": "hive-env.xml", "category": "Users and Groups", - "belongsToService": ["HCATALOG"], + "belongsToService": ["HIVE"], "index": 6 }, { @@ -3460,7 +3460,7 @@ module.exports = "serviceName": "MISC", "filename": "webhcat-env.xml", "category": "Users and Groups", - "belongsToService": ["WEBHCAT"], + "belongsToService": ["HIVE"], "index": 7 }, {
http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/secure_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/secure_configs.js b/ambari-web/app/data/secure_configs.js index c0b4dba..c6079c8 100644 --- a/ambari-web/app/data/secure_configs.js +++ b/ambari-web/app/data/secure_configs.js @@ -64,20 +64,11 @@ module.exports = [ displayName: 'Hive', filename: 'hive-site', configCategories: [ - App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName: 'Hive Metastore and Hive Server 2'}) - ], - sites: ['hive-site'], - configs: configProperties.filterProperty('serviceName', 'HIVE') - }, - { - serviceName: 'WEBHCAT', - displayName: 'WebHCat', - filename: 'webhcat-site', - configCategories: [ + App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName: 'Hive Metastore and Hive Server 2'}), App.ServiceConfigCategory.create({ name: 'WebHCat Server', displayName : 'WebHCat Server'}) ], - sites: ['webhcat-site'], - configs: configProperties.filterProperty('serviceName', 'WEBHCAT') + sites: ['hive-site','webhcat-site'], + configs: configProperties.filterProperty('serviceName', 'HIVE') }, { serviceName: 'HBASE', http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/secure_mapping.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/secure_mapping.js b/ambari-web/app/data/secure_mapping.js index cc6cc40..c4bd6a4 100644 --- a/ambari-web/app/data/secure_mapping.js +++ b/ambari-web/app/data/secure_mapping.js @@ -371,7 +371,7 @@ module.exports = [ "foreignKey": null, "value": "<templateName[0]>@<templateName[1]>", "filename": "webhcat-site.xml", - "serviceName": "WEBHCAT" + "serviceName": "HIVE" }, { "name": "templeton.kerberos.keytab", @@ -379,7 +379,7 @@ module.exports = [ "foreignKey": null, "value": "<templateName[0]>", "filename": "webhcat-site.xml", - "serviceName": "WEBHCAT" + "serviceName": "HIVE" }, { "name": "templeton.kerberos.secret", @@ -387,7 +387,7 @@ module.exports = [ "foreignKey": null, "value": "secret", "filename": "webhcat-site.xml", - "serviceName": "WEBHCAT" + "serviceName": "HIVE" }, { "name": "templeton.hive.properties", @@ -396,7 +396,7 @@ module.exports = [ "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive." + "metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=<templateName[1]>@<templateName[2]>", "filename": "webhcat-site.xml", - "serviceName": "WEBHCAT" + "serviceName": "HIVE" }, { "name": "hbase.coprocessor.master.classes", @@ -503,7 +503,7 @@ module.exports = [ "foreignKey": ["webHCat_http_primary_name"], "value": "<templateName[0]>", "filename": "core-site.xml", - "serviceName": "WEBHCAT" + "serviceName": "HIVE" }, { "name": "hadoop.proxyuser.<foreignKey[0]>.hosts", @@ -511,7 +511,7 @@ module.exports = [ "foreignKey": ["webHCat_http_primary_name"], "value": "<templateName[0]>", "filename": "core-site.xml", - "serviceName": "WEBHCAT" + "serviceName": "HIVE" } ]; http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/secure_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/secure_properties.js b/ambari-web/app/data/secure_properties.js index a00783e..0fe0ca8 100644 --- a/ambari-web/app/data/secure_properties.js +++ b/ambari-web/app/data/secure_properties.js @@ -485,8 +485,6 @@ module.exports = "category": "TaskTracker", "component": "TASKTRACKER" }, - - //WEBHCAT { "id": "puppet var", "name": "webhcatserver_host", @@ -497,7 +495,7 @@ module.exports = "displayType": "masterHost", "isVisible": true, "isOverridable": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "WebHCat Server" }, { @@ -510,7 +508,7 @@ module.exports = "displayType": "principal", "isVisible": true, "isOverridable": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "WebHCat Server" }, { @@ -523,7 +521,7 @@ module.exports = "displayType": "directory", "isVisible": true, "isOverridable": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "WebHCat Server" }, //HBASE http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js index 02fa670..60b997e 100644 --- a/ambari-web/app/data/site_properties.js +++ b/ambari-web/app/data/site_properties.js @@ -764,7 +764,7 @@ module.exports = "name": "templeton.hive.archive", "displayName": "templeton.hive.archive", "isRequired": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "Advanced webhcat-site" }, { @@ -772,7 +772,7 @@ module.exports = "name": "templeton.pig.archive", "displayName": "templeton.pig.archive", "isRequired": false, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "Advanced webhcat-site" }, { @@ -781,7 +781,7 @@ module.exports = "displayName": "templeton.zookeeper.hosts", "defaultValue": "", "displayType": "multiLine", - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "category": "Advanced webhcat-site" }, /**********************************************pig.properties*****************************************/ @@ -1721,7 +1721,7 @@ module.exports = "filename": "hive-env.xml", "category": "Advanced hive-env" }, - /**********************************************WEBHCAT***************************************/ + /**********************************************HIVE***************************************/ { "id": "puppet var", "name": "webhcatserver_host", @@ -1733,7 +1733,7 @@ module.exports = "isOverridable": false, "isRequiredByAgent": false, "isVisible": true, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "filename": "webhcat-env.xml", "category": "WEBHCAT_SERVER" }, @@ -1747,7 +1747,7 @@ module.exports = "displayType": "directory", "isOverridable": false, "isVisible": true, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "filename": "webhcat-env.xml", "category": "Advanced webhcat-env" }, @@ -1761,7 +1761,7 @@ module.exports = "displayType": "directory", "isOverridable": false, "isVisible": true, - "serviceName": "WEBHCAT", + "serviceName": "HIVE", "filename": "webhcat-env.xml", "category": "Advanced webhcat-env" }, @@ -2265,7 +2265,7 @@ module.exports = "filename": "hadoop-env.xml", "serviceName": "MISC", "category": "Users and Groups", - "belongsToService": ["HIVE", "WEBHCAT", "OOZIE"] + "belongsToService": ["HIVE", "OOZIE"] }, { "id": "puppet var", @@ -2365,9 +2365,9 @@ module.exports = "isOverridable": false, "isVisible": true, "serviceName": "MISC", - "filename": "hcatalog-env.xml", + "filename": "hive-env.xml", "category": "Users and Groups", - "belongsToService": ["HCATALOG"] + "belongsToService": ["HIVE"] }, { "id": "puppet var", @@ -2382,7 +2382,7 @@ module.exports = "serviceName": "MISC", "filename": "webhcat-env.xml", "category": "Users and Groups", - "belongsToService": ["WEBHCAT"] + "belongsToService": ["HIVE"] }, { "id": "puppet var", http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/mixins/wizard/addSecurityConfigs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js b/ambari-web/app/mixins/wizard/addSecurityConfigs.js index 8c3d5f0..d3b527a 100644 --- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js +++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js @@ -51,7 +51,7 @@ App.AddSecurityConfigs = Em.Mixin.create({ configName: 'hivemetastore_host' }, { - serviceName: 'WEBHCAT', + serviceName: 'HIVE', componentName: 'WEBHCAT_SERVER', configName: 'webhcat_server' } http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/models/service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service.js b/ambari-web/app/models/service.js index 03d2a2e..caa872e 100644 --- a/ambari-web/app/models/service.js +++ b/ambari-web/app/models/service.js @@ -97,18 +97,6 @@ App.Service = DS.Model.extend({ */ isRestartRequired: function () { var rhc = this.get('hostComponents').filterProperty('staleConfigs', true); - - // HCatalog components are technically owned by Hive. - if (this.get('serviceName') == 'HIVE') { - var hcatService = App.Service.find('HCATALOG'); - if (hcatService != null && hcatService.get('isLoaded')) { - var hcatStaleHcs = hcatService.get('hostComponents').filterProperty('staleConfigs', true); - if (hcatStaleHcs != null) { - rhc.pushObjects(hcatStaleHcs); - } - } - } - var hc = {}; rhc.forEach(function(_rhc) { var hostName = _rhc.get('hostName'); http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/models/stack_service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index edef8ce..55878ec 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -87,7 +87,7 @@ App.StackService = DS.Model.extend({ }.property('coSelectedServices', 'serviceName'), isHiddenOnSelectServicePage: function () { - var hiddenServices = ['MAPREDUCE2', 'HCATALOG', 'WEBHCAT']; + var hiddenServices = ['MAPREDUCE2']; return hiddenServices.contains(this.get('serviceName')); }.property('serviceName'), @@ -183,8 +183,6 @@ App.StackService.displayOrder = [ 'NAGIOS', 'GANGLIA', 'HIVE', - 'HCATALOG', - 'WEBHCAT', 'HBASE', 'PIG', 'SQOOP', @@ -198,8 +196,7 @@ App.StackService.displayOrder = [ //@TODO: Write unit test for no two keys in the object should have any intersecting elements in their values App.StackService.coSelected = { - 'YARN': ['MAPREDUCE2'], - 'HIVE': ['HCATALOG', 'WEBHCAT'] + 'YARN': ['MAPREDUCE2'] }; @@ -265,11 +262,7 @@ App.StackService.configCategories = function () { break; case 'HIVE': serviceConfigCategories.pushObjects([ - App.ServiceConfigCategory.create({ name: 'HIVE_METASTORE', displayName: 'Hive Metastore'}) - ]); - break; - case 'WEBHCAT': - serviceConfigCategories.pushObjects([ + App.ServiceConfigCategory.create({ name: 'HIVE_METASTORE', displayName: 'Hive Metastore'}), App.ServiceConfigCategory.create({ name: 'WEBHCAT_SERVER', displayName: 'WebHCat Server'}) ]); break; @@ -323,8 +316,6 @@ App.StackService.configCategories = function () { break; case 'SQOOP': break; - case 'HCATALOG': - break; default: serviceConfigCategories.pushObjects([ App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}) http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/utils/batch_scheduled_requests.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/batch_scheduled_requests.js b/ambari-web/app/utils/batch_scheduled_requests.js index 6d89ddc..1ee7c70 100644 --- a/ambari-web/app/utils/batch_scheduled_requests.js +++ b/ambari-web/app/utils/batch_scheduled_requests.js @@ -72,7 +72,6 @@ module.exports = { restartAllServiceHostComponents: function(serviceName, staleConfigsOnly, query, runMmOperation) { var self = this; var context = staleConfigsOnly ? Em.I18n.t('rollingrestart.context.allWithStaleConfigsForSelectedService').format(serviceName) : Em.I18n.t('rollingrestart.context.allForSelectedService').format(serviceName); - var services = (serviceName === 'HIVE' && App.Service.find('HCATALOG').get('isLoaded')) ? ['HIVE', 'HCATALOG'] : [serviceName]; if (runMmOperation) { this.turnOnOffPassiveRequest('ON', Em.I18n.t('passiveState.turnOnFor').format(serviceName), serviceName); http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 35ca305..f49c5aa 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -119,7 +119,7 @@ App.config = Em.Object.create({ // HCatalog should be eventually made a part of Hive Service. See AMBARI-6302 description for further details var servicesWithConfigTypes = stackServices.filter(function (service) { var configtypes = service.get('configTypes'); - return configtypes && !!Object.keys(configtypes).length && service.get('serviceName') != 'HCATALOG'; + return configtypes && !!Object.keys(configtypes).length; }, this); var allTabs = servicesWithConfigTypes.concat(nonServiceTab); http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/utils/helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js index 3be9849..a3ebfde 100644 --- a/ambari-web/app/utils/helper.js +++ b/ambari-web/app/utils/helper.js @@ -326,7 +326,6 @@ App.format = { 'HBASE': 'HBase', 'HBASE_REGIONSERVER': 'RegionServer', 'HCAT': 'HCat', - 'HCATALOG': 'HCatalog', 'HDFS': 'HDFS', 'HISTORYSERVER': 'History Server', 'HIVE_SERVER': 'HiveServer2', http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/views/main/host/configs_service_menu.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/configs_service_menu.js b/ambari-web/app/views/main/host/configs_service_menu.js index 0f20a7d..4724573 100644 --- a/ambari-web/app/views/main/host/configs_service_menu.js +++ b/ambari-web/app/views/main/host/configs_service_menu.js @@ -29,7 +29,7 @@ App.MainHostServiceMenuView = Em.CollectionView.extend({ var service = hc.get('service'); if (service) { var serviceName = service.get('serviceName'); - if(!App.get('services.noConfigTypes').concat('HCATALOG').contains(serviceName)){ + if(!App.get('services.noConfigTypes').contains(serviceName)){ if (!services.findProperty('serviceName', serviceName)) { services.push(service); } http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/views/main/service/info/summary.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js index 8d5ed4e..d90f835 100644 --- a/ambari-web/app/views/main/service/info/summary.js +++ b/ambari-web/app/views/main/service/info/summary.js @@ -88,7 +88,7 @@ App.MainServiceInfoSummaryView = Em.View.extend({ noTemplateService: function () { var serviceName = this.get("service.serviceName"); //services with only master components - return serviceName == "WEBHCAT" || serviceName == "NAGIOS"; + return serviceName == "NAGIOS"; }.property('controller.content'), hasManyServers: function () { http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/views/main/service/item.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js index f99e69a..2dda3c0 100644 --- a/ambari-web/app/views/main/service/item.js +++ b/ambari-web/app/views/main/service/item.js @@ -215,7 +215,7 @@ App.MainServiceItemView = Em.View.extend({ }.property('maintenance'), hasConfigTab: function() { - return !App.get('services.noConfigTypes').concat('HCATALOG').contains(this.get('controller.content.serviceName')); + return !App.get('services.noConfigTypes').contains(this.get('controller.content.serviceName')); }.property('controller.content.serviceName','App.services.noConfigTypes'), didInsertElement: function () { http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/views/main/service/menu.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/menu.js b/ambari-web/app/views/main/service/menu.js index c329921..507a652 100644 --- a/ambari-web/app/views/main/service/menu.js +++ b/ambari-web/app/views/main/service/menu.js @@ -20,7 +20,7 @@ var App = require('app'); var misc = require('utils/misc'); App.MainServiceMenuView = Em.CollectionView.extend({ - disabledServices: ['HCATALOG'], + disabledServices: [], content:function () { var items = App.router.get('mainServiceController.content').filter(function(item){ @@ -75,7 +75,7 @@ App.MainServiceMenuView = Em.CollectionView.extend({ }.property('content.criticalAlertsCount'), isConfigurable: function () { - return !App.get('services.noConfigTypes').concat('HCATALOG').contains(this.get('content.serviceName')); + return !App.get('services.noConfigTypes').contains(this.get('content.serviceName')); }.property('App.services.noConfigTypes','content.serviceName'), link: function() { @@ -120,7 +120,7 @@ App.MainServiceMenuView = Em.CollectionView.extend({ }); App.TopNavServiceMenuView = Em.CollectionView.extend({ - disabledServices: ['HCATALOG'], + disabledServices: [], content:function () { var items = App.router.get('mainServiceController.content').filter(function(item){ @@ -173,7 +173,7 @@ App.TopNavServiceMenuView = Em.CollectionView.extend({ }.property('content.criticalAlertsCount'), isConfigurable: function () { - return !App.get('services.noConfigTypes').concat('HCATALOG').contains(this.get('content.serviceName')); + return !App.get('services.noConfigTypes').contains(this.get('content.serviceName')); }.property('App.services.noConfigTypes','content.serviceName'), link: function() { http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js b/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js index 9278148..cd4f4a2 100644 --- a/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js +++ b/ambari-web/test/controllers/main/admin/security/add/addSecurity_controller_test.js @@ -63,7 +63,6 @@ describe('App.AddSecurityController', function () { "HDFS", "MAPREDUCE", "HIVE", - "WEBHCAT", "HBASE", "ZOOKEEPER", "OOZIE", @@ -82,7 +81,6 @@ describe('App.AddSecurityController', function () { "MAPREDUCE2", "YARN", "HIVE", - "WEBHCAT", "HBASE", "ZOOKEEPER", "OOZIE", http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/controllers/main/service/info/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/info/config_test.js b/ambari-web/test/controllers/main/service/info/config_test.js index 56f0aeb..afb2a08 100644 --- a/ambari-web/test/controllers/main/service/info/config_test.js +++ b/ambari-web/test/controllers/main/service/info/config_test.js @@ -717,18 +717,18 @@ describe("App.MainServiceInfoConfigsController", function () { var tests = [ { stepConfigs: [Em.Object.create({ - serviceName: "WEBHCAT", + serviceName: "HIVE", configs: [] })], content: Em.Object.create({ - serviceName: "WEBHCAT" + serviceName: "HIVE" }), m: "add dynamic property", addDynamic: true }, { stepConfigs: [Em.Object.create({ - serviceName: "WEBHCAT", + serviceName: "HIVE", configs: [ Em.Object.create({ name: "templeton.hive.properties" @@ -736,7 +736,7 @@ describe("App.MainServiceInfoConfigsController", function () { ] })], content: Em.Object.create({ - serviceName: "WEBHCAT" + serviceName: "HIVE" }), m: "don't add dynamic property (already included)", addDynamic: false http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/controllers/wizard/step4_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step4_test.js b/ambari-web/test/controllers/wizard/step4_test.js index 7344853..a8ec9b9 100644 --- a/ambari-web/test/controllers/wizard/step4_test.js +++ b/ambari-web/test/controllers/wizard/step4_test.js @@ -24,8 +24,8 @@ require('controllers/wizard/step4_controller'); describe('App.WizardStep4Controller', function () { var services = [ - 'HDFS', 'MAPREDUCE', 'NAGIOS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER', 'HCATALOG', - 'WEBHCAT', 'YARN', 'MAPREDUCE2', 'FALCON', 'TEZ', 'STORM' + 'HDFS', 'MAPREDUCE', 'NAGIOS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER', + 'YARN', 'MAPREDUCE2', 'FALCON', 'TEZ', 'STORM' ]; var controller = App.WizardStep4Controller.create(); @@ -135,31 +135,29 @@ describe('App.WizardStep4Controller', function () { describe('#setGroupedServices()', function () { var testCases = [ { - title: 'should set HCATALOG and WEBHCAT isSelected to true when HIVE is selected', + title: 'should set MapReduce2 isSelected to true when YARN is selected', condition: { + 'YARN': true, 'HBASE': true, 'ZOOKEEPER': true, 'HIVE': true, - 'HCATALOG': true, - 'WEBHCAT': true + 'MAPREDUCE2': true }, result: { - 'HCATALOG': true, - 'WEBHCAT': true + 'MAPREDUCE2': true } }, { - title: 'should set HCATALOG and WEBHCAT isSelected to false when HIVE is not selected', + title: 'should set MapReduce2 isSelected to false when YARN is not selected', condition: { + 'YARN': false, 'HBASE': true, 'ZOOKEEPER': true, 'HIVE': false, - 'HCATALOG': true, - 'WEBHCAT': true + 'MAPREDUCE2': true }, result: { - 'HCATALOG': false, - 'WEBHCAT': false + 'MAPREDUCE2': false } }, { @@ -168,15 +166,11 @@ describe('App.WizardStep4Controller', function () { 'HBASE': true, 'ZOOKEEPER': true, 'HIVE': false, - 'HCATALOG': true, - 'WEBHCAT': true, 'YARN': true, 'MAPREDUCE2': true }, result: { - 'MAPREDUCE2': true, - 'HCATALOG': false, - 'WEBHCAT': false + 'MAPREDUCE2': true } }, { @@ -185,15 +179,11 @@ describe('App.WizardStep4Controller', function () { 'HBASE': true, 'ZOOKEEPER': true, 'HIVE': true, - 'HCATALOG': true, - 'WEBHCAT': true, 'YARN': false, 'MAPREDUCE2': true }, result: { - 'MAPREDUCE2': false, - 'HCATALOG': true, - 'WEBHCAT': true + 'MAPREDUCE2': false } } ]; http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/controllers/wizard/step8_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js index b994ebb..b6488a9 100644 --- a/ambari-web/test/controllers/wizard/step8_test.js +++ b/ambari-web/test/controllers/wizard/step8_test.js @@ -101,13 +101,13 @@ describe('App.WizardStep8Controller', function () { {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE']), e: 7}, {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE']), e: 9}, {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE']), e: 12}, - {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'WEBHCAT']), e: 13}, - {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'WEBHCAT', 'HUE']), e: 14}, - {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'WEBHCAT', 'HUE', 'PIG']), e: 15}, - {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'WEBHCAT', 'HUE', 'PIG', 'FALCON']), e: 17}, - {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'WEBHCAT', 'HUE', 'PIG', 'FALCON', 'STORM']), e: 18}, - {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'WEBHCAT', 'HUE', 'PIG', 'FALCON', 'STORM', 'TEZ']), e: 19}, - {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'WEBHCAT', 'HUE', 'PIG', 'FALCON', 'STORM', 'TEZ', 'ZOOKEEPER']), e: 21} + {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE']), e: 13}, + {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'HUE']), e: 14}, + {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'HUE', 'PIG']), e: 15}, + {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'HUE', 'PIG', 'FALCON']), e: 17}, + {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'HUE', 'PIG', 'FALCON', 'STORM']), e: 18}, + {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'HUE', 'PIG', 'FALCON', 'STORM', 'TEZ']), e: 19}, + {selectedServices: Em.A(['MAPREDUCE2', 'YARN', 'HBASE', 'OOZIE', 'HIVE', 'HUE', 'PIG', 'FALCON', 'STORM', 'TEZ', 'ZOOKEEPER']), e: 21} ]); tests.forEach(function (test) { http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/models/service_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/service_test.js b/ambari-web/test/models/service_test.js index 2467932..a289825 100644 --- a/ambari-web/test/models/service_test.js +++ b/ambari-web/test/models/service_test.js @@ -92,14 +92,6 @@ var service, configurable: true }, { - name: 'HCATALOG', - clientOnly: true - }, - { - name: 'WEBHCAT', - configurable: true - }, - { name: 'FLUME', configurable: true }, http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/models/stack_service_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/stack_service_test.js b/ambari-web/test/models/stack_service_test.js index ef3e587..3500343 100644 --- a/ambari-web/test/models/stack_service_test.js +++ b/ambari-web/test/models/stack_service_test.js @@ -114,14 +114,6 @@ describe('App.StackService', function () { { serviceName: 'MAPREDUCE2', result: true - }, - { - serviceName: 'HCATALOG', - result: true - }, - { - serviceName: 'WEBHCAT', - result: true } ]; http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/service_components.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/service_components.js b/ambari-web/test/service_components.js index 091048c..27e198c 100644 --- a/ambari-web/test/service_components.js +++ b/ambari-web/test/service_components.js @@ -404,53 +404,6 @@ module.exports = { ] }, { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HCATALOG";, - "StackServices" : { - "comments" : "This is comment for HCATALOG service", - "custom_commands" : [ ], - "service_check_supported" : true, - "service_name" : "HCATALOG", - "display_name" : "HCatalog", - "service_version" : "0.12.0.2.1", - "stack_name" : "HDP", - "stack_version" : "2.1", - "user_name" : null, - "required_services" : [ - "HIVE" - ], - "config_types" : { - "hive-env" : { - "supports" : { - "final" : "false" - } - }, - "hive-site" : { - "supports" : { - "final" : "true" - } - } - } - }, - "serviceComponents" : [ - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HCATALOG/serviceComponents/HCAT";, - "StackServiceComponents" : { - "cardinality" : null, - "component_category" : "CLIENT", - "component_name" : "HCAT", - "display_name" : "HCat", - "custom_commands" : [ ], - "is_client" : true, - "is_master" : false, - "service_name" : "HCATALOG", - "stack_name" : "HDP", - "stack_version" : "2.1" - }, - "dependencies" : [ ] - } - ] - }, - { "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HDFS";, "StackServices" : { "comments" : "Apache Hadoop Distributed File System", @@ -733,6 +686,73 @@ module.exports = { ] }, { + "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER";, + "StackServiceComponents" : { + "cardinality" : "1", + "component_category" : "MASTER", + "component_name" : "WEBHCAT_SERVER", + "display_name" : "WebHCat Server", + "custom_commands" : [ ], + "is_client" : false, + "is_master" : true, + "service_name" : "HIVE", + "stack_name" : "HDP", + "stack_version" : "2.1" + }, + "dependencies" : [ + { + "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/WEBHCAT_SERVER/dependencies/HDFS_CLIENT";, + "Dependencies" : { + "component_name" : "HDFS_CLIENT", + "dependent_component_name" : "WEBHCAT_SERVER", + "dependent_service_name" : "WEBHCAT", + "stack_name" : "HDP", + "stack_version" : "2.1" + } + }, + { + "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/WEBHCAT_SERVER/dependencies/MAPREDUCE2_CLIENT";, + "Dependencies" : { + "component_name" : "MAPREDUCE2_CLIENT", + "dependent_component_name" : "WEBHCAT_SERVER", + "dependent_service_name" : "WEBHCAT", + "stack_name" : "HDP", + "stack_version" : "2.1" + } + }, + { + "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/YARN_CLIENT";, + "Dependencies" : { + "component_name" : "YARN_CLIENT", + "dependent_component_name" : "WEBHCAT_SERVER", + "dependent_service_name" : "WEBHCAT", + "stack_name" : "HDP", + "stack_version" : "2.1" + } + }, + { + "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/ZOOKEEPER_CLIENT";, + "Dependencies" : { + "component_name" : "ZOOKEEPER_CLIENT", + "dependent_component_name" : "WEBHCAT_SERVER", + "dependent_service_name" : "WEBHCAT", + "stack_name" : "HDP", + "stack_version" : "2.1" + } + }, + { + "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/ZOOKEEPER_SERVER";, + "Dependencies" : { + "component_name" : "ZOOKEEPER_SERVER", + "dependent_component_name" : "WEBHCAT_SERVER", + "dependent_service_name" : "WEBHCAT", + "stack_name" : "HDP", + "stack_version" : "2.1" + } + } + ] + }, + { "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/MYSQL_SERVER";, "StackServiceComponents" : { "cardinality" : "0-1", @@ -747,6 +767,22 @@ module.exports = { "stack_version" : "2.1" }, "dependencies" : [ ] + }, + { + "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/HIVE/serviceComponents/HCAT";, + "StackServiceComponents" : { + "cardinality" : null, + "component_category" : "CLIENT", + "component_name" : "HCAT", + "display_name" : "HCat", + "custom_commands" : [ ], + "is_client" : true, + "is_master" : false, + "service_name" : "HIVE", + "stack_name" : "HDP", + "stack_version" : "2.1" + }, + "dependencies" : [ ] } ] }, @@ -1349,105 +1385,6 @@ module.exports = { ] }, { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT";, - "StackServices" : { - "comments" : "This is comment for WEBHCAT service", - "custom_commands" : [ ], - "service_check_supported" : true, - "service_name" : "WEBHCAT", - "display_name" : "WebHCat", - "service_version" : "0.13.0.2.1", - "stack_name" : "HDP", - "stack_version" : "2.1", - "user_name" : null, - "required_services" : [ - "HIVE", - "ZOOKEEPER" - ], - "config_types" : { - "webhcat-env" : { - "supports" : { - "final" : "false" - } - }, - "webhcat-site" : { - "supports" : { - "final" : "true" - } - } - } - }, - "serviceComponents" : [ - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER";, - "StackServiceComponents" : { - "cardinality" : "1", - "component_category" : "MASTER", - "component_name" : "WEBHCAT_SERVER", - "display_name" : "WebHCat Server", - "custom_commands" : [ ], - "is_client" : false, - "is_master" : true, - "service_name" : "WEBHCAT", - "stack_name" : "HDP", - "stack_version" : "2.1" - }, - "dependencies" : [ - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/HDFS_CLIENT";, - "Dependencies" : { - "component_name" : "HDFS_CLIENT", - "dependent_component_name" : "WEBHCAT_SERVER", - "dependent_service_name" : "WEBHCAT", - "stack_name" : "HDP", - "stack_version" : "2.1" - } - }, - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/MAPREDUCE2_CLIENT";, - "Dependencies" : { - "component_name" : "MAPREDUCE2_CLIENT", - "dependent_component_name" : "WEBHCAT_SERVER", - "dependent_service_name" : "WEBHCAT", - "stack_name" : "HDP", - "stack_version" : "2.1" - } - }, - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/YARN_CLIENT";, - "Dependencies" : { - "component_name" : "YARN_CLIENT", - "dependent_component_name" : "WEBHCAT_SERVER", - "dependent_service_name" : "WEBHCAT", - "stack_name" : "HDP", - "stack_version" : "2.1" - } - }, - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/ZOOKEEPER_CLIENT";, - "Dependencies" : { - "component_name" : "ZOOKEEPER_CLIENT", - "dependent_component_name" : "WEBHCAT_SERVER", - "dependent_service_name" : "WEBHCAT", - "stack_name" : "HDP", - "stack_version" : "2.1" - } - }, - { - "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/WEBHCAT/serviceComponents/WEBHCAT_SERVER/dependencies/ZOOKEEPER_SERVER";, - "Dependencies" : { - "component_name" : "ZOOKEEPER_SERVER", - "dependent_component_name" : "WEBHCAT_SERVER", - "dependent_service_name" : "WEBHCAT", - "stack_name" : "HDP", - "stack_version" : "2.1" - } - } - ] - } - ] - }, - { "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks2/HDP/versions/2.1/stackServices/YARN";, "StackServices" : { "comments" : "Apache Hadoop NextGen MapReduce (YARN)", http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/test/utils/helper_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/helper_test.js b/ambari-web/test/utils/helper_test.js index 4d2c3b2..bd90d09 100644 --- a/ambari-web/test/utils/helper_test.js +++ b/ambari-web/test/utils/helper_test.js @@ -229,7 +229,6 @@ describe('utils/helper', function() { 'HBASE_REGIONSERVER': 'RegionServer', 'HBASE_SERVICE_CHECK': 'HBase Service Check', 'HCAT': 'HCat', - 'HCATALOG': 'HCatalog', 'HCAT_SERVICE_CHECK': 'HCat Service Check', 'HDFS': 'HDFS', 'HDFS_CLIENT': 'HDFS Client', http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php ---------------------------------------------------------------------- diff --git a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php b/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php index d15b023..067b7ff 100644 --- a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php +++ b/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php @@ -197,9 +197,9 @@ function hdp_mon_generate_response( $response_data ) continue; } if (getParameter($object, "service_description") == WEBHCAT_SERVICE_CHECK) { - $services_object["WEBHCAT"] = getParameter($object, "last_hard_state"); - if ($services_object["WEBHCAT"] >= 1) { - $services_object["WEBHCAT"] = 1; + $services_object["HIVE"] = getParameter($object, "last_hard_state"); + if ($services_object["HIVE"] >= 1) { + $services_object["HIVE"] = 1; } continue; } @@ -381,6 +381,7 @@ function hdp_mon_generate_response( $response_data ) break; case "HIVE-METASTORE": case "HIVE-SERVER": + case "WEBHCAT": $pieces[0] = "HIVE"; break; case "ZKSERVERS": @@ -413,7 +414,6 @@ function hdp_mon_generate_response( $response_data ) case "HBASE": case "ZOOKEEPER": case "OOZIE": - case "WEBHCAT": case "GANGLIA": case "STORM": case "FALCON": http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java ---------------------------------------------------------------------- diff --git a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java index c52a27e..a6528b2 100644 --- a/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java +++ b/contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java @@ -167,7 +167,7 @@ public class ClusterDefinition { componentServiceMap.put("HIVE_METASTORE", "HIVE"); componentServiceMap.put("HIVE_CLIENT", "HIVE"); componentServiceMap.put("OOZIE_SERVER", "OOZIE"); - componentServiceMap.put("WEBHCAT_SERVER", "WEBHCAT"); + componentServiceMap.put("WEBHCAT_SERVER", "HIVE"); componentServiceMap.put("FLUME_SERVER", "FLUME"); componentServiceMap.put("HBASE_MASTER", "HBASE"); componentServiceMap.put("HBASE_REGIONSERVER", "HBASE"); http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java ---------------------------------------------------------------------- diff --git a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java index 0db728e..902b812 100644 --- a/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java +++ b/contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ClusterDefinitionTest.java @@ -45,7 +45,6 @@ public class ClusterDefinitionTest { Assert.assertTrue(services.contains("HBASE")); Assert.assertTrue(services.contains("ZOOKEEPER")); Assert.assertTrue(services.contains("HIVE")); - Assert.assertTrue(services.contains("WEBHCAT")); } @Test @@ -88,9 +87,6 @@ public class ClusterDefinitionTest { components = clusterDefinition.getComponents("OOZIE"); Assert.assertTrue(components.contains("OOZIE_SERVER")); - components = clusterDefinition.getComponents("WEBHCAT"); - Assert.assertTrue(components.contains("WEBHCAT_SERVER")); - components = clusterDefinition.getComponents("HBASE"); Assert.assertTrue(components.contains("HBASE_MASTER")); Assert.assertTrue(components.contains("HBASE_REGIONSERVER")); http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1 ---------------------------------------------------------------------- diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1 b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1 index 09a747f..614c463 100644 --- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1 +++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1 @@ -91,9 +91,8 @@ function GetParentServiceName($componentName) { switch ($componentName) { { 'namenode', 'secondary_namenode', 'datanode', 'zkfc', 'journalnode' -contains $_ } { 'HDFS' } { 'jobtracker', 'tasktracker' -contains $_ } { 'MAPREDUCE' } - { 'hive_server', 'hive_metastore', 'hive_client' -contains $_ } { 'HIVE' } + { 'hive_server', 'hive_metastore','webhcat_server','hive_client' -contains $_ } { 'HIVE' } 'templeton' { 'TEMPLETON' } - 'webhcat_server' { 'WEBHCAT' } 'oozie_server' { 'OOZIE' } 'pig' { 'PIG' } 'sqoop' { 'SQOOP' } http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_status.json ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_status.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_status.json index 59dd8db..861f7cd 100644 --- a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_status.json +++ b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_status.json @@ -27,12 +27,6 @@ }, { "ServiceInfo" : { - "service_name" : "HCATALOG", - "state" : "INSTALLED" - } - }, - { - "ServiceInfo" : { "service_name" : "HDFS", "state" : "STARTED" } @@ -87,12 +81,6 @@ }, { "ServiceInfo" : { - "service_name" : "WEBHCAT", - "state" : "STARTED" - } - }, - { - "ServiceInfo" : { "service_name" : "YARN", "state" : "STARTED" }
