Browse Source

AMBARI-5377. Add Flume service to Ambari installer UI. (akovalenko)

Aleksandr Kovalenko 11 years ago
parent
commit
90973d3d06

+ 11 - 0
ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json

@@ -165,6 +165,17 @@
         "comments" : "Apache Hadoop Stream processing framework",
         "service_version" : "0.9.0.1"
       }
+    },
+    {
+      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/FLUME",
+      "StackServices" : {
+        "user_name" : "root",
+        "stack_version" : "2.0.1",
+        "service_name" : "FLUME",
+        "stack_name" : "HDP",
+        "comments" : "Efficiently collects, aggregates, and moves large amounts of log data",
+        "service_version" : "1.4.0"
+      }
     }
   ]
 }

+ 2 - 1
ambari-web/app/config.js

@@ -76,7 +76,8 @@ App.supports = {
   appTimelineServer: true,
   jobs: true,
   ubuntu: true,
-  views: false
+  views: false,
+  flume: false
 };
 
 if (App.enableExperimental) {

+ 1 - 2
ambari-web/app/controllers/wizard.js

@@ -499,10 +499,9 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
   },
 
   loadServicesFromServer: function () {
-    var services = this.getDBProperty('service');
     var apiService = this.loadServiceComponents();
     this.set('content.services', apiService);
-    this.setDBProperty('service',apiService);
+    this.setDBProperty('service', apiService);
   },
   /**
    * Load config groups from local DB

+ 6 - 0
ambari-web/app/controllers/wizard/step6_controller.js

@@ -244,6 +244,12 @@ App.WizardStep6Controller = Em.Controller.extend({
           label: self.getComponentDisplayName('SUPERVISOR')
         }));
       }
+      if (this.isServiceSelected('FLUME')) {
+        headers.pushObject(Em.Object.create({
+          name: 'FLUME_HANDLER',
+          label: self.getComponentDisplayName('FLUME_HANDLER')
+        }));
+      }
       headers.pushObject(Ember.Object.create({
         name: 'CLIENT',
         label: self.getComponentDisplayName('CLIENT')

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

@@ -397,6 +397,14 @@ module.exports = new Ember.Set([
     isMaster: true,
     isClient: false,
     description: 'Master component for STORM'
+  },
+  {
+    service_name: 'FLUME',
+    component_name: 'FLUME_HANDLER',
+    display_name: 'Flume Agent',
+    isMaster: false,
+    isClient: false,
+    description: 'Slave component for Flume'
   }
 ]);
 

+ 12 - 0
ambari-web/app/data/services.js

@@ -175,3 +175,15 @@ module.exports = [
     description: Em.I18n.t('services.storm.description')
   }
 ];
+
+if (App.supports.flume) {
+  var flume = {
+    serviceName: 'FLUME',
+    displayName: 'Flume',
+    isDisabled: false,
+    isSelected: true,
+    canBeSelected: true,
+    isHidden: false
+  };
+  module.exports.push(flume);
+}