You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/01/22 17:01:38 UTC
git commit: AMBARI-4381. Add Services does not work because of ATS UI
changes. (Denys Buzhor via akovalenko)
Updated Branches:
refs/heads/trunk 26fbaef39 -> 1b07eaa48
AMBARI-4381. Add Services does not work because of ATS UI changes. (Denys Buzhor via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b07eaa4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b07eaa4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b07eaa4
Branch: refs/heads/trunk
Commit: 1b07eaa482e43991e0e9243731a246c4dfb7a277
Parents: 26fbaef
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jan 22 18:01:05 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Jan 22 18:01:05 2014 +0200
----------------------------------------------------------------------
ambari-web/app/data/HDP2/global_properties.js | 89 +++++++++++++++-------
1 file changed, 61 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1b07eaa4/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index 18c5ad1..4419817 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -331,34 +331,6 @@ module.exports =
},
{
"id": "puppet var",
- "name": "ats_host",
- "displayName": "App Timeline Server",
- "description": "Application Timeline Server Host",
- "defaultValue": "",
- "isOverridable": false,
- "displayType": "masterHost",
- "isRequiredByAgent": false,
- "isVisible": App.supports.appTimelineServer, // @todo remove test mode check after App Timeline service integration
- "serviceName": "YARN",
- "category": "AppTimelineServer",
- "index": 0
- },
- {
- "id": "puppet var",
- "name": "ats_server_port",
- "displayName": "Server port",
- "description": "Application Timeline Server port",
- "defaultValue": "9292", // @todo add correct value APP_TIMELINE_SERVER.port
- "isOverridable": false,
- "displayType": "int",
- "isRequiredByAgent": true,
- "isVisible": App.supports.appTimelineServer, // @todo remove test mode check after App Timeline service integration
- "serviceName": "YARN",
- "category": "AppTimelineServer",
- "index": 1
- },
- {
- "id": "puppet var",
"name": "resourcemanager_heapsize",
"displayName": "ResourceManager Java heap size",
"description": "Max heapsize for ResourceManager",
@@ -425,6 +397,35 @@ module.exports =
"serviceName": "YARN",
"category": "Advanced"
},
+// @todo uncomment after App Timeline service integration
+// {
+// "id": "puppet var",
+// "name": "ats_host",
+// "displayName": "App Timeline Server",
+// "description": "Application Timeline Server Host",
+// "defaultValue": "",
+// "isOverridable": false,
+// "displayType": "masterHost",
+// "isRequiredByAgent": false,
+// "isVisible": true,
+// "serviceName": "YARN",
+// "category": "AppTimelineServer",
+// "index": 0
+// },
+// {
+// "id": "puppet var",
+// "name": "ats_server_port",
+// "displayName": "Server port",
+// "description": "Application Timeline Server port",
+// "defaultValue": "9292", // @todo add correct value APP_TIMELINE_SERVER.port
+// "isOverridable": false,
+// "displayType": "int",
+// "isRequiredByAgent": false,
+// "isVisible": true,
+// "serviceName": "YARN",
+// "category": "AppTimelineServer",
+// "index": 1
+// },
/**********************************************HBASE***************************************/
{
"id": "puppet var",
@@ -1702,3 +1703,35 @@ module.exports =
]
};
+// @todo remove after App Timeline service integration
+if (App.supports.appTimelineServer) {
+ module.exports.configProperties.push(
+ {
+ "id": "puppet var",
+ "name": "ats_host",
+ "displayName": "App Timeline Server",
+ "description": "Application Timeline Server Host",
+ "defaultValue": "",
+ "isOverridable": false,
+ "displayType": "masterHost",
+ "isRequiredByAgent": false,
+ "isVisible": true,
+ "serviceName": "YARN",
+ "category": "AppTimelineServer",
+ "index": 0
+ },
+ {
+ "id": "puppet var",
+ "name": "ats_server_port",
+ "displayName": "Server port",
+ "description": "Application Timeline Server port",
+ "defaultValue": "9292",
+ "isOverridable": false,
+ "displayType": "int",
+ "isRequiredByAgent": false,
+ "isVisible": true,
+ "serviceName": "YARN",
+ "category": "AppTimelineServer",
+ "index": 1
+ });
+}