浏览代码

AMBARI-5110 Storm: Remove LogviewerServer from the list of masters. (Buzhor Denys via ababiichuk)

aBabiichuk 11 年之前
父节点
当前提交
a1ce9d3516

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

@@ -1585,7 +1585,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
       case 'STORM':
         var masterHostComponents = [
           { name: 'STORM_UI_SERVER', propertyName: 'stormuiserver_host' },
-          { name: 'LOGVIEWER_SERVER', propertyName: 'logviewerserver_host' },
           { name: 'DRPC_SERVER', propertyName: 'drpcserver_host' },
           { name: 'STORM_REST_API', propertyName: 'storm_rest_api_host' }
         ];

+ 0 - 1
ambari-web/app/controllers/wizard/step5_controller.js

@@ -442,7 +442,6 @@ App.WizardStep5Controller = Em.Controller.extend({
       case 'FALCON_SERVER':
         return this.getOozieServer(noOfHosts);
       case 'STORM_UI_SERVER':
-      case 'LOGVIEWER_SERVER':
       case 'DRPC_SERVER':
       case 'STORM_REST_API':
       case 'NIMBUS':

+ 0 - 14
ambari-web/app/data/HDP2/global_properties.js

@@ -1372,20 +1372,6 @@ module.exports =
       "category": "StormUIServer",
       "filename": "global.xml"
     },
-    {
-      "id": "puppet var",
-      "name": "logviewerserver_host",
-      "displayName": "Logviewer Server host",
-      "description": "The host that has been assigned to run Logviewer Server",
-      "defaultValue": "",
-      "displayType": "masterHost",
-      "isReconfigurable": false,
-      "isVisible": true,
-      "isRequiredByAgent": false,
-      "serviceName": "STORM",
-      "category": "LogviewerServer",
-      "filename": "global.xml"
-    },
     {
       "id": "puppet var",
       "name": "drpcserver_host",

+ 0 - 6
ambari-web/app/data/review_configs.js

@@ -301,12 +301,6 @@ module.exports = [
             component_value: '',
             isMaster: true
           }),
-          Ember.Object.create({
-            display_name: 'Logviewer Server',
-            component_name: 'LOGVIEWER_SERVER',
-            component_value: '',
-            isMaster: true
-          }),
           Ember.Object.create({
             display_name: 'Supervisor',
             component_name: 'SUPERVISOR',

+ 0 - 8
ambari-web/app/data/service_components.js

@@ -382,14 +382,6 @@ module.exports = new Ember.Set([
     isClient: false,
     description: 'Master component for STORM'
   },
-  {
-    service_name: 'STORM',
-    component_name: 'LOGVIEWER_SERVER',
-    display_name: 'Logviewer Server',
-    isMaster: true,
-    isClient: false,
-    description: 'Master component for STORM'
-  },
   {
     service_name: 'STORM',
     component_name: 'DRPC_SERVER',

+ 0 - 1
ambari-web/app/data/service_configs.js

@@ -256,7 +256,6 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'StormUIServer', displayName : 'Storm UI Server'}),
       App.ServiceConfigCategory.create({ name: 'StormRestApi', displayName : 'Storm REST API Server'}),
       App.ServiceConfigCategory.create({ name: 'DRPCServer', displayName : 'DRPC Server'}),
-      App.ServiceConfigCategory.create({ name: 'LogviewerServer', displayName : 'Logviewer Server'}),
       App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
       App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
       App.ServiceConfigCategory.create({ name: 'AdvancedStormSite', displayName : 'Custom storm.yaml', siteFileName: 'storm-site.xml', canAddProperty: true})

+ 0 - 1
ambari-web/app/mappers/server_data_mapper.js

@@ -246,7 +246,6 @@ App.QuickDataMapper.componentServiceMap = function () {
     'SUPERVISOR': 'STORM',
     'STORM_UI_SERVER': 'STORM',
     'DRPC_SERVER': 'STORM',
-    'LOGVIEWER_SERVER': 'STORM',
     'STORM_REST_API': 'STORM'
   }
 };

+ 0 - 1
ambari-web/app/models/host_component.js

@@ -81,7 +81,6 @@ App.HostComponent = DS.Model.extend({
       case 'FALCON_SERVER':
       case 'NIMBUS':
       case 'STORM_UI_SERVER':
-      case 'LOGVIEWER_SERVER':
       case 'DRPC_SERVER':
       case 'STORM_REST_API':
       case 'RESOURCEMANAGER':

+ 0 - 3
ambari-web/app/models/service_config.js

@@ -414,9 +414,6 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'falconserver_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'FALCON_SERVER').hostName);
         break;
-      case 'logviewerserver_host':
-        this.set('value', masterComponentHostsInDB.findProperty('component', 'LOGVIEWER_SERVER').hostName);
-        break;
       case 'drpcserver_host':
         this.set('value', masterComponentHostsInDB.findProperty('component', 'DRPC_SERVER').hostName);
         break;

+ 0 - 1
ambari-web/app/utils/helper.js

@@ -239,7 +239,6 @@ App.format = {
     'KERBEROS_ADMIN_CLIENT': 'Kerberos Admin Client',
     'KERBEROS_CLIENT': 'Kerberos Client',
     'KERBEROS_SERVER': 'Kerberos Server',
-    'LOGVIEWER_SERVER': 'Logviewer Server',
     'MAPREDUCE2_CLIENT': 'MapReduce2 Client',
     'MAPREDUCE2_SERVICE_CHECK': 'MapReduce2 Service Check',
     'MAPREDUCE_CLIENT': 'MapReduce Client',