You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/02/16 04:22:35 UTC

svn commit: r1446840 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/data/config_properties.js ambari-web/app/data/service_configs.js

Author: jaimin
Date: Sat Feb 16 03:22:35 2013
New Revision: 1446840

URL: http://svn.apache.org/r1446840
Log:
AMBARI-1440. rrd file location should be configurable through UI. (jaimin)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/data/config_properties.js
    incubator/ambari/trunk/ambari-web/app/data/service_configs.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1446840&r1=1446839&r2=1446840&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Feb 16 03:22:35 2013
@@ -293,6 +293,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1439. rrd file location should be configurable through UI. (jaimin)
+
  AMBARI-1431. Hosts table no longer allows sorting. (yusaku)
 
  AMBARI-1376. Wrong calculation of duration filter on apps page. (jaimin via

Modified: incubator/ambari/trunk/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_properties.js?rev=1446840&r1=1446839&r2=1446840&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Sat Feb 16 03:22:35 2013
@@ -1178,9 +1178,10 @@ module.exports =
       "displayType": "advanced",
       "isVisible": false,
       "domain": "global",
-      "serviceName": "MISC",
+      "serviceName":"MISC",
       "category": "Users and Groups"
     },
+    /*
     {
       "id": "puppet var",
       "name": "ganglia_shell_cmds_dir",
@@ -1207,6 +1208,7 @@ module.exports =
       "serviceName": "MISC",
       "category": "General"
     },
+    */
     {
       "id": "puppet var",
       "name": "hcat_log_dir",
@@ -1589,7 +1591,7 @@ module.exports =
       "isVisible": true,
       "serviceName": "MISC"
     },
-    */
+
     {
       "id": "puppet var",
       "name": "java64_home",
@@ -1603,6 +1605,7 @@ module.exports =
       "domain": "global",
       "serviceName": "MISC"
     },
+     */
     {
       "id": "puppet var",
       "name": "run_dir",
@@ -1659,6 +1662,7 @@ module.exports =
       "serviceName": "HDFS",
       "category": "Advanced"
     },
+    /*
     {
       "id": "puppet var",
       "name": "hcat_metastore_port",
@@ -1685,6 +1689,7 @@ module.exports =
       "domain": "global",
       "serviceName": "MISC"
     },
+
     {
       "id": "puppet var",
       "name": "hcat_dbroot",
@@ -1711,7 +1716,7 @@ module.exports =
       "domain": "global",
       "serviceName": "MISC"
     },
-    /*
+
      {
      "id": "puppet var",
      "name": "hadoop_log_dir",
@@ -1850,6 +1855,7 @@ module.exports =
       "serviceName": "MISC",
       "category": "Users and Groups"
     },
+    /*
     {
       "id": "puppet var",
       "name": "oozie_conf_dir",
@@ -1863,6 +1869,7 @@ module.exports =
       "serviceName": "MISC",
       "category": "General"
     },
+
     {
       "id": "puppet var",
       "name": "pig_conf_dir",
@@ -1876,6 +1883,7 @@ module.exports =
       "serviceName": "MISC",
       "category": "General"
     },
+    */
     {
       "id": "puppet var",
       "name": "pig_user",
@@ -1889,6 +1897,7 @@ module.exports =
       "serviceName": "MISC",
       "category": "Users and Groups"
     },
+    /*
     {
       "id": "puppet var",
       "name": "sqoop_conf_dir",
@@ -1915,6 +1924,7 @@ module.exports =
       "serviceName": "MISC",
       "category": "General"
     },
+    */
     {
       "id": "puppet var",
       "name": "sqoop_user",
@@ -2293,6 +2303,7 @@ module.exports =
       "serviceName": "ZOOKEEPER",
       "category": "ZooKeeper Server"
     },
+    /*
     {
       "id": "puppet var",
       "name": "zk_conf_dir",
@@ -2304,6 +2315,18 @@ module.exports =
       "domain": "global",
       "serviceName": "MISC",
       "category": "General"
+    },
+    */
+    {
+      "id": "puppet var",
+      "name": "rrdcached_base_dir",
+      "displayName": "Ganglia rrd cached base directory",
+      "description": "Default directory for saving the rrd files on ganglia server",
+      "defaultValue": "/var/lib/ganglia/rrds",
+      "displayType": "directory",
+      "domain": "global",
+      "serviceName": "MISC",
+      "category": "General"
     }
 
   ]

Modified: incubator/ambari/trunk/ambari-web/app/data/service_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/service_configs.js?rev=1446840&r1=1446839&r2=1446840&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/service_configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/service_configs.js Sat Feb 16 03:22:35 2013
@@ -117,7 +117,7 @@ module.exports = [
     serviceName: 'MISC',
     displayName: 'Misc',
     configCategories: [
-      /*App.ServiceConfigCategory.create({ name: 'General'}),*/
+      App.ServiceConfigCategory.create({ name: 'General'}),
       App.ServiceConfigCategory.create({ name: 'Users and Groups'})
     ],
     configs: configProperties.filterProperty('serviceName', 'MISC')