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 2015/10/14 21:05:38 UTC
ambari git commit: AMBARI-13350 HAWQ gpcheck does not appear in the
right section in configuration mithmatt via jaoki
Repository: ambari
Updated Branches:
refs/heads/trunk 703192fd8 -> 5298bde61
AMBARI-13350 HAWQ gpcheck does not appear in the right section in configuration mithmatt via jaoki
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5298bde6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5298bde6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5298bde6
Branch: refs/heads/trunk
Commit: 5298bde6150b7558374ef9999d3a863e99d8265c
Parents: 703192f
Author: jaoki <yo...@example.com>
Authored: Wed Oct 14 12:05:13 2015 -0700
Committer: jaoki <yo...@example.com>
Committed: Wed Oct 14 12:05:13 2015 -0700
----------------------------------------------------------------------
ambari-web/app/data/HDP2.3/site_properties.js | 8 +++++++-
ambari-web/app/models/stack_service.js | 7 +++----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5298bde6/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 70fc4f2..3201301 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -244,7 +244,7 @@ hdp23properties.push({
"filename": "ranger-admin-site.xml",
"category": "ADSettings"
},
- /*********HAWQ************/
+ /*********************************************** HAWQ **********************************************/
{
"name": "hawq_master_address_host",
"displayType": "masterHost",
@@ -315,6 +315,12 @@ hdp23properties.push({
"category": "General",
"serviceName": "HAWQ",
"index": 8
+ },
+ {
+ "name": "content",
+ "serviceName": "HAWQ",
+ "filename": "gpcheck-env.xml",
+ "category": "AdvancedGpcheck"
}
);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5298bde6/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index 9541b36..78059d3 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -179,7 +179,7 @@ App.StackService = DS.Model.extend({
var configTypes = this.get('configTypes');
var serviceComponents = this.get('serviceComponents');
if (configTypes && Object.keys(configTypes).length) {
- var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "HIVE_SERVER2", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$"];
+ var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "HIVE_SERVER2", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$", "AdvancedGpcheck"];
configCategories = App.StackService.configCategories.call(this).filter(function (_configCategory) {
var serviceComponentName = _configCategory.get('name');
var isServiceComponent = serviceComponents.someProperty('componentName', serviceComponentName);
@@ -364,13 +364,12 @@ App.StackService.configCategories = function () {
break;
case 'SQOOP':
break;
-
case 'HAWQ':
serviceConfigCategories.pushObjects([
- App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
+ App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
+ App.ServiceConfigCategory.create({ name: 'AdvancedGpcheck', displayName: 'Advanced gpcheck'})
]);
break;
-
default:
serviceConfigCategories.pushObjects([
App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})