incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r1339727 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/db/schema.dump hmc/html/addNodesWizard.php hmc/js/selectComponents.js
Date Thu, 17 May 2012 17:24:41 GMT
Author: ramya
Date: Thu May 17 17:24:41 2012
New Revision: 1339727

URL: http://svn.apache.org/viewvc?rev=1339727&view=rev
Log:
AMBARI-259. add nodes to a cluster gives an option for ganglia and dashboard, these should
be on by default

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/db/schema.dump
    incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php
    incubator/ambari/branches/ambari-186/hmc/js/selectComponents.js

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1339727&r1=1339726&r2=1339727&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu May 17 17:24:41 2012
@@ -2,6 +2,9 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-259. add nodes to a cluster gives an option for ganglia and dashboard,
+  these should be on by default (Vinod via ramya)
+
   AMBARI-262. Init Wizard: Advanced Config validation errors can be bypassed 
   (Vinod via ramya)
 

Modified: incubator/ambari/branches/ambari-186/hmc/db/schema.dump
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/db/schema.dump?rev=1339727&r1=1339726&r2=1339727&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/db/schema.dump (original)
+++ incubator/ambari/branches/ambari-186/hmc/db/schema.dump Thu May 17 17:24:41 2012
@@ -51,7 +51,7 @@ INSERT OR REPLACE INTO "Services" ( serv
 INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description )
VALUES
   ( "TEMPLETON", "Templeton", '{ "runnable": true, "mustInstall": false, "editable": true,
"noDisplay": false }',  "Webservice APIs for Apache Hadoop" );
 INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description )
VALUES
-  ( "DASHBOARD", "Dashboard", '{ "runnable": true, "mustInstall": true, "editable": false,
"noDisplay": false }',  "Monitoring Dashboard for HDP" );
+  ( "DASHBOARD", "Dashboard", '{ "runnable": true, "mustInstall": true, "editable": false,
"noDisplay": true }',  "Monitoring Dashboard for HDP" );
 INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description )
VALUES
   ( "NAGIOS", "Nagios", '{ "runnable": true, "mustInstall": true, "editable": false, "noDisplay":
false }',  "Nagios-based Monitoring for HDP" );
 INSERT OR REPLACE INTO "Services" ( service_name, display_name, attributes, description )
VALUES
@@ -347,7 +347,7 @@ INSERT OR REPLACE INTO "ConfigProperties
 -- maps to hbase_regionserver_heapsize in gscluster in MB.
 INSERT OR REPLACE INTO "ConfigProperties" ( key, default_value, display_name, description,
service_name, display_type, display_attributes ) VALUES ( "hbase_regionserver_heapsize", "1024",
"JVM Heap Size for HBase Region Servers", "JVM heap size for HBase region servers", "HBASE"
, "", '{ "isPassword": false, "noDisplay": false, "reconfigurable": true, "displayType": "text"
}' );
 
-INSERT OR REPLACE INTO "ConfigProperties" ( key, default_value, display_name, description,
service_name, display_type, display_attributes ) VALUES ( "lzo_enabled", "false", "Lzo compression",
"Lzo compression enabled", "MAPREDUCE" , "", '{ "isPassword": false, "noDisplay": false, "reconfigurable":
true, "displayType": "text" }' );
+INSERT OR REPLACE INTO "ConfigProperties" ( key, default_value, display_name, description,
service_name, display_type, display_attributes ) VALUES ( "lzo_enabled", "false", "Lzo compression",
"Lzo compression enabled", "MAPREDUCE" , "ONOFF", '{ "isPassword": false, "noDisplay": false,
"reconfigurable": true, "displayType": "text" }' );
 INSERT OR REPLACE INTO "ConfigProperties" ( key, default_value, display_name, description,
service_name, display_type, display_attributes ) VALUES ( "snappy_enabled", "true", "Snappy
compression", "Snappy compression enabled", "MAPREDUCE" , "NODISPLAY", '{ "isPassword": false,
"noDisplay": true, "reconfigurable": false, "displayType": "text" }' );
 
 --                                        Done with gsCluster.properties

Modified: incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php?rev=1339727&r1=1339726&r2=1339727&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/html/addNodesWizard.php Thu May 17 17:24:41 2012
@@ -87,16 +87,7 @@
                 <fieldset>
                   <!--<legend>Select Services</legend>-->
                   <form id="addNodesDataFormId">
-              <div name="selectComponentsDynamicRenderDiv" id="selectComponentsDynamicRenderDivId"></div>
-
-                    <!-- <p>
-                    <label for="installMapReduceId">MapReduce (TASKTRACKER)</label>
-                    <input type="checkbox" name="installMR" id="installMRId" value="installMapReduceValue"
disabled="disabled" checked="yes">
-                    </p>
-                    <p>
-                    <label for="installHdfsId">HDFS (DATANODE)</label>
-                    <input type="checkbox" name="installHDFS" id="installHDFSId" value="installHdfsValue"
disabled="disabled" checked="yes">
-                    </p> -->
+                    <div name="selectComponentsDynamicRenderDiv" id="selectComponentsDynamicRenderDivId"></div>
                   </form>
                 </fieldset>
                 <button class="btn btn-large" id="deployAddedNodesSubmitButtonId">Deploy
Nodes</button>

Modified: incubator/ambari/branches/ambari-186/hmc/js/selectComponents.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/selectComponents.js?rev=1339727&r1=1339726&r2=1339727&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/selectComponents.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/selectComponents.js Thu May 17 17:24:41 2012
@@ -37,7 +37,7 @@ function getServiceComponentListAndRende
     // At this phase, we do not worry about dependencies because these are
     // just slaves and each slave is independent of the other
     for (serviceName in data['services'])  {
-      if (data['services'][serviceName]['isEnabled'] != "0") {
+      if (data['services'][serviceName]['isEnabled'] != "0" && data['services'][serviceName]['attributes']['noDisplay']
== false) {
         component = data['services'][serviceName]['components'];
         for (componentName in component) {
           if (component[componentName]['isMaster'] == null && 
@@ -48,7 +48,7 @@ function getServiceComponentListAndRende
                 !component[componentName]['isClient']) {
             divContent += '<li class="selectServicesEntry" name=try>';
             divContent +=   '<label for="install' + serviceName + 'Id">' + component[componentName]['displayName']
+ '</label>'
-                        +   '<input type="checkbox" name="' + serviceName + '" id="install'
+ serviceName + 'Id" value="' + component[componentName]["componentName"] + '"/>'
+                        +   '<input type="checkbox" disabled="disabled" checked="yes"
name="' + serviceName + '" id="install' + serviceName + 'Id" value="' + component[componentName]["componentName"]
+ '"/>'
                         +   '<div class="contextualhelp">' + component[componentName]['description']
+ '</div>'
                         + '</li>';
           } else {



Mime
View raw message