ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject [1/2] git commit: AMBARI-5377. Add Flume service to Ambari installer UI. (akovalenko)
Date Mon, 07 Apr 2014 18:09:21 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7ef2daf6b -> 53e0f8da2


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90973d3d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90973d3d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90973d3d

Branch: refs/heads/trunk
Commit: 90973d3d0689910eb615aa033134ef757fea6acc
Parents: 7ef2daf
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Mon Apr 7 21:05:59 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Mon Apr 7 21:05:59 2014 +0300

----------------------------------------------------------------------
 .../app/assets/data/wizard/stack/hdp/version/2.0.1.json | 11 +++++++++++
 ambari-web/app/config.js                                |  3 ++-
 ambari-web/app/controllers/wizard.js                    |  3 +--
 ambari-web/app/controllers/wizard/step6_controller.js   |  6 ++++++
 ambari-web/app/data/service_components.js               |  8 ++++++++
 ambari-web/app/data/services.js                         | 12 ++++++++++++
 6 files changed, 40 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/90973d3d/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json b/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
index 414dbec..5a28464 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
+++ b/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"
+      }
     }
   ]
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/90973d3d/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 14313be..217cc9f 100644
--- a/ambari-web/app/config.js
+++ b/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) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/90973d3d/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 548edbb..4affb3b 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/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

http://git-wip-us.apache.org/repos/asf/ambari/blob/90973d3d/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js
index 5d79303..b7f4639 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/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')

http://git-wip-us.apache.org/repos/asf/ambari/blob/90973d3d/ambari-web/app/data/service_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_components.js b/ambari-web/app/data/service_components.js
index a5fe3db..f066c46 100644
--- a/ambari-web/app/data/service_components.js
+++ b/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'
   }
 ]);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/90973d3d/ambari-web/app/data/services.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/services.js b/ambari-web/app/data/services.js
index b6622a3..f94440b 100644
--- a/ambari-web/app/data/services.js
+++ b/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);
+}


Mime
View raw message