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/21 14:51:40 UTC
git commit: AMBARI-4275. YARN ATS: implement Services > YARN changes.
(Denys Buzhor via akovalenko)
Updated Branches:
refs/heads/trunk e1dffdc50 -> bf2bc70b7
AMBARI-4275. YARN ATS: implement Services > YARN 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/bf2bc70b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf2bc70b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf2bc70b
Branch: refs/heads/trunk
Commit: bf2bc70b7054fbc867b9d20b501de59d946e3852
Parents: e1dffdc
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Jan 21 15:50:39 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Jan 21 15:51:21 2014 +0200
----------------------------------------------------------------------
.../assets/data/alerts/HDP2/service_alerts.json | 22 +++++++++++++++++++-
.../assets/data/hosts/HDP2/hc_host_status.json | 9 ++++++++
.../app/assets/data/hosts/HDP2/hosts.json | 8 +++++++
ambari-web/app/config.js | 1 +
.../app/mappers/service_metrics_mapper.js | 3 ++-
ambari-web/app/models/quick_links.js | 13 ++++++++++++
ambari-web/app/utils/helper.js | 2 ++
7 files changed, 56 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf2bc70b/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 5820c22..96ce37b 100644
--- a/ambari-web/app/assets/data/alerts/HDP2/service_alerts.json
+++ b/ambari-web/app/assets/data/alerts/HDP2/service_alerts.json
@@ -125,6 +125,26 @@
"status" : "OK",
"status_time" : 1389793060,
"output" : "1 CPU, load 19.0% < 200% : OK"
+ },
+ {
+ "description" : "App Timeline Server Web UI",
+ "host_name" : "dev01.hortonworks.com",
+ "last_status" : "WARNING",
+ "last_status_time" : 1389636534,
+ "service_name" : "YARN",
+ "status" : "WARNING",
+ "status_time" : 1389793060,
+ "output" : "1 CPU, load 19.0% < 200% : OK"
+ },
+ {
+ "description" : "App Timeline Server process",
+ "host_name" : "dev01.hortonworks.com",
+ "last_status" : "CRITICAL",
+ "last_status_time" : 1389636534,
+ "service_name" : "HDFS",
+ "status" : "CRITICAL",
+ "status_time" : 1389793060,
+ "output" : "1 CPU, load 19.0% < 200% : OK"
}
],
"summary" : {
@@ -133,4 +153,4 @@
"WARNING" : 2
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf2bc70b/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 efaf5e6..4d87c53 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
@@ -181,6 +181,15 @@
}
},
{
+ "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/APP_TIMELINE_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "perf",
+ "component_name" : "APP_TIMELINE_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/ZOOKEEPER_CLIENT",
"HostRoles" : {
"cluster_name" : "perf",
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf2bc70b/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 0626a35..e82eb49 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hosts.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
@@ -261,6 +261,14 @@
}
},
{
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/APP_TIMELINE_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "APP_TIMELINE_SERVER",
+ "host_name" : "dev01.hortonworks.com"
+ }
+ },
+ {
"href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/ZOOKEEPER_CLIENT",
"HostRoles" : {
"cluster_name" : "c1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf2bc70b/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 542b9d3..8bd445b 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -66,6 +66,7 @@ App.supports = {
highAvailability: true,
deleteHost: true,
autoRollbackHA: false,
+ appTimelineServer: false,
storm: false
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf2bc70b/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 e08e13f..a4670ac 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -455,7 +455,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
// Map
var finalJson = this.parseIt(item, finalConfig);
finalJson.quick_links = [ 23, 24, 25, 26 ];
-
+ if (App.supports.appTimelineServer)
+ finalJson.quick_links.push(33);
return finalJson;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf2bc70b/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 97e728a..240cd2f 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -402,6 +402,19 @@ App.QuickLinks.FIXTURES = [
regex: portRegex,
default_http_port: 8744
},
+ // @todo Add real info about link
+ {
+ id:33,
+ label:'App Timeline Server UI',
+ url:'%@://%@:%@/ats',
+ service_id: 'YARN',
+ template:'%@://%@:%@/ats',
+ http_config: 'yarn.resourcemanager.webapp.address',
+ https_config: 'yarn.resourcemanager.webapp.https.address',
+ site: 'yarn-site',
+ regex: portRegex,
+ default_http_port: 8088
+ },
{
id:32,
label:'Falcon Server UI',
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf2bc70b/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 950a8fb..e6df195 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -270,6 +270,8 @@ App.format = {
return 'MapReduce2 Client';
case 'YARN_CLIENT':
return 'YARN Client';
+ case 'APP_TIMELINE_SERVER':
+ return 'App Timeline Server';
case 'JAVA_JCE':
return 'Java JCE';
case 'KERBEROS_SERVER':