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 2014/08/18 22:23:31 UTC

git commit: AMBARI-6901. Flume agents are absent after configuring flume.conf and restart. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/trunk 1a9abc4ed -> e7d864ca0


AMBARI-6901. Flume agents are absent after configuring flume.conf and restart. (jaimin)


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

Branch: refs/heads/trunk
Commit: e7d864ca0f0eed4f7011e34131ec6f7f7756d377
Parents: 1a9abc4
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Mon Aug 18 13:21:45 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Mon Aug 18 13:23:22 2014 -0700

----------------------------------------------------------------------
 .../services/FLUME/configuration/flume-conf.xml |  2 +-
 ambari-web/app/data/HDP2/site_properties.js     | 24 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e7d864ca/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml
index 838491d..74a4c15 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-conf.xml
@@ -22,7 +22,7 @@
 
 <configuration supports_final="false">
   <property>
-    <name>flume-content</name>
+    <name>content</name>
     <description>Describe all the Flume agent configurations</description>
     <value>
 # Flume agent config

http://git-wip-us.apache.org/repos/asf/ambari/blob/e7d864ca/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index edadbc8..169840f 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1640,7 +1640,7 @@ module.exports =
   /********************************************* flume-agent *****************************/
     {
       "id": "site property",
-      "name": "flume-content",
+      "name": "content",
       "displayName": "content",
       "showLabel": false,
       "isRequired": false,
@@ -1966,17 +1966,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "min_user_id",
-      "displayName": "Minimum user ID for submitting job",
-      "isOverridable": true,
-      "displayType": "int",
-      "isVisible": true,
-      "serviceName": "YARN",
-      "filename": "yarn-env.xml",
-      "category": "Advanced"
-    },
-    {
-      "id": "puppet var",
       "name": "yarn_pid_dir_prefix",
       "displayName": "YARN PID Dir Prefix",
       "description": "",
@@ -1991,6 +1980,17 @@ module.exports =
     },
     {
       "id": "puppet var",
+      "name": "min_user_id",
+      "displayName": "Minimum user ID for submitting job",
+      "isOverridable": true,
+      "displayType": "int",
+      "isVisible": true,
+      "serviceName": "YARN",
+      "filename": "yarn-env.xml",
+      "category": "Advanced yarn-env"
+    },
+    {
+      "id": "puppet var",
       "name": "ats_host",
       "displayName": "App Timeline Server",
       "description": "Application Timeline Server Host",