You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/02/21 03:57:22 UTC
git commit: AMBARI-4776. Falcon: Add Quick Links menu pointing to
Falcon Web UI. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 6fdaec4ee -> 77e37961e
AMBARI-4776. Falcon: Add Quick Links menu pointing to Falcon Web UI. (xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77e37961
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77e37961
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77e37961
Branch: refs/heads/trunk
Commit: 77e37961ed55cda94c9e37eed3fe01701ba36a9c
Parents: 6fdaec4
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Feb 20 18:56:38 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Feb 20 18:56:38 2014 -0800
----------------------------------------------------------------------
ambari-web/app/mappers/service_metrics_mapper.js | 3 ++-
ambari-web/app/models/quick_links.js | 12 ++++++++++++
ambari-web/app/models/service_config.js | 3 +++
ambari-web/app/views/common/quick_view_link_view.js | 1 +
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/77e37961/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 600aad4..db3bdad 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -314,7 +314,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/77e37961/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 d141f2e..318de08 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -400,5 +400,17 @@ App.QuickLinks.FIXTURES = [
site: 'storm-site',
regex: portRegex,
default_http_port: 8744
+ },
+ {
+ id:32,
+ label:'Falcon Web UI',
+ url:'%@://%@:%@/',
+ service_id: 'FALCON',
+ template:'%@://%@:%@/',
+ http_config: 'falconserver.host',
+ https_config: 'falconserver.host',
+ site: 'oozie-site',
+ regex: portRegex,
+ default_http_port: 15000
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/77e37961/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index e99d170..c5ea65b 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -406,6 +406,9 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'nimbus.host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'NIMBUS').hostName);
break;
+ case 'falconserver.host':
+ this.set('value', masterComponentHostsInDB.findProperty('component', 'FALCON_SERVER').hostName);
+ break;
case 'logviewerserver_host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'LOGVIEWER_SERVER').hostName);
break;
http://git-wip-us.apache.org/repos/asf/ambari/blob/77e37961/ambari-web/app/views/common/quick_view_link_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js
index 93460fc..9afe730 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -244,6 +244,7 @@ App.QuickViewLinks = Em.View.extend({
case "nagios":
case "hue":
case "storm":
+ case "falcon":
return "_blank";
break;
default: