ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abaranc...@apache.org
Subject [4/8] AMBARI-5296 - update Management Pack to support Hadoop MapReduce2 and YARN services (Anatoly Nikonorov via abaranchuk)
Date Wed, 02 Apr 2014 14:21:39 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/HostComponentsHeathState/TempletonServerHealthStateUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/HostComponentsHeathState/TempletonServerHealthStateUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/HostComponentsHeathState/TempletonServerHealthStateUnitMonitor.mpx
index cc86ca0..de5d1c6 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/HostComponentsHeathState/TempletonServerHealthStateUnitMonitor.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/HostComponentsHeathState/TempletonServerHealthStateUnitMonitor.mpx
@@ -56,8 +56,8 @@
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
         <DisplayString ElementID="Ambari.SCOM.UnitMonitor.TempletonServerComponentHealthState">
-          <Name>Templeton/WebHCat Server Service State</Name>
-          <Description>Gives critical alert if a Templeton Server service is unavailable.</Description>
+          <Name>WebHCat Server Service State</Name>
+          <Description>Gives critical alert if a WebHCat Server service is unavailable.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.UnitMonitor.TempletonServerComponentHealthState" SubElementID="Healthy">
           <Name>Running</Name>
@@ -67,8 +67,8 @@
         </DisplayString>
 
         <DisplayString ElementID="Ambari.SCOM.UnitMonitor.TempletonServerComponentHealthState.AlertMessage">
-          <Name>Templeton Server service is not running.</Name>
-          <Description>Templeton Server hosted on "{0}" in cluster "{1}" is not running.</Description>
+          <Name>WebHCat Server service is not running.</Name>
+          <Description>WebHCat Server hosted on "{0}" in cluster "{1}" is not running.</Description>
         </DisplayString>
       </DisplayStrings>
 
@@ -77,7 +77,7 @@
           <MamlContent>
             <section xmlns="http://schemas.microsoft.com/maml/2004/10">
               <title>Summary</title>
-              <para>Gives critical alert if a Templeton Server service is unavailable.</para>
+              <para>Gives critical alert if a WebHCat Server service is unavailable.</para>
             </section>
             <section xmlns="http://schemas.microsoft.com/maml/2004/10">
               <title>Causes</title>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/JobTracker/MemoryHeapUsageUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/JobTracker/MemoryHeapUsageUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/JobTracker/MemoryHeapUsageUnitMonitor.mpx
index 1cfeeed..82801a5 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/JobTracker/MemoryHeapUsageUnitMonitor.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/JobTracker/MemoryHeapUsageUnitMonitor.mpx
@@ -61,7 +61,7 @@
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
         <DisplayString ElementID="Ambari.SCOM.UnitMonitor.JobTrackerMemoryHeapUsed">
-          <Name>Memory Heap Usage</Name>
+          <Name>JobTracker Memory Heap Usage</Name>
           <Description>Gives warning/critical alert if percentage of used job-tracker memory heap is more than lower/upper threshold.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.UnitMonitor.JobTrackerMemoryHeapUsed" SubElementID="Healthy">

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/MapReduceService/FailedJobsUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/MapReduceService/FailedJobsUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/MapReduceService/FailedJobsUnitMonitor.mpx
index 25aa50b..2650bce 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/MapReduceService/FailedJobsUnitMonitor.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/MapReduceService/FailedJobsUnitMonitor.mpx
@@ -25,7 +25,7 @@
                    Remotable="true" Priority="Normal" Accessibility="Public" Enabled="true" ConfirmDelivery="true">
         <Category>PerformanceHealth</Category>
         <AlertSettings AlertMessage="Ambari.SCOM.UnitMonitor.MapReduceFailedJobs.AlertMessage">
-          <AlertOnState>Error</AlertOnState>
+          <AlertOnState>Warning</AlertOnState>
           <AutoResolve>true</AutoResolve>
           <AlertPriority>Normal</AlertPriority>
           <AlertSeverity>MatchMonitorHealth</AlertSeverity>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/NameNode/MemoryHeapUsageUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/NameNode/MemoryHeapUsageUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/NameNode/MemoryHeapUsageUnitMonitor.mpx
index 1025a19..2e8291b 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/NameNode/MemoryHeapUsageUnitMonitor.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/NameNode/MemoryHeapUsageUnitMonitor.mpx
@@ -61,7 +61,7 @@
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
         <DisplayString ElementID="Ambari.SCOM.UnitMonitor.NameNodeMemoryHeapUsed">
-          <Name>Memory Heap Usage</Name>
+          <Name>NameNode Memory Heap Usage</Name>
           <Description>Gives warning/critical alert if percentage of used NameNode memory heap is more than lower/upper threshold.</Description>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.UnitMonitor.NameNodeMemoryHeapUsed" SubElementID="Healthy">

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/AppsFailedUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/AppsFailedUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/AppsFailedUnitMonitor.mpx
new file mode 100644
index 0000000..f1da8a0
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/AppsFailedUnitMonitor.mpx
@@ -0,0 +1,102 @@
+<!--## 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">
+  <Monitoring>
+    <Monitors>
+      <UnitMonitor ID="Ambari.SCOM.UnitMonitor.YarnAppsFailed"
+                   TypeID="Ambari.SCOM.UnitMonitorType.YarnServiceThreeStateThreshold"
+                   Target="Ambari.SCOM.ClusterService.Yarn"
+                   ParentMonitorID="Health!System.Health.PerformanceState"
+                   Remotable="true" Priority="Normal" Accessibility="Public" Enabled="true" ConfirmDelivery="true">
+        <Category>PerformanceHealth</Category>
+        <AlertSettings AlertMessage="Ambari.SCOM.UnitMonitor.YarnAppsFailed.AlertMessage">
+          <AlertOnState>Warning</AlertOnState>
+          <AutoResolve>true</AutoResolve>
+          <AlertPriority>Normal</AlertPriority>
+          <AlertSeverity>MatchMonitorHealth</AlertSeverity>
+          <AlertParameters>
+            <AlertParameter1>$Target/Host/Property[Type="Ambari.SCOM.ClusterService.Private"]/ClusterName$</AlertParameter1>
+          </AlertParameters>
+        </AlertSettings>
+        <OperationalStates>
+          <OperationalState ID="Healthy" MonitorTypeStateID="Healthy" HealthState="Success" />
+          <OperationalState ID="Warning" MonitorTypeStateID="Warning" HealthState="Warning" />
+          <OperationalState ID="Critical" MonitorTypeStateID="Critical" HealthState="Error" />
+        </OperationalStates>
+        <Configuration>
+          <IntervalSeconds>900</IntervalSeconds>
+          <TimeoutSeconds>300</TimeoutSeconds>
+          <PropertyName>appsfailed_percent</PropertyName>
+          <TheGreaterTheBetter>false</TheGreaterTheBetter>
+          <WarningThreshold>10</WarningThreshold>
+          <CriticalThreshold>40</CriticalThreshold>
+        </Configuration>
+      </UnitMonitor>
+    </Monitors>
+  </Monitoring>
+
+  <Presentation>
+    <StringResources>
+      <StringResource ID="Ambari.SCOM.UnitMonitor.YarnAppsFailed.AlertMessage"/>
+    </StringResources>
+  </Presentation>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnAppsFailed">
+          <Name>Failed Apps</Name>
+          <Description>Gives warning/critical alert if percentage of Yarn failed apps is more than lower/upper threshold.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnAppsFailed" SubElementID="Healthy">
+          <Name>Low</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnAppsFailed" SubElementID="Warning">
+          <Name>High</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnAppsFailed" SubElementID="Critical">
+          <Name>Critical</Name>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnAppsFailed.AlertMessage">
+          <Name>Yarn apps are failing too frequently.</Name>
+          <Description>Significant number of Yarn apps are failing in cluster "{0}".</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.UnitMonitor.YarnAppsFailed" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Gives warning/critical alert if percentage of Yarn failed apps is more than lower/upper threshold.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>TBD</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>TBD</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/Monitors/ResourceManager/LostNMsUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/LostNMsUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/LostNMsUnitMonitor.mpx
new file mode 100644
index 0000000..7d849f2
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/LostNMsUnitMonitor.mpx
@@ -0,0 +1,106 @@
+<!--## 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">
+  <Monitoring>
+    <Monitors>
+      <UnitMonitor ID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers"
+                   TypeID="Ambari.SCOM.UnitMonitorType.YarnServiceThreeStateThreshold"
+                   Target="Ambari.SCOM.ClusterService.Yarn"
+                   ParentMonitorID="Health!System.Health.AvailabilityState"
+                   Remotable="true" Priority="Normal" Accessibility="Public" Enabled="true" ConfirmDelivery="true">
+        <Category>AvailabilityHealth</Category>
+        <AlertSettings AlertMessage="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers.AlertMessage">
+          <AlertOnState>Warning</AlertOnState>
+          <AutoResolve>true</AutoResolve>
+          <AlertPriority>Normal</AlertPriority>
+          <AlertSeverity>MatchMonitorHealth</AlertSeverity>
+          <AlertParameters>
+            <AlertParameter1>$Target/Host/Property[Type="Ambari.SCOM.ClusterService.Private"]/ClusterName$</AlertParameter1>
+            <AlertParameter2>$Data/Context/Property[@Name='lostnodemanagers_percent']$</AlertParameter2>
+          </AlertParameters>
+        </AlertSettings>
+        <OperationalStates>
+          <OperationalState ID="Healthy" MonitorTypeStateID="Healthy" HealthState="Success" />
+          <OperationalState ID="Warning" MonitorTypeStateID="Warning" HealthState="Warning" />
+          <OperationalState ID="Critical" MonitorTypeStateID="Critical" HealthState="Error" />
+        </OperationalStates>
+        <Configuration>
+          <IntervalSeconds>900</IntervalSeconds>
+          <TimeoutSeconds>300</TimeoutSeconds>
+          <PropertyName>lostnodemanagers_percent</PropertyName>
+          <TheGreaterTheBetter>false</TheGreaterTheBetter>
+          <WarningThreshold>10</WarningThreshold>
+          <CriticalThreshold>20</CriticalThreshold>
+        </Configuration>
+      </UnitMonitor>
+    </Monitors>
+  </Monitoring>
+
+  <Presentation>
+    <StringResources>
+      <StringResource ID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers.AlertMessage"/>
+    </StringResources>
+  </Presentation>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers">
+          <Name>Lost NodeManagers</Name>
+          <Description>Gives warning/critical alert if percentage of YARN lost NodeManagers is more than lower/upper threshold.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers" SubElementID="Healthy">
+          <Name>Low</Name>
+          <Description>Most of NodeManagers are alive</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers" SubElementID="Warning">
+          <Name>Significant</Name>
+          <Description>Significant number of NodeManagers are lost</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers" SubElementID="Critical">
+          <Name>Critical</Name>
+          <Description>Critical number of NodeManagers are lost</Description>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers.AlertMessage">
+          <Name>A significant number of NodeManagers are lost in the cluster.</Name>
+          <Description>There are {1}% lost NodeManagers in cluster "{0}".</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.UnitMonitor.YarnLostNodeManagers" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Gives warning/critical alert if percentage of YARN lost NodeManagers is more than lower/upper threshold.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>TBD</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>TBD</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/Monitors/ResourceManager/MemoryHeapUsageUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/MemoryHeapUsageUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/MemoryHeapUsageUnitMonitor.mpx
new file mode 100644
index 0000000..5b4f70a
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/MemoryHeapUsageUnitMonitor.mpx
@@ -0,0 +1,103 @@
+<!--## 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">
+  <Monitoring>
+    <Monitors>
+      <UnitMonitor ID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed"
+                   TypeID="Ambari.SCOM.UnitMonitorType.HostComponentThreeStateThreshold"
+                   Target="Ambari.SCOM.HostComponent.ResourceManager"
+                   ParentMonitorID="Health!System.Health.PerformanceState"
+                   Remotable="true" Priority="Normal" Accessibility="Public" Enabled="true" ConfirmDelivery="true">
+        <Category>PerformanceHealth</Category>
+        <AlertSettings AlertMessage="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed.AlertMessage">
+          <AlertOnState>Warning</AlertOnState>
+          <AutoResolve>true</AutoResolve>
+          <AlertPriority>Normal</AlertPriority>
+          <AlertSeverity>MatchMonitorHealth</AlertSeverity>
+          <AlertParameters>
+            <AlertParameter1>$Target/Host/Host/Property[Type="Ambari.SCOM.Host.Private"]/ClusterName$</AlertParameter1>
+            <AlertParameter2>$Data/Context/Property[@Name='calculated.memheapusedpercent']$</AlertParameter2>
+          </AlertParameters>
+        </AlertSettings>
+        <OperationalStates>
+          <OperationalState ID="Healthy" MonitorTypeStateID="Healthy" HealthState="Success" />
+          <OperationalState ID="Warning" MonitorTypeStateID="Warning" HealthState="Warning" />
+          <OperationalState ID="Critical" MonitorTypeStateID="Critical" HealthState="Error" />
+        </OperationalStates>
+        <Configuration>
+          <IntervalSeconds>900</IntervalSeconds>
+          <TimeoutSeconds>300</TimeoutSeconds>
+          <PropertyName>calculated.memheapusedpercent</PropertyName>
+          <TheGreaterTheBetter>false</TheGreaterTheBetter>
+          <WarningThreshold>80</WarningThreshold>
+          <CriticalThreshold>90</CriticalThreshold>
+        </Configuration>
+      </UnitMonitor>
+    </Monitors>
+  </Monitoring>
+
+  <Presentation>
+    <StringResources>
+      <StringResource ID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed.AlertMessage"/>
+    </StringResources>
+  </Presentation>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed">
+          <Name>ResourceManager Memory Heap Usage</Name>
+          <Description>Gives warning/critical alert if percentage of used ResourceManager memory heap is more than lower/upper threshold.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed" SubElementID="Healthy">
+          <Name>Low</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed" SubElementID="Warning">
+          <Name>High</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed" SubElementID="Critical">
+          <Name>Critical</Name>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed.AlertMessage">
+          <Name>ResourceManager is working under high memory pressure.</Name>
+          <Description>There are {1}% of committed heap memory used by ResourceManager of cluster "{0}".</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.UnitMonitor.ResourceManagerMemoryHeapUsed" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Gives warning/critical alert if percentage of used ResourceManager memory heap is more than lower/upper threshold.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>TBD</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>TBD</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/Monitors/ResourceManager/UnhealthyNMsUnitMonitor.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/UnhealthyNMsUnitMonitor.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/UnhealthyNMsUnitMonitor.mpx
new file mode 100644
index 0000000..2a3fafb
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/ResourceManager/UnhealthyNMsUnitMonitor.mpx
@@ -0,0 +1,106 @@
+<!--## 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">
+  <Monitoring>
+    <Monitors>
+      <UnitMonitor ID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers"
+                   TypeID="Ambari.SCOM.UnitMonitorType.YarnServiceThreeStateThreshold"
+                   Target="Ambari.SCOM.ClusterService.Yarn"
+                   ParentMonitorID="Health!System.Health.AvailabilityState"
+                   Remotable="true" Priority="Normal" Accessibility="Public" Enabled="true" ConfirmDelivery="true">
+        <Category>AvailabilityHealth</Category>
+        <AlertSettings AlertMessage="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers.AlertMessage">
+          <AlertOnState>Warning</AlertOnState>
+          <AutoResolve>true</AutoResolve>
+          <AlertPriority>Normal</AlertPriority>
+          <AlertSeverity>MatchMonitorHealth</AlertSeverity>
+          <AlertParameters>
+            <AlertParameter1>$Target/Host/Property[Type="Ambari.SCOM.ClusterService.Private"]/ClusterName$</AlertParameter1>
+            <AlertParameter2>$Data/Context/Property[@Name='unhealthynodemanagers_percent']$</AlertParameter2>
+          </AlertParameters>
+        </AlertSettings>
+        <OperationalStates>
+          <OperationalState ID="Healthy" MonitorTypeStateID="Healthy" HealthState="Success" />
+          <OperationalState ID="Warning" MonitorTypeStateID="Warning" HealthState="Warning" />
+          <OperationalState ID="Critical" MonitorTypeStateID="Critical" HealthState="Error" />
+        </OperationalStates>
+        <Configuration>
+          <IntervalSeconds>900</IntervalSeconds>
+          <TimeoutSeconds>300</TimeoutSeconds>
+          <PropertyName>unhealthynodemanagers_percent</PropertyName>
+          <TheGreaterTheBetter>false</TheGreaterTheBetter>
+          <WarningThreshold>10</WarningThreshold>
+          <CriticalThreshold>20</CriticalThreshold>
+        </Configuration>
+      </UnitMonitor>
+    </Monitors>
+  </Monitoring>
+
+  <Presentation>
+    <StringResources>
+      <StringResource ID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers.AlertMessage"/>
+    </StringResources>
+  </Presentation>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers">
+          <Name>Unhealthy NodeManagers</Name>
+          <Description>Gives warning/critical alert if percentage of YARN unhealthy NodeManagers is more than lower/upper threshold.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers" SubElementID="Healthy">
+          <Name>Low</Name>
+          <Description>Most of NodeManagers are alive</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers" SubElementID="Warning">
+          <Name>Significant</Name>
+          <Description>Significant number of NodeManagers are unhealthy</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers" SubElementID="Critical">
+          <Name>Critical</Name>
+          <Description>Critical number of NodeManagers are unhealthy</Description>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers.AlertMessage">
+          <Name>A significant number of NodeManagers are unhealthy in the cluster.</Name>
+          <Description>There are {1}% unhealthy NodeManagers in cluster "{0}".</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.UnitMonitor.YarnUnhealthyNodeManagers" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Gives warning/critical alert if percentage of YARN unhealthy NodeManagers is more than lower/upper threshold.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>TBD</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>TBD</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/Monitors/Rollups/ClusterServiceToSoftwareProjectionRollups.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/ClusterServiceToSoftwareProjectionRollups.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/ClusterServiceToSoftwareProjectionRollups.mpx
index 709e4cd..5e3576a 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/ClusterServiceToSoftwareProjectionRollups.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/ClusterServiceToSoftwareProjectionRollups.mpx
@@ -44,12 +44,12 @@
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
         <DisplayString ElementID="Ambari.SCOM.Rollup.ClusterServiceToSoftwareProjectionAvailability">
-          <Name>Services Health</Name>
+          <Name>Service Health</Name>
           <Description>Rolls up all Cluster Services availability monitors to the Hadoop Cluster Services Group.</Description>
         </DisplayString>
         
         <DisplayString ElementID="Ambari.SCOM.Rollup.ClusterServiceToSoftwareProjectionPerformance">
-          <Name>Services Performance</Name>
+          <Name>Service Performance</Name>
           <Description>Rolls up all Cluster Services performance monitors to the Hadoop Cluster Services Group.</Description>
         </DisplayString>
       </DisplayStrings>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/HistoryServerToMapReduce2ServiceRollup.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/HistoryServerToMapReduce2ServiceRollup.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/HistoryServerToMapReduce2ServiceRollup.mpx
new file mode 100644
index 0000000..d2a501e
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/HistoryServerToMapReduce2ServiceRollup.mpx
@@ -0,0 +1,106 @@
+<!--## 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">
+  <Monitoring>
+    <Monitors>
+      <DependencyMonitor ID="Ambari.SCOM.Rollup.HistoryServerComponentToMapReduce2ServiceAvailability"
+                         Target="Ambari.SCOM.ClusterService.MapReduce2"
+                         ParentMonitorID="Health!System.Health.AvailabilityState"
+                         RelationshipType="Ambari.SCOM.MapReduce2ServiceContainsHistoryServerComponent"
+                         MemberMonitor="Health!System.Health.AvailabilityState"
+                         Accessibility="Public" Enabled="true" Remotable="true" Priority="Normal">
+        <Category>AvailabilityHealth</Category>
+        <Algorithm>WorstOf</Algorithm>
+      </DependencyMonitor>
+
+      <DependencyMonitor ID="Ambari.SCOM.Rollup.HistoryServerComponentToMapReduce2ServicePerformance"
+                         Target="Ambari.SCOM.ClusterService.MapReduce2"
+                         ParentMonitorID="Health!System.Health.PerformanceState"
+                         RelationshipType="Ambari.SCOM.MapReduce2ServiceContainsHistoryServerComponent"
+                         MemberMonitor="Health!System.Health.PerformanceState"
+                         Accessibility="Public" Enabled="true" Remotable="true" Priority="Normal">
+        <Category>PerformanceHealth</Category>
+        <Algorithm>WorstOf</Algorithm>
+      </DependencyMonitor>
+    </Monitors>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.Rollup.HistoryServerComponentToMapReduce2ServiceAvailability">
+          <Name>HistoryServer Component Health</Name>
+          <Description>Rolls up HistoryServer Component availability monitors to the Hadoop MapReduce2 Service.</Description>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.Rollup.HistoryServerComponentToMapReduce2ServicePerformance">
+          <Name>HistoryServer Component Performance</Name>
+          <Description>Rolls up HistoryServer Component performance monitors to the Hadoop MapReduce2 Service.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.Rollup.HistoryServerComponentToMapReduce2ServiceAvailability" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This monitor is the rollup of availability monitoring for HistoryServer Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>An unhealthy state for this monitor indicates some problem with availability of HistoryServer Host Component. View all current alerts for MapReduce2 Cluster Service using this link:</para>
+              <para>
+                <navigationLink>
+                  <linkText>View Alerts</linkText>
+                  <uri href="Microsoft.SystemCenter.AlertView&amp;viewtarget={$TARGET$}" condition="View" uri="MOM.Console.Exe" />
+                </navigationLink>
+              </para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>Use the health explorer to drill down and find the cause of the unhealthy state. Use the knowledge on the specific monitor causing the issue to troubleshoot and fix the problem.</para>
+            </section>
+          </MamlContent>
+        </KnowledgeArticle>
+
+        <KnowledgeArticle ElementID="Ambari.SCOM.Rollup.HistoryServerComponentToMapReduce2ServicePerformance" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This monitor is the rollup of performance monitoring for HistoryServer Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>An unhealthy state for this monitor indicates some problem with performance of HistoryServer Host Component. View all current alerts for MapReduce2 Cluster Service using this link:</para>
+              <para>
+                <navigationLink>
+                  <linkText>View Alerts</linkText>
+                  <uri href="Microsoft.SystemCenter.AlertView&amp;viewtarget={$TARGET$}" condition="View" uri="MOM.Console.Exe" />
+                </navigationLink>
+              </para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>Use the health explorer to drill down and find the cause of the unhealthy state. Use the knowledge on the specific monitor causing the issue to troubleshoot and fix the problem.</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/Monitors/Rollups/NodeManagerToYARNServiceRollup.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/NodeManagerToYARNServiceRollup.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/NodeManagerToYARNServiceRollup.mpx
new file mode 100644
index 0000000..dc473a2
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/NodeManagerToYARNServiceRollup.mpx
@@ -0,0 +1,106 @@
+<!--## 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">
+  <Monitoring>
+    <Monitors>
+      <DependencyMonitor ID="Ambari.SCOM.Rollup.NodeManagerComponentToYarnServiceAvailability"
+                         Target="Ambari.SCOM.ClusterService.Yarn"
+                         ParentMonitorID="Health!System.Health.AvailabilityState"
+                         RelationshipType="Ambari.SCOM.YarnServiceContainsNodeManagerComponent"
+                         MemberMonitor="Health!System.Health.AvailabilityState"
+                         Accessibility="Public" Enabled="true" Remotable="true" Priority="Normal">
+        <Category>AvailabilityHealth</Category>
+        <Algorithm>WorstOf</Algorithm>
+      </DependencyMonitor>
+
+      <DependencyMonitor ID="Ambari.SCOM.Rollup.NodeManagerComponentToYarnServicePerformance"
+                         Target="Ambari.SCOM.ClusterService.Yarn"
+                         ParentMonitorID="Health!System.Health.PerformanceState"
+                         RelationshipType="Ambari.SCOM.YarnServiceContainsNodeManagerComponent"
+                         MemberMonitor="Health!System.Health.PerformanceState"
+                         Accessibility="Public" Enabled="true" Remotable="true" Priority="Normal">
+        <Category>PerformanceHealth</Category>
+        <Algorithm>WorstOf</Algorithm>
+      </DependencyMonitor>
+    </Monitors>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.Rollup.NodeManagerComponentToYarnServiceAvailability">
+          <Name>NodeManager Component Health</Name>
+          <Description>Rolls up NodeManager Component availability monitors to the Hadoop Yarn Service.</Description>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.Rollup.NodeManagerComponentToYarnServicePerformance">
+          <Name>NodeManager Component Performance</Name>
+          <Description>Rolls up NodeManager Component performance monitors to the Hadoop Yarn Service.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.Rollup.NodeManagerComponentToYarnServiceAvailability" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This monitor is the rollup of availability monitoring for NodeManager Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>An unhealthy state for this monitor indicates some problem with availability of NodeManager Host Component. View all current alerts for Yarn Cluster Service using this link:</para>
+              <para>
+                <navigationLink>
+                  <linkText>View Alerts</linkText>
+                  <uri href="Microsoft.SystemCenter.AlertView&amp;viewtarget={$TARGET$}" condition="View" uri="MOM.Console.Exe" />
+                </navigationLink>
+              </para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>Use the health explorer to drill down and find the cause of the unhealthy state. Use the knowledge on the specific monitor causing the issue to troubleshoot and fix the problem.</para>
+            </section>
+          </MamlContent>
+        </KnowledgeArticle>
+
+        <KnowledgeArticle ElementID="Ambari.SCOM.Rollup.NodeManagerComponentToYarnServicePerformance" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This monitor is the rollup of performance monitoring for NodeManager Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>An unhealthy state for this monitor indicates some problem with performance of NodeManager Host Component. View all current alerts for Yarn Cluster Service using this link:</para>
+              <para>
+                <navigationLink>
+                  <linkText>View Alerts</linkText>
+                  <uri href="Microsoft.SystemCenter.AlertView&amp;viewtarget={$TARGET$}" condition="View" uri="MOM.Console.Exe" />
+                </navigationLink>
+              </para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>Use the health explorer to drill down and find the cause of the unhealthy state. Use the knowledge on the specific monitor causing the issue to troubleshoot and fix the problem.</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/Monitors/Rollups/ResourceManagerToYARNServiceRollup.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/ResourceManagerToYARNServiceRollup.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/ResourceManagerToYARNServiceRollup.mpx
new file mode 100644
index 0000000..02b5355
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/ResourceManagerToYARNServiceRollup.mpx
@@ -0,0 +1,106 @@
+<!--## 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">
+  <Monitoring>
+    <Monitors>
+      <DependencyMonitor ID="Ambari.SCOM.Rollup.ResourceManagerComponentToYarnServiceAvailability"
+                         Target="Ambari.SCOM.ClusterService.Yarn"
+                         ParentMonitorID="Health!System.Health.AvailabilityState"
+                         RelationshipType="Ambari.SCOM.YarnServiceContainsResourceManagerComponent"
+                         MemberMonitor="Health!System.Health.AvailabilityState"
+                         Accessibility="Public" Enabled="true" Remotable="true" Priority="Normal">
+        <Category>AvailabilityHealth</Category>
+        <Algorithm>WorstOf</Algorithm>
+      </DependencyMonitor>
+
+      <DependencyMonitor ID="Ambari.SCOM.Rollup.ResourceManagerComponentToYarnServicePerformance"
+                         Target="Ambari.SCOM.ClusterService.Yarn"
+                         ParentMonitorID="Health!System.Health.PerformanceState"
+                         RelationshipType="Ambari.SCOM.YarnServiceContainsResourceManagerComponent"
+                         MemberMonitor="Health!System.Health.PerformanceState"
+                         Accessibility="Public" Enabled="true" Remotable="true" Priority="Normal">
+        <Category>PerformanceHealth</Category>
+        <Algorithm>WorstOf</Algorithm>
+      </DependencyMonitor>
+    </Monitors>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.Rollup.ResourceManagerComponentToYarnServiceAvailability">
+          <Name>ResourceManager Component Health</Name>
+          <Description>Rolls up ResourceManager Component availability monitors to the Hadoop Yarn Service.</Description>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.Rollup.ResourceManagerComponentToYarnServicePerformance">
+          <Name>ResourceManager Component Performance</Name>
+          <Description>Rolls up ResourceManager Component performance monitors to the Hadoop Yarn Service.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.Rollup.ResourceManagerComponentToYarnServiceAvailability" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This monitor is the rollup of availability monitoring for ResourceManager Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>An unhealthy state for this monitor indicates some problem with availability of ResourceManager Host Component. View all current alerts for Yarn Cluster Service using this link:</para>
+              <para>
+                <navigationLink>
+                  <linkText>View Alerts</linkText>
+                  <uri href="Microsoft.SystemCenter.AlertView&amp;viewtarget={$TARGET$}" condition="View" uri="MOM.Console.Exe" />
+                </navigationLink>
+              </para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>Use the health explorer to drill down and find the cause of the unhealthy state. Use the knowledge on the specific monitor causing the issue to troubleshoot and fix the problem.</para>
+            </section>
+          </MamlContent>
+        </KnowledgeArticle>
+
+        <KnowledgeArticle ElementID="Ambari.SCOM.Rollup.ResourceManagerComponentToYarnServicePerformance" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>This monitor is the rollup of performance monitoring for ResourceManager Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Causes</title>
+              <para>An unhealthy state for this monitor indicates some problem with performance of ResourceManager Host Component. View all current alerts for Yarn Cluster Service using this link:</para>
+              <para>
+                <navigationLink>
+                  <linkText>View Alerts</linkText>
+                  <uri href="Microsoft.SystemCenter.AlertView&amp;viewtarget={$TARGET$}" condition="View" uri="MOM.Console.Exe" />
+                </navigationLink>
+              </para>
+            </section>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Resolutions</title>
+              <para>Use the health explorer to drill down and find the cause of the unhealthy state. Use the knowledge on the specific monitor causing the issue to troubleshoot and fix the problem.</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/Monitors/Rollups/TempletonServerComponentToTempletonServiceRollup.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/TempletonServerComponentToTempletonServiceRollup.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/TempletonServerComponentToTempletonServiceRollup.mpx
index 4bb66d0..c790e96 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/TempletonServerComponentToTempletonServiceRollup.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Monitors/Rollups/TempletonServerComponentToTempletonServiceRollup.mpx
@@ -44,13 +44,13 @@
     <LanguagePack ID="ENU" IsDefault="true">
       <DisplayStrings>
         <DisplayString ElementID="Ambari.SCOM.Rollup.TempletonServerComponentToTempletonServiceAvailability">
-          <Name>Templeton Server Component Health</Name>
-          <Description>Rolls up Templeton Server Component availability monitors to the Hadoop Templeton Service.</Description>
+          <Name>WebHCat Server Component Health</Name>
+          <Description>Rolls up WebHCat Server Component availability monitors to the Hadoop WebHCat Service.</Description>
         </DisplayString>
 
         <DisplayString ElementID="Ambari.SCOM.Rollup.TempletonServerComponentToTempletonServicePerformance">
-          <Name>Templeton Server Component Performance</Name>
-          <Description>Rolls up Templeton Server Component performance monitors to the Hadoop Templeton Service.</Description>
+          <Name>WebHCat Server Component Performance</Name>
+          <Description>Rolls up WebHCat Server Component performance monitors to the Hadoop WebHCat Service.</Description>
         </DisplayString>
       </DisplayStrings>
 
@@ -59,11 +59,11 @@
           <MamlContent>
             <section xmlns="http://schemas.microsoft.com/maml/2004/10">
               <title>Summary</title>
-              <para>This monitor is the rollup of availability monitoring for Templeton Server Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+              <para>This monitor is the rollup of availability monitoring for WebHCat Server Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
             </section>
             <section xmlns="http://schemas.microsoft.com/maml/2004/10">
               <title>Causes</title>
-              <para>An unhealthy state for this monitor indicates some problem with availability of Templeton Server Host Component. View all current alerts for Templeton Cluster Service using this link:</para>
+              <para>An unhealthy state for this monitor indicates some problem with availability of WebHCat Server Host Component. View all current alerts for WebHCat Cluster Service using this link:</para>
               <para>
                 <navigationLink>
                   <linkText>View Alerts</linkText>
@@ -82,11 +82,11 @@
           <MamlContent>
             <section xmlns="http://schemas.microsoft.com/maml/2004/10">
               <title>Summary</title>
-              <para>This monitor is the rollup of performance monitoring for Templeton Server Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
+              <para>This monitor is the rollup of performance monitoring for WebHCat Server Host Component. If the state is unknown - monitoring has not been initialized yet.</para>
             </section>
             <section xmlns="http://schemas.microsoft.com/maml/2004/10">
               <title>Causes</title>
-              <para>An unhealthy state for this monitor indicates some problem with performance of Templeton Server Host Component. View all current alerts for Templeton Cluster Service using this link:</para>
+              <para>An unhealthy state for this monitor indicates some problem with performance of Templeton Server Host Component. View all current alerts for WebHCat Cluster Service using this link:</para>
               <para>
                 <navigationLink>
                   <linkText>View Alerts</linkText>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/ErrorHandling/GeneralErrorCollectionRule.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/ErrorHandling/GeneralErrorCollectionRule.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/ErrorHandling/GeneralErrorCollectionRule.mpx
new file mode 100644
index 0000000..35c2d9e
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/ErrorHandling/GeneralErrorCollectionRule.mpx
@@ -0,0 +1,86 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.GeneralErrorCollectionRule" ConfirmDelivery="false" Enabled="true" Priority="Normal" Remotable="true" Target="Ambari.SCOM.AmbariWatcherNode">
+        <Category>EventCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.CustomEventProvider">
+            <ComputerName>$Target/Host/Property[Type='Windows!Microsoft.Windows.Computer']/NetworkName$</ComputerName>
+            <LogName>Operations Manager</LogName>
+            <EventNumber>1901</EventNumber>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="GenerateAlert" TypeID="Health!System.Health.GenerateAlert">
+            <Priority>2</Priority>
+            <Severity>1</Severity>
+            <AlertMessageId>$MPElement[Name="Ambari.SCOM.GeneralErrorCollectionRule.AlertMessage"]$</AlertMessageId>
+            <AlertParameters>
+              <AlertParameter1>$Target/Host/Property[Type="Windows!Microsoft.Windows.Computer"]/NetworkName$</AlertParameter1>
+            </AlertParameters>
+            <Suppression>
+              <SuppressionValue>$Target/Host/Property[Type="Windows!Microsoft.Windows.Computer"]/NetworkName$</SuppressionValue>
+            </Suppression>
+          </WriteAction>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectEvent" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishEventData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+  <Presentation>
+    <StringResources>
+      <StringResource ID="Ambari.SCOM.GeneralErrorCollectionRule.AlertMessage" />
+    </StringResources>
+  </Presentation>
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.GeneralErrorCollectionRule.AlertMessage">
+          <Name>Error on watcher {0}.</Name>
+          <Description>Error on watcher {0}.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.GeneralErrorCollectionRule">
+          <Name>Ambari General Error rule</Name>
+          <Description>This rule detects general errors for Ambari API.</Description>
+        </DisplayString>
+      </DisplayStrings>
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.GeneralErrorCollectionRule" Visible="true">
+          <MamlContent>
+            <maml:section xmlns:maml="http://schemas.microsoft.com/maml/2004/10">
+              <maml:title>Summary</maml:title>
+              <maml:para>This rule detects general errors for Ambari API</maml:para>
+            </maml:section>
+            <maml:section xmlns:maml="http://schemas.microsoft.com/maml/2004/10">
+              <maml:title>Causes</maml:title>
+              <maml:para>This rule generates alert when Management Pack handles some general exception which is not handled by other monitors and rules.
+                You can find more details about error in Windows Event Log.</maml:para>
+            </maml:section>
+            <maml:section xmlns:maml="http://schemas.microsoft.com/maml/2004/10">
+              <maml:title>Resolutions</maml:title>
+              <maml:para>Check Event log on the watcher computer for details about the error.</maml:para>
+            </maml: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/Rules/Performance/HostComponents/DataNode/BlockChecksumOpsAvgTimeCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockChecksumOpsAvgTimeCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockChecksumOpsAvgTimeCollection.mpx
new file mode 100644
index 0000000..98bfc3b
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockChecksumOpsAvgTimeCollection.mpx
@@ -0,0 +1,62 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.PerformanceRule.DataNodeBlockChecksumOpsAvgTime"
+            Target="Ambari.SCOM.HostComponent.DataNode"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>dfs.datanode.blockchecksumop_avg_time</PropertyName>
+            <CounterName>Block Checksum Operation (Avg Time)</CounterName>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectPerformanceData" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishPerformanceData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockChecksumOpsAvgTime">
+          <Name>Collect DataNode Block Checksum Operation (Avg Time)</Name>
+          <Description>This rule collects average time of block checksum calculation operations performed on Hadoop DataNode.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockChecksumOpsAvgTime" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects average time of block checksum calculation operations performed on Hadoop DataNode.</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/Rules/Performance/HostComponents/DataNode/BlockCopyOpsAvgTimeCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockCopyOpsAvgTimeCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockCopyOpsAvgTimeCollection.mpx
new file mode 100644
index 0000000..23f1a11
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockCopyOpsAvgTimeCollection.mpx
@@ -0,0 +1,62 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.PerformanceRule.DataNodeBlockCopyOpsAvgTime"
+            Target="Ambari.SCOM.HostComponent.DataNode"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>dfs.datanode.copyblockop_avg_time</PropertyName>
+            <CounterName>Block Copy Operation (Avg Time)</CounterName>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectPerformanceData" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishPerformanceData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockCopyOpsAvgTime">
+          <Name>Collect DataNode Block Copy Operation (Avg Time)</Name>
+          <Description>This rule collects average time of block copy operations performed on Hadoop DataNode.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockCopyOpsAvgTime" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects average time of block copy operations performed on Hadoop DataNode.</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/Rules/Performance/HostComponents/DataNode/BlockReadOpsAvgTimeCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockReadOpsAvgTimeCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockReadOpsAvgTimeCollection.mpx
new file mode 100644
index 0000000..a28baa6
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockReadOpsAvgTimeCollection.mpx
@@ -0,0 +1,62 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.PerformanceRule.DataNodeBlockReadOpsAvgTime"
+            Target="Ambari.SCOM.HostComponent.DataNode"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>dfs.datanode.readblockop_avg_time</PropertyName>
+            <CounterName>Block Read Operation (Avg Time)</CounterName>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectPerformanceData" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishPerformanceData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockReadOpsAvgTime">
+          <Name>Collect DataNode Block Read Operation (Avg Time)</Name>
+          <Description>This rule collects average time of block read operations performed on Hadoop DataNode.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockReadOpsAvgTime" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects average time of block read operations performed on Hadoop DataNode.</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/Rules/Performance/HostComponents/DataNode/BlockReplaceOpsAvgTimeCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockReplaceOpsAvgTimeCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockReplaceOpsAvgTimeCollection.mpx
new file mode 100644
index 0000000..efeb98b
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockReplaceOpsAvgTimeCollection.mpx
@@ -0,0 +1,62 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.PerformanceRule.DataNodeBlockReplaceOpsAvgTime"
+            Target="Ambari.SCOM.HostComponent.DataNode"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>dfs.datanode.replaceblockop_avg_time</PropertyName>
+            <CounterName>Block Replace Operation (Avg Time)</CounterName>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectPerformanceData" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishPerformanceData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockReplaceOpsAvgTime">
+          <Name>Collect DataNode Block Replace Operation (Avg Time)</Name>
+          <Description>This rule collects average time of block replace operations performed on Hadoop DataNode.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockReplaceOpsAvgTime" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects average time of block replace operations performed on Hadoop DataNode.</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/Rules/Performance/HostComponents/DataNode/BlockVerificationFailuresCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockVerificationFailuresCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockVerificationFailuresCollection.mpx
new file mode 100644
index 0000000..e41737c
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockVerificationFailuresCollection.mpx
@@ -0,0 +1,62 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.PerformanceRule.DataNodeBlockVerificationFailures"
+            Target="Ambari.SCOM.HostComponent.DataNode"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>dfs.datanode.block_verification_failures</PropertyName>
+            <CounterName>Block Verification Failures</CounterName>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectPerformanceData" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishPerformanceData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockVerificationFailures">
+          <Name>Collect DataNode Block Verification Failures</Name>
+          <Description>This rule collects number of block verification failures on Hadoop DataNode.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockVerificationFailures" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects number of block verification failures on Hadoop DataNode.</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/Rules/Performance/HostComponents/DataNode/BlockWriteOpsAvgTimeCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockWriteOpsAvgTimeCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockWriteOpsAvgTimeCollection.mpx
new file mode 100644
index 0000000..e811e42
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlockWriteOpsAvgTimeCollection.mpx
@@ -0,0 +1,62 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.PerformanceRule.DataNodeBlockWriteOpsAvgTime"
+            Target="Ambari.SCOM.HostComponent.DataNode"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>dfs.datanode.writeblockop_avg_time</PropertyName>
+            <CounterName>Block Write Operation (Avg Time)</CounterName>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectPerformanceData" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishPerformanceData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockWriteOpsAvgTime">
+          <Name>Collect DataNode Block Write Operation (Avg Time)</Name>
+          <Description>This rule collects average time of block write operations performed on Hadoop DataNode.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlockWriteOpsAvgTime" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects average time of block write operations performed on Hadoop DataNode.</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/Rules/Performance/HostComponents/DataNode/BlocksReadCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlocksReadCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlocksReadCollection.mpx
new file mode 100644
index 0000000..7327fbc
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/DataNode/BlocksReadCollection.mpx
@@ -0,0 +1,62 @@
+<!--## 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">
+  <Monitoring>
+    <Rules>
+      <Rule ID="Ambari.SCOM.PerformanceRule.DataNodeBlocksRead"
+            Target="Ambari.SCOM.HostComponent.DataNode"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.HostComponentMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>dfs.datanode.blocks_read</PropertyName>
+            <CounterName>Blocks Read</CounterName>
+          </DataSource>
+        </DataSources>
+        <WriteActions>
+          <WriteAction ID="WriteToDB" TypeID="SC!Microsoft.SystemCenter.CollectPerformanceData" />
+          <WriteAction ID="WriteToDW" TypeID="SCDW!Microsoft.SystemCenter.DataWarehouse.PublishPerformanceData" />
+        </WriteActions>
+      </Rule>
+    </Rules>
+  </Monitoring>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlocksRead">
+          <Name>Collect DataNode Blocks Read</Name>
+          <Description>This rule collects number of blocks read by Hadoop DataNode.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.DataNodeBlocksRead" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects number of blocks read by Hadoop DataNode.</para>
+            </section>
+          </MamlContent>
+        </KnowledgeArticle>
+      </KnowledgeArticles>
+    </LanguagePack>
+  </LanguagePacks>
+</ManagementPackFragment>


Mime
View raw message