ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abaranc...@apache.org
Subject [6/8] git commit: AMBARI-5296 - update Management Pack to support Hadoop MapReduce2 and YARN services (Anatoly Nikonorov via abaranchuk)
Date Wed, 02 Apr 2014 14:21:41 GMT
AMBARI-5296 - update Management Pack to support Hadoop MapReduce2 and YARN services (Anatoly Nikonorov via abaranchuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53c40505
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53c40505
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53c40505

Branch: refs/heads/trunk
Commit: 53c4050553123d2f54ab6c3730083b29dfc14dbd
Parents: 7910b44
Author: Artem Baranchuk <abaranchuk@hortonworks.com>
Authored: Wed Apr 2 17:01:30 2014 +0300
Committer: Artem Baranchuk <abaranchuk@hortonworks.com>
Committed: Wed Apr 2 17:01:30 2014 +0300

----------------------------------------------------------------------
 .../management-pack/Hadoop_MP/HadoopMp.sln      |  25 +-
 .../HadoopMp/Classes/AmbariAccessorRole.mpx     |  23 +-
 .../Classes/ClusterHardwareProjection.mpx       |   2 +-
 .../HadoopMp/Classes/ClusterService.mpx         |  51 ++-
 .../HadoopMp/Classes/HostComponent.mpx          |  56 +++-
 .../Discoveries/HostComponentsDiscovery.mpx     |  20 +-
 .../Hadoop_MP/HadoopMp/HadoopMp.mpproj          | 254 +++++++++++++-
 .../Hadoop_MP/HadoopMp/HadoopMp.mpproj.user     |   2 +-
 .../Hadoop_MP/HadoopMp/Images/GQR.png           | Bin 0 -> 8878 bytes
 .../Hadoop_MP/HadoopMp/Images/HistoryServer.png | Bin 0 -> 4668 bytes
 .../HadoopMp/Images/HistoryServer_.png          | Bin 0 -> 3311 bytes
 .../Hadoop_MP/HadoopMp/Images/Icons.mpx         |  28 ++
 .../Hadoop_MP/HadoopMp/Images/Mapreduce2.png    | Bin 0 -> 8065 bytes
 .../HadoopMp/Images/Mapreduce2Client.png        | Bin 0 -> 4657 bytes
 .../HadoopMp/Images/Mapreduce2Client_.png       | Bin 0 -> 489 bytes
 .../Hadoop_MP/HadoopMp/Images/Mapreduce2_.png   | Bin 0 -> 482 bytes
 .../Hadoop_MP/HadoopMp/Images/NodeManager.png   | Bin 0 -> 6110 bytes
 .../Hadoop_MP/HadoopMp/Images/NodeManager_.png  | Bin 0 -> 943 bytes
 .../HadoopMp/Images/ResourceManager.png         | Bin 0 -> 5535 bytes
 .../HadoopMp/Images/ResourceManager_.png        | Bin 0 -> 975 bytes
 .../Hadoop_MP/HadoopMp/Images/Yarn.png          | Bin 0 -> 7157 bytes
 .../Hadoop_MP/HadoopMp/Images/YarnClient.png    | Bin 0 -> 4493 bytes
 .../Hadoop_MP/HadoopMp/Images/YarnClient_.png   | Bin 0 -> 557 bytes
 .../Hadoop_MP/HadoopMp/Images/Yarn_.png         | Bin 0 -> 580 bytes
 .../Hadoop_MP/HadoopMp/MPResources.resources    | Bin 0 -> 92648 bytes
 .../Hadoop_MP/HadoopMp/ManagementPack.mpx       |  10 +
 ...PropertyBagMultiplePerformanceDataMapper.mpx |   6 +-
 .../Discovery/PowerShellDiscoveryDataSource.mpx |  38 ++-
 .../Scripts/ClusterServicesDiscovery.ps1        |   2 +
 .../Scripts/HostComponentsDiscovery.ps1         |  17 +
 .../BaseScriptedPropertyBagDataSource.mpx       |  28 +-
 .../Monitoring/CustomEventProvider.mpx          |  65 ++++
 .../Monitoring/Scripts/HostComponentMetrics.ps1 |   2 +-
 .../Monitoring/Scripts/SyntheticTransaction.ps1 |  31 ++
 .../Monitoring/Scripts/YarnServiceMetrics.ps1   |  93 ++++++
 .../SyntheticTransactionDataSource.mpx          | 124 +++++++
 .../Monitoring/YarnServiceMetricsDataSource.mpx |  72 ++++
 .../YarnServiceMetricsPerformanceDataSource.mpx |  81 +++++
 ...atedEventLogManualReset2StateMonitorType.mpx | 129 +++++++
 .../SyntheticTransactionMonitorType.mpx         | 102 ++++++
 ...arnServiceThreeStateThresholdMonitorType.mpx | 332 +++++++++++++++++++
 .../ErrorHandling/APIAuthenticationMonitor.mpx  |  89 +++++
 .../ErrorHandling/APIAvailabilityMonitor.mpx    |  92 +++++
 .../Monitors/ErrorHandling/TimeoutMonitor.mpx   |  91 +++++
 .../DataNodeHealthStateUnitMonitor.mpx          |  74 +++++
 .../HistoryServerHealthStateUnitMonitor.mpx     |  95 ++++++
 .../NodeManagerHealthStateUnitMonitor.mpx       |  95 ++++++
 .../ResourceManagerHealthStateUnitMonitor.mpx   |  95 ++++++
 .../TempletonServerHealthStateUnitMonitor.mpx   |  10 +-
 .../JobTracker/MemoryHeapUsageUnitMonitor.mpx   |   2 +-
 .../MapReduceService/FailedJobsUnitMonitor.mpx  |   2 +-
 .../NameNode/MemoryHeapUsageUnitMonitor.mpx     |   2 +-
 .../ResourceManager/AppsFailedUnitMonitor.mpx   | 102 ++++++
 .../ResourceManager/LostNMsUnitMonitor.mpx      | 106 ++++++
 .../MemoryHeapUsageUnitMonitor.mpx              | 103 ++++++
 .../ResourceManager/UnhealthyNMsUnitMonitor.mpx | 106 ++++++
 ...lusterServiceToSoftwareProjectionRollups.mpx |   4 +-
 .../HistoryServerToMapReduce2ServiceRollup.mpx  | 106 ++++++
 .../Rollups/NodeManagerToYARNServiceRollup.mpx  | 106 ++++++
 .../ResourceManagerToYARNServiceRollup.mpx      | 106 ++++++
 ...nServerComponentToTempletonServiceRollup.mpx |  16 +-
 .../GeneralErrorCollectionRule.mpx              |  86 +++++
 .../BlockChecksumOpsAvgTimeCollection.mpx       |  62 ++++
 .../DataNode/BlockCopyOpsAvgTimeCollection.mpx  |  62 ++++
 .../DataNode/BlockReadOpsAvgTimeCollection.mpx  |  62 ++++
 .../BlockReplaceOpsAvgTimeCollection.mpx        |  62 ++++
 .../BlockVerificationFailuresCollection.mpx     |  62 ++++
 .../DataNode/BlockWriteOpsAvgTimeCollection.mpx |  62 ++++
 .../DataNode/BlocksReadCollection.mpx           |  62 ++++
 .../DataNode/BlocksRemovedCollection.mpx        |  62 ++++
 .../DataNode/BlocksReplicatedCollection.mpx     |  62 ++++
 .../DataNode/BlocksVerifiedCollection.mpx       |  62 ++++
 .../DataNode/BlocksWrittenCollection.mpx        |  62 ++++
 .../DataNode/BytesReadCollection.mpx            |  62 ++++
 .../DataNode/BytesWrittenCollection.mpx         |  62 ++++
 .../DataNode/HeartBeatsAvgTimeCollection.mpx    |  62 ++++
 .../ActiveApplicationsCollection.mpx            |  62 ++++
 .../ResourceManager/ActiveNMCollection.mpx      |  62 ++++
 .../ResourceManager/ActiveUsersCollection.mpx   |  62 ++++
 .../AggregateContainersAllocatedCollection.mpx  |  62 ++++
 .../AggregateContainersReleasedCollection.mpx   |  62 ++++
 .../AllocatedContainersCollection.mpx           |  62 ++++
 .../ResourceManager/AllocatedMBCollection.mpx   |  62 ++++
 .../AllocatedVCoresCollection.mpx               |  62 ++++
 .../ResourceManager/AppsCompletedCollection.mpx |  62 ++++
 .../ResourceManager/AppsFailedCollection.mpx    |  62 ++++
 .../ResourceManager/AppsKilledCollection.mpx    |  62 ++++
 .../ResourceManager/AppsPendingCollection.mpx   |  62 ++++
 .../ResourceManager/AppsRunningCollection.mpx   |  62 ++++
 .../ResourceManager/AppsSubmittedCollection.mpx |  62 ++++
 .../ResourceManager/AvailableMBCollection.mpx   |  62 ++++
 .../AvailableVCoresCollection.mpx               |  62 ++++
 .../DecommissionedNMCollection.mpx              |  62 ++++
 .../ResourceManager/LostNMCollection.mpx        |  62 ++++
 .../PendingContainersCollection.mpx             |  62 ++++
 .../ResourceManager/PendingMBCollection.mpx     |  62 ++++
 .../ResourceManager/PendingVCoresCollection.mpx |  62 ++++
 .../ResourceManager/RebootedNMCollection.mpx    |  62 ++++
 .../ReservedContainersCollection.mpx            |  62 ++++
 .../ResourceManager/ReservedMBCollection.mpx    |  62 ++++
 .../ReservedVCoresCollection.mpx                |  62 ++++
 .../ResourceManager/UnhealthyNMCollection.mpx   |  62 ++++
 .../ResourceManager/running_1440Collection.mpx  |  62 ++++
 .../ResourceManager/running_300Collection.mpx   |  62 ++++
 .../ResourceManager/running_60Collection.mpx    |  62 ++++
 .../Shared Scripts/DiscoveryHelpers.ps1         |   7 +
 .../HadoopMp/Shared Scripts/JsonParser.ps1      |   2 +-
 .../HadoopMp/Shared Scripts/Logging.ps1         |   4 +-
 .../HadoopMp/Shared Scripts/RestApi.ps1         |   7 +-
 .../HadoopMp/Templates/DiscoveryTemplate.mpx    |   2 +
 .../Hadoop_MP/Installer/Assets/Icon.ico         | Bin 0 -> 1150 bytes
 .../Hadoop_MP/Installer/Installer.sln           |  27 +-
 .../ManagementMp/MPResources.resources          | Bin 0 -> 6269 bytes
 .../Hadoop_MP/ManagementMp/ManagementMp.mpproj  |   8 +-
 .../ManagementMp/ManagementMp.mpproj.user       |   2 +-
 .../Hadoop_MP/Modules/Modules.csproj            |   2 +-
 .../HistoryServerSummaryDashboard.mpx           | 275 +++++++++++++++
 .../Dashboards/NodeManagerSummaryDashboard.mpx  | 275 +++++++++++++++
 .../ResourceManagerSummaryDashboard.mpx         | 275 +++++++++++++++
 .../Hadoop_MP/PresentationMp/Folders.mpx        |   4 +
 .../PresentationMp/MPResources.resources        | Bin 0 -> 56313 bytes
 .../PresentationMp/PresentationMp.mpproj        |  26 +-
 .../PresentationMp/PresentationMp.mpproj.user   |   2 +-
 .../Widgets/State/HystoryServersState.mpx       | 163 +++++++++
 .../Widgets/State/NodeManagerState.mpx          | 190 +++++++++++
 .../Widgets/State/ResourceManagerState.mpx      | 163 +++++++++
 .../MultipleAgentChooserDialog.cs               |  41 ++-
 .../Hadoop_MP/ScomPages/ScomPages.csproj        |   2 +-
 .../WidgetsSilverlight.csproj                   |   2 +-
 .../Hadoop_MP/WidgetsWpf/WidgetsWpf.csproj      |   2 +-
 130 files changed, 7113 insertions(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp.sln
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp.sln b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp.sln
index ef0c28a..2c7c0ed 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp.sln
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp.sln
@@ -1,5 +1,6 @@
-´╗┐Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+´╗┐
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 ## Licensed to the Apache Software Foundation (ASF) under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
@@ -105,26 +106,29 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|x86.Build.0 = Debug|Any CPU
-		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Release|x86.ActiveCfg = Release|Any CPU
-		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Release|x86.Build.0 = Release|Any CPU
+		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|Any CPU.Build.0 = Debug|x86
+		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|x86.ActiveCfg = Debug|x86
+		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Debug|x86.Build.0 = Debug|x86
+		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Release|Any CPU.ActiveCfg = Release|x86
+		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Release|x86.ActiveCfg = Release|x86
+		{63B476B6-EFCD-468F-80D9-94E2CFF1B5DB}.Release|x86.Build.0 = Release|x86
 		{B77E5EA7-3FE4-49C9-88AC-3AB871A26F9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B77E5EA7-3FE4-49C9-88AC-3AB871A26F9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B77E5EA7-3FE4-49C9-88AC-3AB871A26F9B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B77E5EA7-3FE4-49C9-88AC-3AB871A26F9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B77E5EA7-3FE4-49C9-88AC-3AB871A26F9B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B77E5EA7-3FE4-49C9-88AC-3AB871A26F9B}.Release|x86.ActiveCfg = Release|Any CPU
+		{B77E5EA7-3FE4-49C9-88AC-3AB871A26F9B}.Release|x86.Build.0 = Release|Any CPU
 		{D4C615D1-9274-41D9-B14E-BC88AE7FCDCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4C615D1-9274-41D9-B14E-BC88AE7FCDCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4C615D1-9274-41D9-B14E-BC88AE7FCDCE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D4C615D1-9274-41D9-B14E-BC88AE7FCDCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4C615D1-9274-41D9-B14E-BC88AE7FCDCE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4C615D1-9274-41D9-B14E-BC88AE7FCDCE}.Release|x86.ActiveCfg = Release|Any CPU
+		{D4C615D1-9274-41D9-B14E-BC88AE7FCDCE}.Release|x86.Build.0 = Release|Any CPU
 		{8AB1E36E-7FF4-4BAF-9BD0-1491492DFDA0}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8AB1E36E-7FF4-4BAF-9BD0-1491492DFDA0}.Debug|Any CPU.Build.0 = Debug|x86
 		{8AB1E36E-7FF4-4BAF-9BD0-1491492DFDA0}.Debug|x86.ActiveCfg = Debug|x86
 		{8AB1E36E-7FF4-4BAF-9BD0-1491492DFDA0}.Debug|x86.Build.0 = Debug|x86
 		{8AB1E36E-7FF4-4BAF-9BD0-1491492DFDA0}.Release|Any CPU.ActiveCfg = Release|x86
@@ -136,13 +140,16 @@ Global
 		{AEAA0FB0-D274-491A-BEB5-5354584F1400}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AEAA0FB0-D274-491A-BEB5-5354584F1400}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AEAA0FB0-D274-491A-BEB5-5354584F1400}.Release|x86.ActiveCfg = Release|Any CPU
+		{AEAA0FB0-D274-491A-BEB5-5354584F1400}.Release|x86.Build.0 = Release|Any CPU
 		{729E6DB2-31F7-4EB1-9146-A2F2263585EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{729E6DB2-31F7-4EB1-9146-A2F2263585EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{729E6DB2-31F7-4EB1-9146-A2F2263585EE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{729E6DB2-31F7-4EB1-9146-A2F2263585EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{729E6DB2-31F7-4EB1-9146-A2F2263585EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{729E6DB2-31F7-4EB1-9146-A2F2263585EE}.Release|x86.ActiveCfg = Release|Any CPU
+		{729E6DB2-31F7-4EB1-9146-A2F2263585EE}.Release|x86.Build.0 = Release|Any CPU
 		{1BAB40E2-B43F-469A-8583-CC196A792A38}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1BAB40E2-B43F-469A-8583-CC196A792A38}.Debug|Any CPU.Build.0 = Debug|x86
 		{1BAB40E2-B43F-469A-8583-CC196A792A38}.Debug|x86.ActiveCfg = Debug|x86
 		{1BAB40E2-B43F-469A-8583-CC196A792A38}.Debug|x86.Build.0 = Debug|x86
 		{1BAB40E2-B43F-469A-8583-CC196A792A38}.Release|Any CPU.ActiveCfg = Release|x86

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/AmbariAccessorRole.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/AmbariAccessorRole.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/AmbariAccessorRole.mpx
index 22af842..f616c0d 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/AmbariAccessorRole.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/AmbariAccessorRole.mpx
@@ -31,18 +31,6 @@
     </EntityTypes>
   </TypeDefinitions>
 
-  <!--<Categories>
-    <Category ID="Ambari.SCOM.AmbariAccessorRole.16x16Image.Category" Target="Ambari.SCOM.AmbariAccessorRole.16x16Image" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
-    <Category ID="Ambari.SCOM.AmbariAccessorRole.80x80Image.Category" Target="Ambari.SCOM.AmbariAccessorRole.80x80Image" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
-  </Categories>
-
-  <Presentation>
-    <ImageReferences>
-      <ImageReference ElementID="Ambari.SCOM.AmbariAccessorRole" ImageID="Ambari.SCOM.AmbariAccessorRole.16x16Image" />
-      <ImageReference ElementID="Ambari.SCOM.AmbariAccessorRole" ImageID="Ambari.SCOM.AmbariAccessorRole.80x80Image" />
-    </ImageReferences>
-  </Presentation>-->
-
   <LanguagePacks>
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
@@ -50,14 +38,11 @@
           <Name>Hadoop Ambari Accessor Role</Name>
           <Description>This class defines Hadoop Ambari Accessor Computer Role.</Description>
         </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.ComputerHostsAmbariWatcherNode">
+          <Name>Computer Hosts Ambari WatcherNode relation</Name>
+          <Description>Computer Hosts Ambari WatcherNode relation</Description>
+        </DisplayString>
       </DisplayStrings>
     </LanguagePack>
   </LanguagePacks>
-
-  <!--
-  <Resources>
-    <Image ID="Ambari.SCOM.AmbariAccessorRole.16x16Image" Accessibility="Public" FileName="AmbariAccessorRole-16.png" />
-    <Image ID="Ambari.SCOM.AmbariAccessorRole.80x80Image" Accessibility="Public" FileName="AmbariAccessorRole-80.png" />
-  </Resources>
-  -->
 </ManagementPackFragment>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterHardwareProjection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterHardwareProjection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterHardwareProjection.mpx
index 9eee349..ca84c8c 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterHardwareProjection.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterHardwareProjection.mpx
@@ -49,7 +49,7 @@
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
         <DisplayString ElementID="Ambari.SCOM.ClusterHardwareProjection">
-          <Name>Cluster Hardware Projection</Name>
+          <Name>Hadoop Cluster Hardware Projection</Name>
           <Description>This class represents Hadoop Cluster Hardware monitoring projection, based on cluster nodes.</Description>
         </DisplayString>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
index a5558f8..1cb8b85 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
@@ -35,6 +35,8 @@
         <ClassType ID="Ambari.SCOM.ClusterService.Oozie" Accessibility="Public" Base="Ambari.SCOM.ClusterService" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.Pig" Accessibility="Public" Base="Ambari.SCOM.ClusterService" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.Sqoop" Accessibility="Public" Base="Ambari.SCOM.ClusterService" Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.ClusterService.MapReduce2" Accessibility="Public" Base="Ambari.SCOM.ClusterService" Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.ClusterService.Yarn" Accessibility="Public" Base="Ambari.SCOM.ClusterService" Hosted="true" Abstract="false" Singleton="false" />
       </ClassTypes>
 
       <RelationshipTypes>
@@ -77,6 +79,18 @@
           <Source ID="Service" Type="Ambari.SCOM.ClusterService.Oozie" />
           <Target ID="Component" Type="Ambari.SCOM.HostComponent.OozieServer" />
         </RelationshipType>
+        <RelationshipType ID="Ambari.SCOM.MapReduce2ServiceContainsHistoryServerComponent" Base="System!System.Containment" Abstract="false" Accessibility="Public">
+          <Source ID="Service" Type="Ambari.SCOM.ClusterService.MapReduce2" />
+          <Target ID="Component" Type="Ambari.SCOM.HostComponent.HistoryServer" />
+        </RelationshipType>
+        <RelationshipType ID="Ambari.SCOM.YarnServiceContainsNodeManagerComponent" Base="System!System.Containment" Abstract="false" Accessibility="Public">
+          <Source ID="Service" Type="Ambari.SCOM.ClusterService.Yarn" />
+          <Target ID="Component" Type="Ambari.SCOM.HostComponent.NodeManager" />
+        </RelationshipType>
+        <RelationshipType ID="Ambari.SCOM.YarnServiceContainsResourceManagerComponent" Base="System!System.Containment" Abstract="false" Accessibility="Public">
+          <Source ID="Service" Type="Ambari.SCOM.ClusterService.Yarn" />
+          <Target ID="Component" Type="Ambari.SCOM.HostComponent.ResourceManager" />
+        </RelationshipType>
       </RelationshipTypes>
     </EntityTypes>
   </TypeDefinitions>
@@ -97,6 +111,10 @@
       <ImageReference ElementID="Ambari.SCOM.ClusterService.Pig" ImageID="Ambari.SCOM.Resources.Images.PigServiceDiagramIcon" />
       <ImageReference ElementID="Ambari.SCOM.ClusterService.Sqoop" ImageID="Ambari.SCOM.Resources.Images.ScoopService16Icon" />
       <ImageReference ElementID="Ambari.SCOM.ClusterService.Sqoop" ImageID="Ambari.SCOM.Resources.Images.ScoopServiceDiagramIcon" />
+      <ImageReference ElementID="Ambari.SCOM.ClusterService.MapReduce2" ImageID="Ambari.SCOM.Resources.Images.Mapreduce2Service16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.ClusterService.MapReduce2" ImageID="Ambari.SCOM.Resources.Images.Mapreduce2ServiceDiagramIcon" />
+      <ImageReference ElementID="Ambari.SCOM.ClusterService.Yarn" ImageID="Ambari.SCOM.Resources.Images.YarnService16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.ClusterService.Yarn" ImageID="Ambari.SCOM.Resources.Images.YarnServiceDiagramIcon" />
     </ImageReferences>
   </Presentation>
 
@@ -117,7 +135,6 @@
         <DisplayString ElementID="Ambari.SCOM.ClusterService.Private" SubElementID="ServiceName">
           <Name>Service Name</Name>
         </DisplayString>
-
         <DisplayString ElementID="Ambari.SCOM.ClusterService">
           <Name>Hadoop Cluster Service</Name>
           <Description>Base class for all Hadoop Cluster Services.</Description>
@@ -125,14 +142,12 @@
         <DisplayString ElementID="Ambari.SCOM.ClusterService" SubElementID="ClusterName">
           <Name>Cluster Name</Name>
         </DisplayString>
-
         <DisplayString ElementID="Ambari.SCOM.PrivateClusterServiceHostsClusterService">
           <Name>Hadoop Cluster Service (Private) Hosts Hadoop Cluster Service</Name>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.ClusterServiceContainsHostComponent">
           <Name>Hadoop Cluster Service Contains Hadoop Host Component</Name>
         </DisplayString>
-
         <DisplayString ElementID="Ambari.SCOM.ClusterService.Hdfs">
           <Name>Hadoop HDFS Cluster Service</Name>
           <Description>This class represents Hadoop HDFS Service.</Description>
@@ -141,27 +156,34 @@
           <Name>Hadoop MapReduce Cluster Service</Name>
           <Description>This class represents Hadoop MapReduce Service.</Description>
         </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.ClusterService.MapReduce2">
+          <Name>Hadoop MapReduce 2 Cluster Service</Name>
+          <Description>This class represents Hadoop MapReduce 2 Service.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.ClusterService.Yarn">
+          <Name>Hadoop YARN Cluster Service</Name>
+          <Description>This class represents Hadoop YARN Service.</Description>
+        </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.ClusterService.Hive">
-          <Name>Hadoop Hive Cluster Services</Name>
+          <Name>Hadoop Hive Cluster Service</Name>
           <Description>This class represents Hadoop Hive Service.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.ClusterService.Templeton">
-          <Name>Hadoop Templeton Cluster Services</Name>
-          <Description>This class represents Hadoop Templeton Service.</Description>
+          <Name>Hadoop WebHCat Cluster Service</Name>
+          <Description>This class represents Hadoop WebHCat Service.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.ClusterService.Oozie">
-          <Name>Hadoop Oozie Cluster Services</Name>
+          <Name>Hadoop Oozie Cluster Service</Name>
           <Description>This class represents Hadoop Oozie Service.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.ClusterService.Pig">
-          <Name>Hadoop Pig Cluster Services</Name>
+          <Name>Hadoop Pig Cluster Service</Name>
           <Description>This class represents Hadoop Pig Service.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.ClusterService.Sqoop">
           <Name>Hadoop Sqoop Cluster Service</Name>
           <Description>This class represents Hadoop Sqoop Service.</Description>
         </DisplayString>
-
         <DisplayString ElementID="Ambari.SCOM.HdfsServiceContainsNameNodeComponent">
           <Name>Hadoop HDFS Cluster Service Contains NameNode Host Component</Name>
         </DisplayString>
@@ -178,11 +200,20 @@
           <Name>Hadoop Hive Cluster Service Contains Hive Metastore Host Component</Name>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.TempletonServiceContainsTempletonServerComponent">
-          <Name>Hadoop Templeton Cluster Service Contains Templeton Server Host Component</Name>
+          <Name>Hadoop WebHCat Cluster Service Contains WebHCat Server Host Component</Name>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.OozieServiceContainsOozieServerComponent">
           <Name>Hadoop Oozie Cluster Service Contains Oozie Server Host Component</Name>
         </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.MapReduce2ServiceContainsHistoryServerComponent">
+          <Name>Hadoop MapReduce 2 Service Contains History Server Host Component</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.YarnServiceContainsNodeManagerComponent">
+          <Name>Hadoop YARN Service Contains Node Manager Host Component</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.YarnServiceContainsResourceManagerComponent">
+          <Name>Hadoop YARN Service Contains Resource Manager Host Component</Name>
+        </DisplayString>
       </DisplayStrings>
     </LanguagePack>
   </LanguagePacks>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/HostComponent.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/HostComponent.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/HostComponent.mpx
index cc25321..6330d3d 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/HostComponent.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/HostComponent.mpx
@@ -35,6 +35,7 @@
         <ClassType ID="Ambari.SCOM.HostComponent.NameNode" Accessibility="Public" Base="Ambari.SCOM.HeadNodeComponent" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.HostComponent.SecondaryNameNode" Accessibility="Public" Base="Ambari.SCOM.ActiveHostComponent" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.HostComponent.JobTracker" Accessibility="Public" Base="Ambari.SCOM.HeadNodeComponent" Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.HostComponent.DataNode" Accessibility="Public" Base="Ambari.SCOM.BasicPerformanceHostComponent" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.HostComponent.TaskTracker" Accessibility="Public" Base="Ambari.SCOM.BasicPerformanceHostComponent" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.HostComponent.HiveServer" Accessibility="Public" Base="Ambari.SCOM.ActiveHostComponent" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.HostComponent.HiveMetastore" Accessibility="Public" Base="Ambari.SCOM.ActiveHostComponent" Hosted="true" Abstract="false" Singleton="false" />
@@ -43,6 +44,13 @@
         <ClassType ID="Ambari.SCOM.HostComponent.OozieServer" Accessibility="Public" Base="Ambari.SCOM.ActiveHostComponent" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.HostComponent.Pig" Accessibility="Public" Base="Ambari.SCOM.HostComponent" Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.HostComponent.Sqoop" Accessibility="Public" Base="Ambari.SCOM.HostComponent" Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.HostComponent.HistoryServer" Accessibility="Public" Base="Ambari.SCOM.HeadNodeComponent" Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.HostComponent.MapReduce2Client" Accessibility="Public" Base="Ambari.SCOM.HostComponent" Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.HostComponent.NodeManager" Accessibility="Public" Base="Ambari.SCOM.HeadNodeComponent" Hosted="true" Abstract="false" Singleton="false">
+          <Property ID="ParentHostName" Type="string" Key="false" />
+        </ClassType>
+        <ClassType ID="Ambari.SCOM.HostComponent.ResourceManager" Accessibility="Public" Base="Ambari.SCOM.HeadNodeComponent" Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.HostComponent.YarnClient" Accessibility="Public" Base="Ambari.SCOM.HostComponent" Hosted="true" Abstract="false" Singleton="false" />
       </ClassTypes>
 
       <RelationshipTypes>
@@ -56,6 +64,8 @@
 
   <Presentation>
     <ImageReferences>
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.DataNode" ImageID="Ambari.SCOM.Resources.Images.DataNode16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.DataNode" ImageID="Ambari.SCOM.Resources.Images.DataNodeDiagramIcon" />
       <ImageReference ElementID="Ambari.SCOM.HostComponent.NameNode" ImageID="Ambari.SCOM.Resources.Images.NameNode16Icon" />
       <ImageReference ElementID="Ambari.SCOM.HostComponent.NameNode" ImageID="Ambari.SCOM.Resources.Images.NameNodeDiagramIcon" />
       <ImageReference ElementID="Ambari.SCOM.HostComponent.SecondaryNameNode" ImageID="Ambari.SCOM.Resources.Images.SecNameNode16Icon" />
@@ -78,6 +88,16 @@
       <ImageReference ElementID="Ambari.SCOM.HostComponent.Pig" ImageID="Ambari.SCOM.Resources.Images.PigDiagramIcon" />
       <ImageReference ElementID="Ambari.SCOM.HostComponent.Sqoop" ImageID="Ambari.SCOM.Resources.Images.Scoop16Icon" />
       <ImageReference ElementID="Ambari.SCOM.HostComponent.Sqoop" ImageID="Ambari.SCOM.Resources.Images.ScoopDiagramIcon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.HistoryServer" ImageID="Ambari.SCOM.Resources.Images.HistoryServer16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.HistoryServer" ImageID="Ambari.SCOM.Resources.Images.HistoryServerDiagramIcon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.MapReduce2Client" ImageID="Ambari.SCOM.Resources.Images.Mapreduce2Client16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.MapReduce2Client" ImageID="Ambari.SCOM.Resources.Images.Mapreduce2ClientDiagramIcon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.NodeManager" ImageID="Ambari.SCOM.Resources.Images.NodeManager16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.NodeManager" ImageID="Ambari.SCOM.Resources.Images.NodeManagerDiagramIcon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.ResourceManager" ImageID="Ambari.SCOM.Resources.Images.ResourceManager16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.ResourceManager" ImageID="Ambari.SCOM.Resources.Images.ResourceManagerDiagramIcon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.YarnClient" ImageID="Ambari.SCOM.Resources.Images.YarnClient16Icon" />
+      <ImageReference ElementID="Ambari.SCOM.HostComponent.YarnClient" ImageID="Ambari.SCOM.Resources.Images.YarnClientDiagramIcon" />
     </ImageReferences>
   </Presentation>
 
@@ -108,7 +128,10 @@
           <Name>Hadoop Head Node Component</Name>
           <Description>This is a base class for Hadoop Host Components hosted on Head Node.</Description>
         </DisplayString>
-
+        <DisplayString ElementID="Ambari.SCOM.HostComponent.DataNode">
+          <Name>Hadoop DataNode Service</Name>
+          <Description>This class represents Hadoop DataNode Service running on the Host.</Description>
+        </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.HostComponent.NameNode">
           <Name>Hadoop NameNode Service</Name>
           <Description>This class represents Hadoop NameNode Service running on the Host.</Description>
@@ -126,8 +149,8 @@
           <Description>This class represents Hadoop TaskTracker Service running on the Host.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.HostComponent.TempletonServer">
-          <Name>Hadoop Templeton Service</Name>
-          <Description>This class represents Hadoop Templeton Server Service running on the Host.</Description>
+          <Name>Hadoop WebHCat Server Service</Name>
+          <Description>This class represents Hadoop WebHCat Server Service running on the Host.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.HostComponent.HiveServer">
           <Name>Hadoop Hive Server Service</Name>
@@ -153,6 +176,33 @@
           <Name>Hadoop Sqoop Component</Name>
           <Description>This class represents Hadoop Sqoop Component on the Host.</Description>
         </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.HostComponent.HistoryServer">
+          <Name>Hadoop History Server Service</Name>
+          <Description>This class represents Hadoop History Server Service running on the Host.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.HostComponent.MapReduce2Client">
+          <Name>Hadoop MapReduce 2 Client Component</Name>
+          <Description>This class represents Hadoop MapReduce 2 Client Component on the Host.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.HostComponent.NodeManager">
+          <Name>Hadoop Node Manager Service</Name>
+          <Description>This class represents Hadoop Node Manager Service running on the Host.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.HostComponent.NodeManager" SubElementID="ParentHostName">
+          <Name>Host Name</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.HostComponent.ResourceManager">
+          <Name>Hadoop Resource Manager Service</Name>
+          <Description>This class represents Hadoop Resource Manager Service running on the Host.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.HostComponent.YarnClient">
+          <Name>YARN Client Component</Name>
+          <Description>This class represents Hadoop YARN Client Component on the Host.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.HostHostsHostComponent">
+          <Name>Host hosts HostComponent relation</Name>
+          <Description>Host hosts HostComponent relation</Description>
+        </DisplayString>
       </DisplayStrings>
     </LanguagePack>
   </LanguagePacks>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Discoveries/HostComponentsDiscovery.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Discoveries/HostComponentsDiscovery.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Discoveries/HostComponentsDiscovery.mpx
index bd5b53e..b56815c 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Discoveries/HostComponentsDiscovery.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Discoveries/HostComponentsDiscovery.mpx
@@ -29,6 +29,7 @@
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.NameNode" />
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.SecondaryNameNode" />
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.JobTracker" />
+          <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.DataNode" />
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.TaskTracker" />
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.HiveServer" />
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.HiveMetastore" />
@@ -37,6 +38,11 @@
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.OozieServer" />
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.Pig" />
           <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.Sqoop" />
+          <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.HistoryServer" />
+          <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.MapReduce2Client" />
+          <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.NodeManager" />
+          <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.ResourceManager" />
+          <DiscoveryClass TypeID="Ambari.SCOM.HostComponent.YarnClient" />
           <DiscoveryRelationship TypeID="Ambari.SCOM.HostHostsHostComponent" />
           <DiscoveryRelationship TypeID="Ambari.SCOM.ClusterServiceContainsHostComponent" />
           <DiscoveryRelationship TypeID="Ambari.SCOM.HdfsServiceContainsNameNodeComponent" />
@@ -45,6 +51,9 @@
           <DiscoveryRelationship TypeID="Ambari.SCOM.HiveServiceContainsHiveMetastoreComponent" />
           <DiscoveryRelationship TypeID="Ambari.SCOM.TempletonServiceContainsTempletonServerComponent" />
           <DiscoveryRelationship TypeID="Ambari.SCOM.OozieServiceContainsOozieServerComponent" />
+          <DiscoveryRelationship TypeID="Ambari.SCOM.MapReduce2ServiceContainsHistoryServerComponent" />
+          <DiscoveryRelationship TypeID="Ambari.SCOM.YarnServiceContainsNodeManagerComponent" />
+          <DiscoveryRelationship TypeID="Ambari.SCOM.YarnServiceContainsResourceManagerComponent" />
         </DiscoveryTypes>
         <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentsDiscoveryDataSource">
           <IntervalSeconds>14400</IntervalSeconds>
@@ -59,7 +68,6 @@
       </Discovery>
     </Discoveries>
   </Monitoring>
-
   <LanguagePacks>
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
@@ -68,6 +76,16 @@
           <Description>This workflow discovers all types of Hadoop Host Components running on specific host.</Description>
         </DisplayString>
       </DisplayStrings>
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.Discovery.HostComponents" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This workflow discovers all types of Hadoop Host Components running on specific host.</para>
+            </section>
+          </MamlContent>
+        </KnowledgeArticle>
+      </KnowledgeArticles>
     </LanguagePack>
   </LanguagePacks>
 </ManagementPackFragment>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj
index 5a5008b..7a821aa 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj
@@ -22,10 +22,10 @@
     <RootNamespace>Ambari.SCOM</RootNamespace>
     <Name>Ambari SCOM Monitoring</Name>
     <ManagementPackName>Ambari.SCOM.Monitoring</ManagementPackName>
-    <Version>1.0.0.1</Version>
+    <Version>2.0.0.0</Version>
     <MpFrameworkVersion>v7.0</MpFrameworkVersion>
     <MpFrameworkProfile>OM</MpFrameworkProfile>
-    <ProductVersion>1.0.0.1</ProductVersion>
+    <ProductVersion>2.0.0.0</ProductVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccProvider>SAK</SccProvider>
     <SccAuxPath>SAK</SccAuxPath>
@@ -42,7 +42,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>false</DebugSymbols>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release\</OutputPath>
     <DelaySigning>False</DelaySigning>
     <Company>MyCompany</Company>
     <Copyright>Copyright (c) MyCompany. All rights reserved.</Copyright>
@@ -166,6 +166,12 @@
     <Compile Include="Modules\DataSources\Monitoring\BaseScriptedPropertyBagDataSource.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Modules\DataSources\Monitoring\CustomEventProvider.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Modules\DataSources\Monitoring\SyntheticTransactionDataSource.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Modules\DataSources\Monitoring\HdfsServiceMetricsDataSource.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -190,9 +196,24 @@
     <Compile Include="Modules\DataSources\Monitoring\MapReduceServiceMetricsPerformanceDataSource.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Modules\DataSources\Monitoring\YarnServiceMetricsDataSource.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Modules\DataSources\Monitoring\YarnServiceMetricsPerformanceDataSource.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Modules\ProbeActions\ImpersonatedPowerShellPropertyBagProbe.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Monitors\ErrorHandling\APIAuthenticationMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Monitors\ErrorHandling\APIAvailabilityMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Monitors\ErrorHandling\TimeoutMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Monitors\HdfsService\CorruptedBlocksUnitMonitor.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -205,6 +226,12 @@
     <Compile Include="Monitors\HdfsService\UnderReplicatedBlocksUnitMonitor.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Monitors\HostComponentsHeathState\DataNodeHealthStateUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Monitors\HostComponentsHeathState\HistoryServerHealthStateUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Monitors\HostComponentsHeathState\HiveMetastoreHealthStateUnitMonitor.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -217,9 +244,15 @@
     <Compile Include="Monitors\HostComponentsHeathState\NameNodeHealthStateUnitMonitor.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Monitors\HostComponentsHeathState\NodeManagerHealthStateUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Monitors\HostComponentsHeathState\OozieServerHealthStateUnitMonitor.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Monitors\HostComponentsHeathState\ResourceManagerHealthStateUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Monitors\HostComponentsHeathState\SecondaryNameNodeHealthStateUnitMonitor.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -244,6 +277,21 @@
     <Compile Include="Monitors\NameNode\MemoryHeapUsageUnitMonitor.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Monitors\ResourceManager\AppsFailedUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Monitors\ResourceManager\LostNMsUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Monitors\ResourceManager\MemoryHeapUsageUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Monitors\ResourceManager\UnhealthyNMsUnitMonitor.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Monitors\Rollups\HistoryServerToMapReduce2ServiceRollup.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Monitors\Rollups\HiveMetastoreComponentToHiveServiceRollup.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -265,9 +313,15 @@
     <Compile Include="Monitors\Rollups\NameNodeComponentToHdfsServiceRollup.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Monitors\Rollups\NodeManagerToYARNServiceRollup.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Monitors\Rollups\OozieServerComponentToOozieServiceRollup.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Monitors\Rollups\ResourceManagerToYARNServiceRollup.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Monitors\Rollups\SecondaryNameNodeComponentToHdfsServiceRollup.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -295,6 +349,15 @@
     <Compile Include="MonitorTypes\HostComponentHealthStateMonitorType.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="MonitorTypes\RepeatedEventLogManualReset2StateMonitorType.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MonitorTypes\SyntheticTransactionMonitorType.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MonitorTypes\YarnServiceThreeStateThresholdMonitorType.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Presentation\ActiveAlerts.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -304,6 +367,9 @@
     <Compile Include="References.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Rules\ErrorHandling\GeneralErrorCollectionRule.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Rules\Performance\HdfsService\BlocksReadCollection.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -367,6 +433,48 @@
     <Compile Include="Rules\Performance\HdfsService\UnderReplicatedBlocksCollection.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlockChecksumOpsAvgTimeCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlockCopyOpsAvgTimeCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlockReadOpsAvgTimeCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlockReplaceOpsAvgTimeCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlocksReadCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlocksRemovedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlocksReplicatedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlocksVerifiedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlocksWrittenCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlockVerificationFailuresCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BlockWriteOpsAvgTimeCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BytesReadCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\BytesWrittenCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\DataNode\HeartBeatsAvgTimeCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Rules\Performance\HostComponents\HeadNode\GcCountCollection.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -403,6 +511,93 @@
     <Compile Include="Rules\Performance\HostComponents\HeadNode\SentBytesCollection.mpx">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\ActiveApplicationsCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\ActiveNMCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\ActiveUsersCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AggregateContainersAllocatedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AggregateContainersReleasedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AllocatedContainersCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AllocatedMBCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AllocatedVCoresCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AppsCompletedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AppsFailedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AppsKilledCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AppsPendingCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AppsRunningCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AppsSubmittedCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AvailableMBCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\AvailableVCoresCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\DecommissionedNMCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\LostNMCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\PendingContainersCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\PendingMBCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\PendingVCoresCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\RebootedNMCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\ReservedContainersCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\ReservedMBCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\ReservedVCoresCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\running_1440Collection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\running_300Collection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\running_60Collection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rules\Performance\HostComponents\ResourceManager\UnhealthyNMCollection.mpx">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Rules\Performance\HostComponents\Shared\GcTimeCollection.mpx">
       <SubType>Code</SubType>
     </Compile>
@@ -584,9 +779,14 @@
     <Folder Include="Monitors\MapReduceService" />
     <Folder Include="Monitors\JobTracker" />
     <Folder Include="Monitors\HostComponentsHeathState" />
+    <Folder Include="Monitors\ErrorHandling" />
+    <Folder Include="Monitors\ResourceManager" />
     <Folder Include="Monitors\Rollups" />
     <Folder Include="MonitorTypes" />
     <Folder Include="Rules" />
+    <Folder Include="Rules\ErrorHandling" />
+    <Folder Include="Rules\Performance\HostComponents\DataNode" />
+    <Folder Include="Rules\Performance\HostComponents\ResourceManager" />
     <Folder Include="Rules\Widgets" />
     <Folder Include="Rules\Performance" />
     <Folder Include="Presentation" />
@@ -608,6 +808,8 @@
     <EmbeddedResource Include="Modules\DataSources\Monitoring\Scripts\HostComponentHealthState.ps1" />
     <EmbeddedResource Include="Modules\DataSources\Monitoring\Scripts\HostComponentMetrics.ps1" />
     <EmbeddedResource Include="Modules\DataSources\Monitoring\Scripts\MapReduceServiceMetrics.ps1" />
+    <EmbeddedResource Include="Modules\DataSources\Monitoring\Scripts\SyntheticTransaction.ps1" />
+    <EmbeddedResource Include="Modules\DataSources\Monitoring\Scripts\YarnServiceMetrics.ps1" />
     <EmbeddedResource Include="Shared Scripts\DiscoveryHelpers.ps1" />
     <EmbeddedResource Include="Shared Scripts\HealthServicesManagement.ps1" />
     <EmbeddedResource Include="Shared Scripts\JsonParser.ps1" />
@@ -769,5 +971,49 @@
       <PackageToBundle>True</PackageToBundle>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\HistoryServer.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\HistoryServer_.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\Mapreduce2.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\Mapreduce2Client.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\Mapreduce2Client_.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\Mapreduce2_.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\NodeManager.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\NodeManager_.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\ResourceManager.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\ResourceManager_.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\Yarn.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\YarnClient.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\YarnClient_.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Images\Yarn_.png">
+      <SubType>Content</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VSAC\Microsoft.SystemCenter.OperationsManager.targets" />
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj.user
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj.user b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj.user
index f901b2a..501f2ce 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj.user
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/HadoopMp.mpproj.user
@@ -17,7 +17,7 @@
 ## under the License.-->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DeploymentNextVersion>1.0.0.56</DeploymentNextVersion>
+    <DeploymentNextVersion>1.0.0.183</DeploymentNextVersion>
     <DeploymentAutoIncrementVersion>False</DeploymentAutoIncrementVersion>
     <DeploymentStartAction>None</DeploymentStartAction>
     <DeploymentWebConsoleUrl />

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/GQR.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/GQR.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/GQR.png
new file mode 100644
index 0000000..2d65ba7
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/GQR.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer.png
new file mode 100644
index 0000000..b622dec
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer_.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer_.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer_.png
new file mode 100644
index 0000000..65e50f9
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/HistoryServer_.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Icons.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Icons.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Icons.mpx
index d5ec5f6..30a8968 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Icons.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Icons.mpx
@@ -62,6 +62,20 @@
     <Category ID="Ambari.SCOM.Resources.Images.TempletonServiceDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.TempletonServiceDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
     <Category ID="Ambari.SCOM.Resources.Images.TempletonServer16IconCategory" Target="Ambari.SCOM.Resources.Images.TempletonServer16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
     <Category ID="Ambari.SCOM.Resources.Images.TempletonServerDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.TempletonServerDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
+    <Category ID="Ambari.SCOM.Resources.Images.Mapreduce2Service16IconCategory" Target="Ambari.SCOM.Resources.Images.Mapreduce2Service16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
+    <Category ID="Ambari.SCOM.Resources.Images.Mapreduce2ServiceDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.Mapreduce2ServiceDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
+    <Category ID="Ambari.SCOM.Resources.Images.Mapreduce2Client16IconCategory" Target="Ambari.SCOM.Resources.Images.Mapreduce2Client16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
+    <Category ID="Ambari.SCOM.Resources.Images.Mapreduce2ClientDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.Mapreduce2ClientDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
+    <Category ID="Ambari.SCOM.Resources.Images.NodeManager16IconCategory" Target="Ambari.SCOM.Resources.Images.NodeManager16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
+    <Category ID="Ambari.SCOM.Resources.Images.NodeManagerDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.NodeManagerDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
+    <Category ID="Ambari.SCOM.Resources.Images.ResourceManager16IconCategory" Target="Ambari.SCOM.Resources.Images.ResourceManager16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
+    <Category ID="Ambari.SCOM.Resources.Images.ResourceManagerDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.ResourceManagerDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
+    <Category ID="Ambari.SCOM.Resources.Images.Yarn16IconCategory" Target="Ambari.SCOM.Resources.Images.YarnService16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
+    <Category ID="Ambari.SCOM.Resources.Images.YarnDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.YarnServiceDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
+    <Category ID="Ambari.SCOM.Resources.Images.YarnClient16IconCategory" Target="Ambari.SCOM.Resources.Images.YarnClient16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
+    <Category ID="Ambari.SCOM.Resources.Images.YarnClientDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.YarnClientDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
+    <Category ID="Ambari.SCOM.Resources.Images.HistoryServer16IconCategory" Target="Ambari.SCOM.Resources.Images.HistoryServer16Icon" Value="System!System.Internal.ManagementPack.Images.u16x16Icon" />
+    <Category ID="Ambari.SCOM.Resources.Images.HistoryServerDiagramIconCategory" Target="Ambari.SCOM.Resources.Images.HistoryServerDiagramIcon" Value="System!System.Internal.ManagementPack.Images.DiagramIcon" />
   </Categories>
 
   <Resources>
@@ -111,6 +125,20 @@
     <Image ID="Ambari.SCOM.Resources.Images.TempletonServiceDiagramIcon" FileName="TempletonService.png" Accessibility="Public" />
     <Image ID="Ambari.SCOM.Resources.Images.TempletonServer16Icon" FileName="TrmpletonServer_.png" Accessibility="Public" />
     <Image ID="Ambari.SCOM.Resources.Images.TempletonServerDiagramIcon" FileName="TrmpletonServer.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.Mapreduce2Service16Icon" FileName="Mapreduce2_.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.Mapreduce2ServiceDiagramIcon" FileName="Mapreduce2.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.Mapreduce2Client16Icon" FileName="Mapreduce2Client_.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.Mapreduce2ClientDiagramIcon" FileName="Mapreduce2Client.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.NodeManager16Icon" FileName="NodeManager_.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.NodeManagerDiagramIcon" FileName="NodeManager.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.ResourceManager16Icon" FileName="ResourceManager_.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.ResourceManagerDiagramIcon" FileName="ResourceManager.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.YarnService16Icon" FileName="Yarn_.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.YarnServiceDiagramIcon" FileName="Yarn.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.YarnClient16Icon" FileName="YarnClient_.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.YarnClientDiagramIcon" FileName="YarnClient.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.HistoryServer16Icon" FileName="HistoryServer_.png" Accessibility="Public" />
+    <Image ID="Ambari.SCOM.Resources.Images.HistoryServerDiagramIcon" FileName="HistoryServer.png" Accessibility="Public" />
   </Resources>
   
 </ManagementPackFragment>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2.png
new file mode 100644
index 0000000..870929e
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client.png
new file mode 100644
index 0000000..b7b6a2d
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client_.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client_.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client_.png
new file mode 100644
index 0000000..06dd458
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2Client_.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2_.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2_.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2_.png
new file mode 100644
index 0000000..d15521b
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Mapreduce2_.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager.png
new file mode 100644
index 0000000..0df0490
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager_.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager_.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager_.png
new file mode 100644
index 0000000..9f6fcfc
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/NodeManager_.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager.png
new file mode 100644
index 0000000..3d8ffd6
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager_.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager_.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager_.png
new file mode 100644
index 0000000..664f371
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/ResourceManager_.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn.png
new file mode 100644
index 0000000..317c9b6
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient.png
new file mode 100644
index 0000000..917919a
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient_.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient_.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient_.png
new file mode 100644
index 0000000..3a8c36a
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/YarnClient_.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn_.png
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn_.png b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn_.png
new file mode 100644
index 0000000..caa1b40
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Images/Yarn_.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/MPResources.resources
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/MPResources.resources b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/MPResources.resources
new file mode 100644
index 0000000..c8c6000
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/MPResources.resources differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/ManagementPack.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/ManagementPack.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/ManagementPack.mpx
index 4e73fd1..a00b4d9 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/ManagementPack.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/ManagementPack.mpx
@@ -24,6 +24,16 @@
           <Description>This management pack discovers and monitors Hadoop clusters.</Description>
         </DisplayString>
       </DisplayStrings>
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.Monitoring" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This management pack discovers and monitors Hadoop clusters.</para>
+            </section>
+          </MamlContent>
+        </KnowledgeArticle>
+      </KnowledgeArticles>
     </LanguagePack>
   </LanguagePacks>
 </ManagementPackFragment>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/ConditionDetections/PropertyBagMultiplePerformanceDataMapper.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/ConditionDetections/PropertyBagMultiplePerformanceDataMapper.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/ConditionDetections/PropertyBagMultiplePerformanceDataMapper.mpx
index 777fddb..a656455 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/ConditionDetections/PropertyBagMultiplePerformanceDataMapper.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/ConditionDetections/PropertyBagMultiplePerformanceDataMapper.mpx
@@ -93,7 +93,11 @@
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
         <DisplayString ElementID="Ambari.SCOM.Module.PropertyBagMultiplePerformanceDataMapper">
-          <Name>Hadoop Property Bag Performance Data Mapper</Name>
+          <Name>Hadoop Property Bag Multiple Performance Data Mapper</Name>
+          <Description>Converts property bag to Linked Performance Data.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Module.PropertyBagMultiplePerformanceDataMapperInternal">
+          <Name>Hadoop Internal Property Bag Multiple Performance Data Mapper</Name>
           <Description>Converts property bag to Linked Performance Data.</Description>
         </DisplayString>
       </DisplayStrings>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/PowerShellDiscoveryDataSource.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/PowerShellDiscoveryDataSource.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/PowerShellDiscoveryDataSource.mpx
index 66284da..e82c135 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/PowerShellDiscoveryDataSource.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/PowerShellDiscoveryDataSource.mpx
@@ -46,16 +46,38 @@
                   $IncludeFileContent/Shared Scripts/DiscoveryHelpers.ps1$
 
                   $ScriptApi = New-Object -ComObject "MOM.ScriptAPI"
-                  
+
                   try {
-                    if (!$Username) {
-                      CreateEmptyDiscoveryData
-                      return
-                    }
-                    Main
+                  if (!$Username) {
+                  CreateEmptyDiscoveryData
+                  return
+                  }
+                  Main
+                  } catch [System.Net.WebException] {
+                  if ($_.Exception.Response.StatusCode -eq [System.Net.HttpStatusCode]::Forbidden)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1902
+                  }
+                  elseif ($_.Exception.Response.StatusCode -eq [System.Net.HttpStatusCode]::NotFound)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1903
+                  }
+                  elseif ($_.Exception.Status -eq [System.Net.WebExceptionStatus]::ConnConnectFailure)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1903
+                  }
+                  elseif ($_.Exception.Status -eq [System.Net.WebExceptionStatus]::Timeout)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1904
+                  }
+                  else
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1901
+                  }
+                  CreateEmptyDiscoveryData
                   } catch {
-                    LogMessage '$Config/WorkflowName$' 1 $_
-                    CreateEmptyDiscoveryData
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1901
+                  CreateEmptyDiscoveryData
                   }
                 </ScriptBody>
                 <Parameters>$Config/Parameters$</Parameters>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1 b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
index cda6b14..4cd6498 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
@@ -64,6 +64,8 @@ function GetServiceClassId($monitoringUri) {
         'oozie' { '$MPElement[Name="Ambari.SCOM.ClusterService.Oozie"]$' }
         'pig' { '$MPElement[Name="Ambari.SCOM.ClusterService.Pig"]$' }
         'sqoop' { '$MPElement[Name="Ambari.SCOM.ClusterService.Sqoop"]$' }
+        'mapreduce2' { '$MPElement[Name="Ambari.SCOM.ClusterService.MapReduce2"]$' }
+        'yarn' { '$MPElement[Name="Ambari.SCOM.ClusterService.Yarn"]$' }
         default: { $null }
     }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1 b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1
index f2c29ce..5ae54bd 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/HostComponentsDiscovery.ps1
@@ -40,6 +40,10 @@ function Main() {
         $componentEntity.AddProperty('$MPElement[Name="Ambari.SCOM.HostComponent"]/ClusterName$', $ClusterName)
         $componentEntity.AddProperty('$MPElement[Name="Ambari.SCOM.HostComponent"]/ComponentName$', $componentName)
         $componentEntity.AddProperty('$MPElement[Name="System!System.Entity"]/DisplayName$', (FormatHostComponentName $componentName))
+		if ($componentClassId -eq '$MPElement[Name="Ambari.SCOM.HostComponent.NodeManager"]$') 
+		{ 
+	        $componentEntity.AddProperty('$MPElement[Name="Ambari.SCOM.HostComponent.NodeManager"]/ParentHostName$', $HostName)
+		}
         $discoveryData.AddInstance($componentEntity)
 
         $parentServiceName = GetParentServiceName $componentName
@@ -65,6 +69,7 @@ function GetComponentClassId($componentName) {
         'secondary_namenode' { '$MPElement[Name="Ambari.SCOM.HostComponent.SecondaryNameNode"]$' }
         'jobtracker' { '$MPElement[Name="Ambari.SCOM.HostComponent.JobTracker"]$' }
         'tasktracker' { '$MPElement[Name="Ambari.SCOM.HostComponent.TaskTracker"]$' }
+        'datanode' { '$MPElement[Name="Ambari.SCOM.HostComponent.DataNode"]$' }
         'hive_server' { '$MPElement[Name="Ambari.SCOM.HostComponent.HiveServer"]$' }
         'hive_metastore' { '$MPElement[Name="Ambari.SCOM.HostComponent.HiveMetastore"]$' }
         'hive_client' { '$MPElement[Name="Ambari.SCOM.HostComponent.HiveClient"]$' }
@@ -72,6 +77,11 @@ function GetComponentClassId($componentName) {
         'oozie_server' { '$MPElement[Name="Ambari.SCOM.HostComponent.OozieServer"]$' }
         'pig' { '$MPElement[Name="Ambari.SCOM.HostComponent.Pig"]$' }
         'sqoop' { '$MPElement[Name="Ambari.SCOM.HostComponent.Sqoop"]$' }
+        'historyserver' { '$MPElement[Name="Ambari.SCOM.HostComponent.HistoryServer"]$' }
+        'mapreduce2_client' { '$MPElement[Name="Ambari.SCOM.HostComponent.MapReduce2Client"]$' }
+        'nodemanager' { '$MPElement[Name="Ambari.SCOM.HostComponent.NodeManager"]$' }
+        'resourcemanager' { '$MPElement[Name="Ambari.SCOM.HostComponent.ResourceManager"]$' }
+        'yarn_client' { '$MPElement[Name="Ambari.SCOM.HostComponent.YarnClient"]$' }
         default { $null }
     }
 }
@@ -86,6 +96,8 @@ function GetParentServiceName($componentName) {
         'oozie_server' { 'OOZIE' }
         'pig' { 'PIG' }
         'sqoop' { 'SQOOP' }
+        { 'historyserver', 'mapreduce2_client' -contains $_ } { 'MAPREDUCE2' }
+        { 'nodemanager', 'resourcemanager', 'yarn_client' -contains $_ } { 'YARN' }
         default { $null }
     }
 }
@@ -99,6 +111,8 @@ function CreateParentService($discoveryData, $serviceName) {
         'oozie' { '$MPElement[Name="Ambari.SCOM.ClusterService.Oozie"]$' }
         'pig' { '$MPElement[Name="Ambari.SCOM.ClusterService.Pig"]$' }
         'sqoop' { '$MPElement[Name="Ambari.SCOM.ClusterService.Sqoop"]$' }
+        'mapreduce2' { '$MPElement[Name="Ambari.SCOM.ClusterService.MapReduce2"]$' }
+        'yarn' { '$MPElement[Name="Ambari.SCOM.ClusterService.Yarn"]$' }
     }
 
     $serviceDisplayName = FormatClusterServiceName $serviceName
@@ -129,6 +143,9 @@ function GetParentServiceRelationshipId($componentName) {
         'hive_metastore' { '$MPElement[Name="Ambari.SCOM.HiveServiceContainsHiveMetastoreComponent"]$' }
         {'templeton', 'webhcat_server' -contains $_ } { '$MPElement[Name="Ambari.SCOM.TempletonServiceContainsTempletonServerComponent"]$' }
         'oozie_server' { '$MPElement[Name="Ambari.SCOM.OozieServiceContainsOozieServerComponent"]$' }
+		'historyserver' { '$MPElement[Name="Ambari.SCOM.MapReduce2ServiceContainsHistoryServerComponent"]$' }
+		'nodemanager' { '$MPElement[Name="Ambari.SCOM.YarnServiceContainsNodeManagerComponent"]$' }
+		'resourcemanager' { '$MPElement[Name="Ambari.SCOM.YarnServiceContainsResourceManagerComponent"]$' }
         default { '$MPElement[Name="Ambari.SCOM.ClusterServiceContainsHostComponent"]$' }
     }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/BaseScriptedPropertyBagDataSource.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/BaseScriptedPropertyBagDataSource.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/BaseScriptedPropertyBagDataSource.mpx
index 986104b..1e3d86b 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/BaseScriptedPropertyBagDataSource.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/BaseScriptedPropertyBagDataSource.mpx
@@ -52,12 +52,34 @@
                   $IncludeFileContent/Shared Scripts/MonitoringHelpers.ps1$
 
                   if (!$Username) { return }
-                  
+
                   $ScriptApi = New-Object -ComObject "MOM.ScriptAPI"
+
                   try {
-                    Main
+                  Main
+                  } catch [System.Net.WebException] {
+                  if ($_.Exception.Response.StatusCode -eq [System.Net.HttpStatusCode]::Forbidden)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1902
+                  }
+                  elseif ($_.Exception.Response.StatusCode -eq [System.Net.HttpStatusCode]::NotFound)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1903
+                  }
+                  elseif ($_.Exception.Status -eq [System.Net.WebExceptionStatus]::ConnConnectFailure)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1903
+                  }
+                  elseif ($_.Exception.Status -eq [System.Net.WebExceptionStatus]::Timeout)
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1904
+                  }
+                  else
+                  {
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1901
+                  }
                   } catch {
-                    LogMessage '$Config/WorkflowName$' 1 $_
+                  LogMessage '$Config/WorkflowName$' 1 $_ 1901
                   }
                 </ScriptBody>
                 <Parameters>$Config/Parameters$</Parameters>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/CustomEventProvider.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/CustomEventProvider.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/CustomEventProvider.mpx
new file mode 100644
index 0000000..161f11d
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Monitoring/CustomEventProvider.mpx
@@ -0,0 +1,65 @@
+´╗┐<!--## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.-->
+
+<ManagementPackFragment SchemaVersion="2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <TypeDefinitions>
+    <ModuleTypes>
+      <DataSourceModuleType ID="Ambari.SCOM.Module.CustomEventProvider" Accessibility="Public">
+        <Configuration>
+          <xsd:element name="ComputerName" type="xsd:string" />
+          <xsd:element name="LogName" type="xsd:string" />
+          <xsd:element name="EventNumber" type="xsd:integer" />
+        </Configuration>
+        <ModuleImplementation>
+          <Composite>
+            <MemberModules>
+              <DataSource ID="EP" TypeID="Windows!Microsoft.Windows.EventProvider">
+                <ComputerName>$Config/ComputerName$</ComputerName>
+                <LogName>$Config/LogName$</LogName>
+                <Expression>
+                  <SimpleExpression>
+                    <ValueExpression>
+                      <XPathQuery Type="UnsignedInteger">EventNumber</XPathQuery>
+                    </ValueExpression>
+                    <Operator>Equal</Operator>
+                    <ValueExpression>
+                      <Value Type="UnsignedInteger">$Config/EventNumber$</Value>
+                    </ValueExpression>
+                  </SimpleExpression>
+                </Expression>
+              </DataSource>
+            </MemberModules>
+            <Composition>
+              <Node ID="EP"></Node>
+            </Composition>
+          </Composite>
+        </ModuleImplementation>
+        <OutputType>Windows!Microsoft.Windows.EventData</OutputType>
+      </DataSourceModuleType>
+    </ModuleTypes>
+  </TypeDefinitions>
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.Module.CustomEventProvider">
+          <Name>Custom event provider with event id parameter</Name>
+          <Description>Custom event provider with event id parameter</Description>
+        </DisplayString>
+      </DisplayStrings>
+    </LanguagePack>
+  </LanguagePacks>
+</ManagementPackFragment>


Mime
View raw message