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/30 12:04:38 UTC
git commit: AMBARI-4346. Falcon: E2E Integration. (Mikhail Bayuk via
akovalenko)
Updated Branches:
refs/heads/trunk 3035db82f -> 8a415ee1f
AMBARI-4346. Falcon: E2E Integration. (Mikhail Bayuk via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a415ee1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a415ee1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a415ee1
Branch: refs/heads/trunk
Commit: 8a415ee1f4314abf63c1e3ac1a83630a9582878d
Parents: 3035db8
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Jan 30 13:04:07 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Jan 30 13:04:07 2014 +0200
----------------------------------------------------------------------
.../assets/data/alerts/HDP2/service_alerts.json | 20 +++
.../app/assets/data/clusters/HDP2/cluster.json | 4 -
.../app/assets/data/clusters/cluster.json | 3 -
.../assets/data/hosts/HDP2/hc_host_status.json | 11 +-
.../app/assets/data/hosts/HDP2/hosts.json | 10 +-
.../app/assets/data/wizard/stack/stacks.json | 2 +-
.../app/controllers/wizard/step8_controller.js | 14 ++
ambari-web/app/data/HDP2/global_properties.js | 47 ++++-
ambari-web/app/data/HDP2/site_properties.js | 173 +++++++++++++++++++
ambari-web/app/data/service_components.js | 8 +
ambari-web/app/mappers/server_data_mapper.js | 1 +
.../app/mappers/service_metrics_mapper.js | 3 +-
ambari-web/app/models/quick_links.js | 9 +-
ambari-web/app/models/service.js | 3 +-
ambari-web/app/utils/helper.js | 3 +
15 files changed, 291 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/assets/data/alerts/HDP2/service_alerts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/alerts/HDP2/service_alerts.json b/ambari-web/app/assets/data/alerts/HDP2/service_alerts.json
index 96ce37b..2bd4e07 100644
--- a/ambari-web/app/assets/data/alerts/HDP2/service_alerts.json
+++ b/ambari-web/app/assets/data/alerts/HDP2/service_alerts.json
@@ -17,6 +17,26 @@
"output" : "Connection refused"
},
{
+ "description" : "Falcon server down on dev01.hortonworks.com",
+ "host_name" : "dev01.hortonworks.com",
+ "last_status" : "CRITICAL",
+ "last_status_time" : 1389636534,
+ "service_name" : "FALCON",
+ "status" : "CRITICAL",
+ "status_time" : 1389793060,
+ "output" : "Connection refused"
+ },
+ {
+ "description" : "Falcon host CPU utilization on dev01.hortonworks.com",
+ "host_name" : "dev01.hortonworks.com",
+ "last_status" : "OK",
+ "last_status_time" : 1389636534,
+ "service_name" : "FALCON",
+ "status" : "OK",
+ "status_time" : 1389793060,
+ "output" : "1 CPU, load 19.0% < 200% : OK"
+ },
+ {
"description" : "DataNode space",
"host_name" : "dev01.hortonworks.com",
"last_status" : "CRITICAL",
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/assets/data/clusters/HDP2/cluster.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/clusters/HDP2/cluster.json b/ambari-web/app/assets/data/clusters/HDP2/cluster.json
index 07e5d7a..9d01a5c 100644
--- a/ambari-web/app/assets/data/clusters/HDP2/cluster.json
+++ b/ambari-web/app/assets/data/clusters/HDP2/cluster.json
@@ -49,10 +49,6 @@
"user" : "admin",
"tag" : "version1"
},
- "falcon-site" : {
- "user" : "admin",
- "tag" : "version1"
- },
"storm-site" : {
"user" : "admin",
"tag" : "version1"
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/assets/data/clusters/cluster.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/clusters/cluster.json b/ambari-web/app/assets/data/clusters/cluster.json
index 894c8fc..19f916d 100644
--- a/ambari-web/app/assets/data/clusters/cluster.json
+++ b/ambari-web/app/assets/data/clusters/cluster.json
@@ -32,9 +32,6 @@
"hue-site" : {
"tag" : "version1"
},
- "falcon-site" : {
- "tag" : "version1"
- },
"storm-site" : {
"tag" : "version1"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json b/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
index b396e53..824ded0 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
@@ -262,13 +262,22 @@
}
},
{
- "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/FALCON",
+ "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/FALCON_SERVER",
"HostRoles" : {
"cluster_name" : "perf",
"component_name" : "FALCON_SERVER",
"host_name" : "dev01.hortonworks.com",
"state" : "STARTED"
}
+ },
+ {
+ "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/FALCON_CLIENT",
+ "HostRoles" : {
+ "cluster_name" : "perf",
+ "component_name" : "FALCON_CLIENT",
+ "host_name" : "dev01.hortonworks.com",
+ "state" : "STARTED"
+ }
}
]
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/assets/data/hosts/HDP2/hosts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/hosts/HDP2/hosts.json b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
index d80919a..5ae93d7 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hosts.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
@@ -333,12 +333,20 @@
}
},
{
- "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/FALCON",
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/FALCON_SERVER",
"HostRoles" : {
"cluster_name" : "c1",
"component_name" : "FALCON_SERVER",
"host_name" : "dev01.hortonworks.com"
}
+ },
+ {
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/FALCON_CLIENT",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "FALCON_CLIENT",
+ "host_name" : "dev01.hortonworks.com"
+ }
}
],
"alerts" : {
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/assets/data/wizard/stack/stacks.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/stacks.json b/ambari-web/app/assets/data/wizard/stack/stacks.json
index c52aa19..ebf9d7b 100644
--- a/ambari-web/app/assets/data/wizard/stack/stacks.json
+++ b/ambari-web/app/assets/data/wizard/stack/stacks.json
@@ -879,7 +879,7 @@
"StackServices" : {
"comments" : "Falcon server",
"service_name" : "FALCON",
- "service_version" : "0.3",
+ "service_version" : "0.4",
"stack_name" : "HDP",
"stack_version" : "2.0.5",
"user_name" : "falcon"
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index f3ab770..7e39e47 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1072,6 +1072,9 @@ App.WizardStep8Controller = Em.Controller.extend({
if (selectedServices.someProperty('serviceName', 'PIG')) {
this.get('serviceConfigTags').pushObject(this.createLog4jObj('PIG'));
}
+ if (selectedServices.someProperty('serviceName', 'FALCON')) {
+ this.get('serviceConfigTags').pushObject(this.createFalconSiteObj('FALCON'));
+ }
if (selectedServices.someProperty('serviceName', 'STORM')) {
this.get('serviceConfigTags').pushObject(this.createStormSiteObj());
}
@@ -1415,6 +1418,17 @@ App.WizardStep8Controller = Em.Controller.extend({
return {type: 'tez-site', tag: 'version1', properties: tezProperty};
},
+
+ createFalconSiteObj: function (s) {
+ var configs = this.get('configs').filterProperty('filename', 'oozie-site.xml');
+ var falconProperties = {};
+ configs.forEach(function (_configProperty) {
+ falconProperties[_configProperty.name] = App.config.escapeXMLCharacters(_configProperty.value);
+ this._recordHostOverrideFromObj(_configProperty, 'oozie-site', 'version1', this);
+ }, this);
+ return {type: 'oozie-site', tag: 'version1', properties: falconProperties};
+ },
+
ajaxQueueFinished: function () {
//do something
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/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 a6d7e27..fc0c6b4 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -1313,17 +1313,56 @@ module.exports =
/**********************************************FALCON***************************************/
{
"id": "puppet var",
- "name": "falcon_dir",
- "displayName": "Run directory for Falcon",
+ "name": "falcon_user",
+ "displayName": "Falcon user",
"description": "",
- "defaultValue": "/var/run/falcon",
- "isReconfigurable": false,
+ "defaultValue": "falcon",
+ "isReconfigurable": true,
+ "displayType": "user",
+ "isVisible": true,
+ "isRequiredByAgent": true,
+ "serviceName": "FALCON",
+ "category": "Falcon"
+ },
+ {
+ "id": "puppet var",
+ "name": "falcon_port",
+ "displayName": "Falcon server port",
+ "description": "",
+ "defaultValue": "15000",
+ "isReconfigurable": true,
+ "displayType": "int",
+ "isVisible": true,
+ "isRequiredByAgent": true,
+ "serviceName": "FALCON",
+ "category": "Falcon"
+ },
+ {
+ "id": "puppet var",
+ "name": "falcon_local_dir",
+ "displayName": "Falcon directory to store different data",
+ "description": "",
+ "defaultValue": "/hadoop/falcon",
+ "isReconfigurable": true,
"displayType": "directory",
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "FALCON",
"category": "Falcon"
},
+ {
+ "id": "puppet var",
+ "name": "falcon_store_uri",
+ "displayName": "Falcon store URI",
+ "description": "",
+ "defaultValue": "file:///hadoop/falcon/store",
+ "isReconfigurable": true,
+ "displayType": "string",
+ "isVisible": true,
+ "isRequiredByAgent": true,
+ "serviceName": "FALCON",
+ "category": "Falcon"
+ },
/**********************************************STORM***************************************/
{
"id": "puppet var",
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/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 01ed45d..8cfdd07 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1677,6 +1677,179 @@ module.exports =
"defaultValue": "5000",
"displayType": "int"
},
+ /*********************************************oozie-site for Falcon*****************************/
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":true,
+ "isVisible":true,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon proxyuser hosts",
+ "name":"oozie.service.ProxyUserService.proxyuser.falcon.hosts",
+ "defaultValue":"*",
+ "displayType":"advanced"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":true,
+ "isVisible":true,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon proxyuser groups",
+ "name":"oozie.service.ProxyUserService.proxyuser.falcon.groups",
+ "defaultValue":"*",
+ "displayType":"advanced"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":false,
+ "isVisible":false,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon",
+ "name":"oozie.service.ELService.ext.functions.coord-job-submit-instances",
+ "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,"
+ + "today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,"
+ + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,"
+ + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,"
+ + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,"
+ + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,"
+ + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,"
+ + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,"
+ + "latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,"
+ + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo",
+ "displayType":"multiLine"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":false,
+ "isVisible":false,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon",
+ "name":"oozie.service.ELService.ext.functions.coord-action-create-inst",
+ "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,"
+ + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,"
+ + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,"
+ + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,"
+ + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,"
+ + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,"
+ + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,"
+ + "latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,"
+ + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,"
+ + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,"
+ + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
+ "displayType":"multiLine"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":false,
+ "isVisible":false,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon",
+ "name": "oozie.service.ELService.ext.functions.coord-action-create",
+ "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,"
+ + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,"
+ + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,"
+ + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,"
+ + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,"
+ + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,"
+ + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,"
+ + "latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,"
+ + "future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,"
+ + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,"
+ + "user=org.apache.oozie.coord.CoordELFunctions#coord_user,",
+ "displayType":"multiLine"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":false,
+ "isVisible":false,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon",
+ "name":"oozie.service.ELService.ext.functions.coord-job-submit-data",
+ "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,"
+ + "today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,"
+ + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,"
+ + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,"
+ + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,"
+ + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,"
+ + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,"
+ + "dataIn=org.apache.oozie.extensions.OozieELExtensions#ph1_dataIn_echo,"
+ + "instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_wrap,"
+ + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,"
+ + "dateOffset=org.apache.oozie.coord.CoordELFunctions#ph1_coord_dateOffset_echo,"
+ + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
+ "displayType":"multiLine"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":false,
+ "isVisible":false,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon",
+ "name":"oozie.service.ELService.ext.functions.coord-action-start",
+ "defaultValue":"now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,"
+ + "today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,"
+ + "yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,"
+ + "currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth,"
+ + "lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth,"
+ + "currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear,"
+ + "lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear,"
+ + "latest=org.apache.oozie.coord.CoordELFunctions#ph3_coord_latest,"
+ + "future=org.apache.oozie.coord.CoordELFunctions#ph3_coord_future,"
+ + "dataIn=org.apache.oozie.extensions.OozieELExtensions#ph3_dataIn,"
+ + "instanceTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_nominalTime,"
+ + "dateOffset=org.apache.oozie.coord.CoordELFunctions#ph3_coord_dateOffset,"
+ + "formatTime=org.apache.oozie.coord.CoordELFunctions#ph3_coord_formatTime,"
+ + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
+ "displayType":"multiLine"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":false,
+ "isVisible":false,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon",
+ "name":"oozie.service.ELService.ext.functions.coord-sla-submit",
+ "defaultValue":"instanceTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_nominalTime_echo_fixed,"
+ + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
+ "displayType":"multiLine"
+ },
+ {
+ "id":"site property",
+ "description":"",
+ "isReconfigurable":false,
+ "isVisible":false,
+ "isRequiredByAgent": true,
+ "serviceName":"FALCON",
+ "category":"Advanced",
+ "displayName":"Falcon",
+ "name":"oozie.service.ELService.ext.functions.coord-sla-create",
+ "defaultValue":"instanceTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_nominalTime,"
+ + "user=org.apache.oozie.coord.CoordELFunctions#coord_user",
+ "displayType":"multiLine"
+ },
/**********************************************webhcat-site***************************************/
{
"id": "site property",
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/data/service_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_components.js b/ambari-web/app/data/service_components.js
index 232b328..1efe894 100644
--- a/ambari-web/app/data/service_components.js
+++ b/ambari-web/app/data/service_components.js
@@ -350,6 +350,14 @@ module.exports = new Ember.Set([
description: 'Falcon Server for mirroring'
},
{
+ service_name: 'FALCON',
+ component_name: 'FALCON_CLIENT',
+ display_name: 'Falcon Client',
+ isMaster: false,
+ isClient: true,
+ description: 'Falcon Client for mirroring'
+ },
+ {
service_name: 'STORM',
component_name: 'NIMBUS',
display_name: 'Nimbus',
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/mappers/server_data_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/server_data_mapper.js b/ambari-web/app/mappers/server_data_mapper.js
index b15bcae..1939c46 100644
--- a/ambari-web/app/mappers/server_data_mapper.js
+++ b/ambari-web/app/mappers/server_data_mapper.js
@@ -217,6 +217,7 @@ App.QuickDataMapper.componentServiceMap = function () {
'HUE_SERVER': 'HUE',
'GLUSTERFS_CLIENT': 'GLUSTERFS',
'FALCON_SERVER': 'FALCON',
+ 'FALCON_CLIENT': 'FALCON',
'NIMBUS': 'STORM',
'SUPERVISOR': 'STORM',
'STORM_UI_SERVER': 'STORM',
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index 66af2ca..9c70194 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -316,7 +316,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
GANGLIA: [20],
NAGIOS: [21],
HUE: [22],
- STORM: [31]
+ STORM: [31],
+ FALCON: [32]
};
if (quickLinks[item.ServiceInfo.service_name])
finalJson.quick_links = quickLinks[item.ServiceInfo.service_name];
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index 0118b35..87b78ad 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -419,10 +419,11 @@ App.QuickLinks.FIXTURES = [
label:'Falcon Server UI',
url:'%@://%@:%@/stacks',
service_id: 'FALCON',
- template:'%@://%@:%@/html5-ui',
- site: 'falcon-site',
+ template:'%@://%@:%@/falcon',
+ http_config: 'mapreduce.jobhistory.webapp.address',
+ https_config: 'mapreduce.jobhistory.webapp.https.address',
+ site: 'hdfs-site',
regex: portRegex,
- default_http_port: 16000
-
+ default_http_port: 15000
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/models/service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service.js b/ambari-web/app/models/service.js
index 9da67cf..6244da9 100644
--- a/ambari-web/app/models/service.js
+++ b/ambari-web/app/models/service.js
@@ -77,7 +77,8 @@ App.Service = DS.Model.extend({
"GANGLIA",
"HUE",
"TEZ",
- "STORM"
+ "STORM",
+ "FALCON"
];
return configurableServices.contains(this.get('serviceName'));
}.property('serviceName'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a415ee1/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 85996c5..8f9c6dd 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -193,6 +193,9 @@ App.format = {
'SUPERVISOR': 'Supervisor',
'TASKTRACKER': 'TaskTracker',
'TEZ_CLIENT': 'Tez Client',
+ 'FALCON_SERVICE_CHECK': 'Falcon Service Check',
+ 'FALCON_SERVER': 'Falcon Server',
+ 'FALCON': 'Falcon',
'WEBHCAT_SERVER': 'WebHCat Server',
'WEBHCAT_SERVICE_CHECK': 'WebHCat Service Check',
'YARN_CLIENT': 'YARN Client',