Author: ncole
Date: Thu May 23 18:10:33 2013
New Revision: 1485797
URL: http://svn.apache.org/r1485797
Log:
AMBARI-2191. Report status for YARN and MAPREDUCE2
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485797&r1=1485796&r2=1485797&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 23 18:10:33 2013
@@ -338,6 +338,8 @@ Trunk (unreleased changes):
AMBARI-2111. Enable customization of smoke test user. (yusaku)
+ AMBARI-2191. Report status for YARN and MAPREDUCE2. (ncole)
+
AMBARI-2147. Added config change auditing. (ncole)
AMBARI-2110. Update hive-site.xml, set fs.file.impl.disable.cache=true.
Modified:
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py?rev=1485797&r1=1485796&r2=1485797&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
Thu May 23 18:10:33 2013
@@ -186,6 +186,10 @@ pidPathesVars = [
'defaultValue' : '/var/run/mysqld'},
{'var' : 'webhcat_pid_dir',
'defaultValue' : '/var/run/webhcat'},
+ {'var' : 'yarn_pid_dir',
+ 'defaultValue' : '/var/run/hadoop-yarn'},
+ {'var' : 'mapreduce2_pid_dir',
+ 'defaultValue' : '/var/run/hadoop-mapreduce'},
]
class AmbariConfig:
Modified:
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py?rev=1485797&r1=1485796&r2=1485797&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
Thu May 23 18:10:33 2013
@@ -32,7 +32,8 @@ class LiveStatus:
SERVICES = [
"HDFS", "MAPREDUCE", "GANGLIA", "HBASE",
"NAGIOS", "ZOOKEEPER", "OOZIE", "HCATALOG",
- "KERBEROS", "TEMPLETON", "HIVE", "WEBHCAT"
+ "KERBEROS", "TEMPLETON", "HIVE", "WEBHCAT",
+ "YARN", "MAPREDUCE2"
]
COMPONENTS = [
@@ -42,50 +43,54 @@ class LiveStatus:
"componentName" : "NAMENODE"},
{"serviceName" : "HDFS",
"componentName" : "SECONDARY_NAMENODE"},
-# {"serviceName" : "HDFS",
-# "componentName" : "HDFS_CLIENT"},
+
{"serviceName" : "MAPREDUCE",
"componentName" : "JOBTRACKER"},
{"serviceName" : "MAPREDUCE",
"componentName" : "TASKTRACKER"},
-# {"serviceName" : "MAPREDUCE",
-# "componentName" : "MAPREDUCE_CLIENT"},
- {"serviceName" : "GANGLIA", #!
+
+ {"serviceName" : "GANGLIA",
"componentName" : "GANGLIA_SERVER"},
- {"serviceName" : "GANGLIA", #!
+ {"serviceName" : "GANGLIA",
"componentName" : "GANGLIA_MONITOR"},
- {"serviceName" : "HBASE", #!
+
+ {"serviceName" : "HBASE",
"componentName" : "HBASE_MASTER"},
- {"serviceName" : "HBASE", #!
+ {"serviceName" : "HBASE",
"componentName" : "HBASE_REGIONSERVER"},
-# {"serviceName" : "HBASE",
-# "componentName" : "HBASE_CLIENT"},
- {"serviceName" : "NAGIOS", #!
+
+ {"serviceName" : "NAGIOS",
"componentName" : "NAGIOS_SERVER"},
+
{"serviceName" : "ZOOKEEPER",
"componentName" : "ZOOKEEPER_SERVER"},
-# {"serviceName" : "ZOOKEEPER",
-# "componentName" : "ZOOKEEPER_CLIENT"},
+
{"serviceName" : "OOZIE",
"componentName" : "OOZIE_SERVER"},
-# {"serviceName" : "OOZIE",
-# "componentName" : "OOZIE_CLIENT"},
- {"serviceName" : "HCATALOG", #!
+
+ {"serviceName" : "HCATALOG",
"componentName" : "HCATALOG_SERVER"},
+
{"serviceName" : "KERBEROS",
- "componentName" : "KERBEROS_SERVER"}, #!
-# {"serviceName" : "TEMPLETON",
-# "componentName" : "TEMPLETON_SERVER"},
-# {"serviceName" : "TEMPLETON",
-# "componentName" : "TEMPLETON_CLIENT"},
- {"serviceName" : "HIVE", #!
+ "componentName" : "KERBEROS_SERVER"},
+
+ {"serviceName" : "HIVE",
"componentName" : "HIVE_SERVER"},
- {"serviceName" : "HIVE", #!
+ {"serviceName" : "HIVE",
"componentName" : "HIVE_METASTORE"},
- {"serviceName" : "HIVE", #!
+ {"serviceName" : "HIVE",
"componentName" : "MYSQL_SERVER"},
+
{"serviceName" : "WEBHCAT",
"componentName" : "WEBHCAT_SERVER"},
+
+ {"serviceName" : "YARN",
+ "componentName" : "RESOURCEMANAGER"},
+ {"serviceName" : "YARN",
+ "componentName" : "NODEMANAGER"},
+
+ {"serviceName" : "MAPREDUCE2",
+ "componentName" : "HISTORYSERVER"},
]
LIVE_STATUS = "STARTED"
