You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/04/02 16:21:37 UTC

[2/8] AMBARI-5296 - update Management Pack to support Hadoop MapReduce2 and YARN services (Anatoly Nikonorov via abaranchuk)

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingContainersCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingContainersCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingContainersCollection.mpx
new file mode 100644
index 0000000..ceafa68
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingContainersCollection.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.ResourceManagerPendingContainers"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.pendingcontainers</PropertyName>
+            <CounterName>PendingContainers</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.ResourceManagerPendingContainers">
+          <Name>Collect Number of Pending Containers</Name>
+          <Description>This rule collects number of Pending Containers.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerPendingContainers" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Pending Containers.</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/ResourceManager/PendingMBCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingMBCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingMBCollection.mpx
new file mode 100644
index 0000000..69014bd
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingMBCollection.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.ResourceManagerPendingMB"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.pendingmb</PropertyName>
+            <CounterName>PendingMB</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.ResourceManagerPendingMB">
+          <Name>Collect Number of Pending MB</Name>
+          <Description>This rule collects number of Pending MB.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerPendingMB" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Pending MB.</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/ResourceManager/PendingVCoresCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingVCoresCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingVCoresCollection.mpx
new file mode 100644
index 0000000..8b6cdd1
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/PendingVCoresCollection.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.ResourceManagerPendingVCores"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.pendingvcores</PropertyName>
+            <CounterName>PendingVCores</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.ResourceManagerPendingVCores">
+          <Name>Collect Number of Pending VCores</Name>
+          <Description>This rule collects number of Pending VCores.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerPendingVCores" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Pending VCores.</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/ResourceManager/RebootedNMCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/RebootedNMCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/RebootedNMCollection.mpx
new file mode 100644
index 0000000..8f35891
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/RebootedNMCollection.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.ResourceManagerNumRebootedNMs"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.clustermetrics.numrebootednms</PropertyName>
+            <CounterName>NumRebootedNMs</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.ResourceManagerNumRebootedNMs">
+          <Name>Collect Number of Rebooted NodeManagers</Name>
+          <Description>This rule collects number of Rebooted NodeManagers.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerNumRebootedNMs" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Rebooted NodeManagers.</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/ResourceManager/ReservedContainersCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedContainersCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedContainersCollection.mpx
new file mode 100644
index 0000000..b90bc74
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedContainersCollection.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.ResourceManagerReservedContainers"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.reservedcontainers</PropertyName>
+            <CounterName>ReservedContainers</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.ResourceManagerReservedContainers">
+          <Name>Collect Number of Reserved Containers</Name>
+          <Description>This rule collects number of Reserved Containers.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerReservedContainers" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Reserved Containers.</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/ResourceManager/ReservedMBCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedMBCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedMBCollection.mpx
new file mode 100644
index 0000000..534da13
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedMBCollection.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.ResourceManagerReservedMB"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.reservedmb</PropertyName>
+            <CounterName>ReservedMB</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.ResourceManagerReservedMB">
+          <Name>Collect Number of Reserved MB</Name>
+          <Description>This rule collects number of Reserved MB.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerReservedMB" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Reserved MB.</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/ResourceManager/ReservedVCoresCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedVCoresCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedVCoresCollection.mpx
new file mode 100644
index 0000000..f4138cb
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/ReservedVCoresCollection.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.ResourceManagerReservedVCores"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.reservedvcores</PropertyName>
+            <CounterName>ReservedVCores</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.ResourceManagerReservedVCores">
+          <Name>Collect Number of Reserved VCores</Name>
+          <Description>This rule collects number of Reserved VCores.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerReservedVCores" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Reserved VCores.</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/ResourceManager/UnhealthyNMCollection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/UnhealthyNMCollection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/UnhealthyNMCollection.mpx
new file mode 100644
index 0000000..946b252
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/UnhealthyNMCollection.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.ResourceManagerNumUnhealthyNMs"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.clustermetrics.numunhealthynms</PropertyName>
+            <CounterName>NumUnhealthyNMs</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.ResourceManagerNumUnhealthyNMs">
+          <Name>Collect Number of Unhealthy NodeManagers</Name>
+          <Description>This rule collects number of Unhealthy NodeManagers.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerNumUnhealthyNMs" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects Number of Unhealthy NodeManagers.</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/ResourceManager/running_1440Collection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_1440Collection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_1440Collection.mpx
new file mode 100644
index 0000000..1aea896
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_1440Collection.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.ResourceManagerrunning_1440"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.running_1440</PropertyName>
+            <CounterName>running_1440</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.ResourceManagerrunning_1440">
+          <Name>Collect running_1440</Name>
+          <Description>This rule collects running_1440.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerrunning_1440" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects running_1440.</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/ResourceManager/running_300Collection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_300Collection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_300Collection.mpx
new file mode 100644
index 0000000..e4512fc
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_300Collection.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.ResourceManagerrunning_300"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.running_300</PropertyName>
+            <CounterName>running_300</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.ResourceManagerrunning_300">
+          <Name>Collect running_300</Name>
+          <Description>This rule collects running_300.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerrunning_300" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects running_300.</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/ResourceManager/running_60Collection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_60Collection.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_60Collection.mpx
new file mode 100644
index 0000000..4439b52
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Rules/Performance/HostComponents/ResourceManager/running_60Collection.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.ResourceManagerrunning_60"
+            Target="Ambari.SCOM.ClusterService.Yarn"
+            Enabled="true" ConfirmDelivery="false">
+        <Category>PerformanceCollection</Category>
+        <DataSources>
+          <DataSource ID="DS" TypeID="Ambari.SCOM.Module.YarnServiceMetricsPerformanceDataSource">
+            <IntervalSeconds>900</IntervalSeconds>
+            <TimeoutSeconds>300</TimeoutSeconds>
+            <PropertyName>yarn.queue.root.running_60</PropertyName>
+            <CounterName>running_60</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.ResourceManagerrunning_60">
+          <Name>Collect running_60</Name>
+          <Description>This rule collects running_60.</Description>
+        </DisplayString>
+      </DisplayStrings>
+
+      <KnowledgeArticles>
+        <KnowledgeArticle ElementID="Ambari.SCOM.PerformanceRule.ResourceManagerrunning_60" Visible="true">
+          <MamlContent>
+            <section xmlns="http://schemas.microsoft.com/maml/2004/10">
+              <title>Summary</title>
+              <para>Collects running_60.</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/Shared Scripts/DiscoveryHelpers.ps1
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/DiscoveryHelpers.ps1 b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/DiscoveryHelpers.ps1
index caad4b4..55466cf 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/DiscoveryHelpers.ps1	
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/DiscoveryHelpers.ps1	
@@ -35,6 +35,8 @@ function FormatClusterServiceName($serviceName) {
         'oozie' { 'Oozie' }
         'pig' { 'Pig' }
         'sqoop' { 'Sqoop' }
+        'mapreduce2' { 'MapReduce 2' }
+        'yarn' { 'YARN' }
         default { $serviceName }
     }
 }
@@ -54,6 +56,11 @@ function FormatHostComponentName($componentName) {
         'oozie_server' { 'Oozie Server' }
         'pig' { 'Pig' }
         'sqoop' { 'Sqoop' }
+        'historyserver' { 'History Server' }
+        'mapreduce2_client' { 'MapReduce 2 Client' }
+        'nodemanager' { 'Node Manager' }
+        'resourcemanager' { 'Resource Manager' }
+        'yarn_client' { 'YARN Client' }
         default { $componentName }
     }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/JsonParser.ps1
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/JsonParser.ps1 b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/JsonParser.ps1
index c87ff8a..fbde681 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/JsonParser.ps1	
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/JsonParser.ps1	
@@ -18,7 +18,7 @@
 try {
     $JSONUtil = (Add-Type -Language JScript -MemberDefinition "static function parseJSON(json){return eval('('+json+')');}" -Name "JSONUtil" -PassThru)[1]
 } catch {
-    LogMessage "JSON" 1 "Failed to create JSON parser: $_"
+    LogMessage "JSON" 1 "Failed to create JSON parser: $_" 1901
 }
 
 function ParseJsonString([string] $jsonString) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/Logging.ps1
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/Logging.ps1 b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/Logging.ps1
index 7b9b0dd..9fe1005 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/Logging.ps1	
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/Logging.ps1	
@@ -15,8 +15,8 @@
 ## specific language governing permissions and limitations
 ## under the License.
 
-function LogMessage($workflowName, $severity, [string] $message) {
+function LogMessage($workflowName, $severity, [string] $message, $eventID) {
     $header = "Ambari SCOM MP. $workflowName"
     if (-not $ScriptApi) { $ScriptApi = New-Object -ComObject "MOM.ScriptAPI" }
-    $ScriptApi.LogScriptEvent($header, 901, $severity, $message)
+    $ScriptApi.LogScriptEvent($header, $eventID, $severity, $message)
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/RestApi.ps1
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/RestApi.ps1 b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/RestApi.ps1
index c5afb28..11026b3 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/RestApi.ps1	
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Shared Scripts/RestApi.ps1	
@@ -23,10 +23,15 @@ $UserAgent = $("{0} (PowerShell {1}; .NET CLR {2}; {3})" -f "SCOM MP",
 function InvokeRestAPI($uri, [string]$username, [string]$password) {
 	# TODO: Remove prior to release!
     [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { $true }
+
     $request = [System.Net.HttpWebRequest]::Create($uri)
     $request.Method = 'GET'
     $request.UserAgent = $UserAgent
-    $request.Timeout = 30000
+	$request.ServicePoint.ConnectionLimit = 100
+    $request.ServicePoint.ConnectionLeaseTimeout = 0
+    $request.ServicePoint.MaxIdleTime = 1
+    $request.Timeout = 90000
+
     
     $credentials = [Convert]::ToBase64String([Text.Encoding]::Default.GetBytes($username + ':' + $password));
     $request.Headers.Add('Authorization', "Basic $credentials")

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Templates/DiscoveryTemplate.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Templates/DiscoveryTemplate.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Templates/DiscoveryTemplate.mpx
index 1024962..3142a69 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Templates/DiscoveryTemplate.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Templates/DiscoveryTemplate.mpx
@@ -135,6 +135,8 @@
                 <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterService.Oozie" />
                 <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterService.Pig" />
                 <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterService.Sqoop" />
+                <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterService.MapReduce2" />
+                <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterService.Yarn" />
                 <DiscoveryRelationship TypeID="$Reference/SC$Microsoft.SystemCenter.HealthServiceShouldManageEntity" />
                 <DiscoveryRelationship TypeID="$Reference/Self$Ambari.SCOM.ClusterSoftwareProjectionContainsClusterService" />
               </DiscoveryTypes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Assets/Icon.ico
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Assets/Icon.ico b/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Assets/Icon.ico
new file mode 100644
index 0000000..9855b54
Binary files /dev/null and b/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Assets/Icon.ico differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Installer.sln
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Installer.sln b/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Installer.sln
index 6a1efa0..f81149a 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Installer.sln
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/Installer/Installer.sln
@@ -1,24 +1,17 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
+
+Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-## 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.
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer.wixproj", "{272A57D1-AB53-4E49-8315-418B4B1230A5}"
 EndProject
 Global
+	GlobalSection(TeamFoundationVersionControl) = preSolution
+		SccNumberOfProjects = 2
+		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
+		SccTeamFoundationServer = http://tfs.viacode.com:8080/tfs/llc
+		SccLocalPath0 = .
+		SccProjectUniqueName1 = Installer.wixproj
+		SccLocalPath1 = .
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj b/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj
index 3bed794..f429add 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj
@@ -22,10 +22,10 @@
     <RootNamespace>Ambari.SCOM.Management</RootNamespace>
     <Name>Ambari SCOM Management</Name>
     <ManagementPackName>Ambari.SCOM.Management</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>
@@ -125,4 +125,4 @@
     <EmbeddedResource Include="Shared Scripts\RestApi.ps1" />
   </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/ManagementMp/ManagementMp.mpproj.user
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj.user b/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj.user
index becb69a..93ee43a 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.mpproj.user
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/ManagementMp/ManagementMp.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.53</DeploymentNextVersion>
+    <DeploymentNextVersion>1.0.0.142</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/Modules/Modules.csproj
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/Modules/Modules.csproj b/contrib/ambari-scom/management-pack/Hadoop_MP/Modules/Modules.csproj
index 42eb858..3343e96 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/Modules/Modules.csproj
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/Modules/Modules.csproj
@@ -46,7 +46,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/HistoryServerSummaryDashboard.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/HistoryServerSummaryDashboard.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/HistoryServerSummaryDashboard.mpx
new file mode 100644
index 0000000..6b22d65
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/HistoryServerSummaryDashboard.mpx
@@ -0,0 +1,275 @@
+<!--## 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">
+  <Presentation>
+    <ComponentTypes>
+      <ComponentType ID="Ambari.SCOM.Presentation.Dashboard.HistoryServerSummary"
+                     Accessibility="Public" Lifetime="ReferenceCount" />
+
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.HistoryServerMemoryHeapUtilization"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentMemoryHeapUtilization"
+                     Accessibility="Internal" />
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.HistoryServerThreadsStatus"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentThreadsStatus"
+                     Accessibility="Internal" />
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.HistoryServerGcTime"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentGcTime"
+                     Accessibility="Internal" />
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.HistoryServerAverageRpcWaitTime"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentAverageRpcWaitTime"
+                     Accessibility="Internal" />
+    </ComponentTypes>
+
+    <ComponentReferences>
+      <ComponentReference ID="Ambari.SCOM.Presentation.FolderItem.HistoryServerSummaryDashboard"
+                          TypeID="Ambari.SCOM.Presentation.Dashboard.HistoryServerSummary"
+                          Parent="Ambari.SCOM.Presentation.ViewFolder.MapReduce2"
+                          Accessibility="Public" />
+    </ComponentReferences>
+
+    <ComponentImplementations>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.HistoryServerMemoryHeapUtilizationImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.HistoryServerMemoryHeapUtilization"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.HistoryServerThreadsStatusImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.HistoryServerThreadsStatus"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.HistoryServerGcTimeImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.HistoryServerGcTime"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.HistoryServerAverageRpcWaitTimeImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.HistoryServerAverageRpcWaitTime"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Dashboard.HistoryServerSummaryImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Dashboard.HistoryServerSummary"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Variable Id="SelectedHistoryServers" Type="mpinstance://System.Library!System.Entity[]" />
+
+          <Component TypeId="Visualization!Microsoft.SystemCenter.Visualization.ComponentContainer">
+            <Binding PropertyId="Visual">
+              <Component TypeId="Visualization!Microsoft.SystemCenter.Visualization.StaticGridLayout">
+                <Binding PropertyId="ConfigType">
+                  <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!GridLayout05CellWideTopConfig" />
+                </Binding>
+                <Binding PropertyId="CellRegionMappings">
+                  <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping[]">
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="0" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.HistoryServersState" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="HistoryServersState" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="SelectedEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedHistoryServers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="1" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.HistoryServerMemoryHeapUtilization" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeMemoryHeapUtilization" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedHistoryServers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : HistoryServer" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="2" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.HistoryServerThreadsStatus" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeThreadsStatus" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedHistoryServers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : HistoryServer" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="3" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.HistoryServerGcTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeGcTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedHistoryServers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : HistoryServer" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="4" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.HistoryServerAverageRpcWaitTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeAverageRpcWaitTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedHistoryServers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : HistoryServer" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+                  </ComplexValueCollection>
+                </Binding>
+              </Component>
+            </Binding>
+          </Component>
+        </Composite>
+      </ComponentImplementation>
+    </ComponentImplementations>
+  </Presentation>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Dashboard.HistoryServerSummary">
+          <Name>HistoryServer Summary</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.FolderItem.HistoryServerSummaryDashboard">
+          <Name>HistoryServer Summary</Name>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.HistoryServerThreadsStatus">
+          <Name>Threads Status</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.HistoryServerMemoryHeapUtilization">
+          <Name>Memory Heap Utilization</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.HistoryServerGcTime">
+          <Name>Garbage Collection Time (ms)</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.HistoryServerAverageRpcWaitTime">
+          <Name>Average RPC Wait Time</Name>
+        </DisplayString>
+      </DisplayStrings>
+    </LanguagePack>
+  </LanguagePacks>
+</ManagementPackFragment>

http://git-wip-us.apache.org/repos/asf/ambari/blob/53c40505/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/NodeManagerSummaryDashboard.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/NodeManagerSummaryDashboard.mpx b/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/NodeManagerSummaryDashboard.mpx
new file mode 100644
index 0000000..b3189d5
--- /dev/null
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Dashboards/NodeManagerSummaryDashboard.mpx
@@ -0,0 +1,275 @@
+<!--## 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">
+  <Presentation>
+    <ComponentTypes>
+      <ComponentType ID="Ambari.SCOM.Presentation.Dashboard.NodeManagerSummary"
+                     Accessibility="Public" Lifetime="ReferenceCount" />
+
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.NodeManagerMemoryHeapUtilization"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentMemoryHeapUtilization"
+                     Accessibility="Internal" />
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.NodeManagerThreadsStatus"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentThreadsStatus"
+                     Accessibility="Internal" />
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.NodeManagerGcTime"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentGcTime"
+                     Accessibility="Internal" />
+      <ComponentType ID="Ambari.SCOM.Presentation.Widget.NodeManagerAverageRpcWaitTime"
+                     Base="Ambari.SCOM.Presentation.Widget.ComponentAverageRpcWaitTime"
+                     Accessibility="Internal" />
+    </ComponentTypes>
+
+    <ComponentReferences>
+      <ComponentReference ID="Ambari.SCOM.Presentation.FolderItem.NodeManagerSummaryDashboard"
+                          TypeID="Ambari.SCOM.Presentation.Dashboard.NodeManagerSummary"
+                          Parent="Ambari.SCOM.Presentation.ViewFolder.MapReduce2"
+                          Accessibility="Public" />
+    </ComponentReferences>
+
+    <ComponentImplementations>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.NodeManagerMemoryHeapUtilizationImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.NodeManagerMemoryHeapUtilization"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.NodeManagerThreadsStatusImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.NodeManagerThreadsStatus"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.NodeManagerGcTimeImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.NodeManagerGcTime"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Widget.NodeManagerAverageRpcWaitTimeImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Widget.NodeManagerAverageRpcWaitTime"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Base />
+        </Composite>
+      </ComponentImplementation>
+
+      <ComponentImplementation ID="Ambari.SCOM.Presentation.Dashboard.NodeManagerSummaryImplementation"
+                               TypeId="Ambari.SCOM.Presentation.Dashboard.NodeManagerSummary"
+                               Accessibility="Internal" Platform="Wpf, Silverlight">
+        <Composite>
+          <Variable Id="SelectedNodeManagers" Type="mpinstance://System.Library!System.Entity[]" />
+
+          <Component TypeId="Visualization!Microsoft.SystemCenter.Visualization.ComponentContainer">
+            <Binding PropertyId="Visual">
+              <Component TypeId="Visualization!Microsoft.SystemCenter.Visualization.StaticGridLayout">
+                <Binding PropertyId="ConfigType">
+                  <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!GridLayout05CellWideTopConfig" />
+                </Binding>
+                <Binding PropertyId="CellRegionMappings">
+                  <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping[]">
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="0" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.NodeManagersState" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NodeManagersState" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="SelectedEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedNodeManagers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="1" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.NodeManagerMemoryHeapUtilization" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeMemoryHeapUtilization" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedNodeManagers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : NodeManager" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="2" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.NodeManagerThreadsStatus" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeThreadsStatus" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedNodeManagers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : NodeManager" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="3" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.NodeManagerGcTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeGcTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedNodeManagers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : NodeManager" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+
+                    <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/CellRegionMapping">
+                      <Binding PropertyId="CellIndex">
+                        <SimpleValue Type="xsd://int" Value="4" />
+                      </Binding>
+                      <Binding PropertyId="RegionContent">
+                        <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Presentation!Ambari.SCOM.Presentation.Widget.NodeManagerAverageRpcWaitTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionId">
+                        <SimpleValue Type="xsd://string" Value="NameNodeAverageRpcWaitTime" />
+                      </Binding>
+                      <Binding PropertyId="RegionParameters">
+                        <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter[]">
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="TargetEntities" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <Reference>$Variable/SelectedNodeManagers$</Reference>
+                            </Binding>
+                          </ComplexValue>
+                          <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.LayoutConfig/HostedRequestParameter">
+                            <Binding PropertyId="Name">
+                              <SimpleValue Type="xsd://string" Value="PerformanceCounterInstanceName" />
+                            </Binding>
+                            <Binding PropertyId="Value">
+                              <SimpleValue Type="xsd://string" Value="% : NodeManager" />
+                            </Binding>
+                          </ComplexValue>
+                        </ComplexValueCollection>
+                      </Binding>
+                    </ComplexValue>
+                  </ComplexValueCollection>
+                </Binding>
+              </Component>
+            </Binding>
+          </Component>
+        </Composite>
+      </ComponentImplementation>
+    </ComponentImplementations>
+  </Presentation>
+
+  <LanguagePacks>
+    <LanguagePack ID="ENU" IsDefault="true">
+      <DisplayStrings>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Dashboard.NodeManagerSummary">
+          <Name>NodeManager Summary</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.FolderItem.NodeManagerSummaryDashboard">
+          <Name>NodeManager Summary</Name>
+        </DisplayString>
+
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.NodeManagerThreadsStatus">
+          <Name>Threads Status</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.NodeManagerMemoryHeapUtilization">
+          <Name>Memory Heap Utilization</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.NodeManagerGcTime">
+          <Name>Garbage Collection Time (ms)</Name>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.Presentation.Widget.NodeManagerAverageRpcWaitTime">
+          <Name>Average RPC Wait Time</Name>
+        </DisplayString>
+      </DisplayStrings>
+    </LanguagePack>
+  </LanguagePacks>
+</ManagementPackFragment>