ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject git commit: AMBARI-5637 - Remove Start/Stop Hadoop Cluster Service tasks for Pig and Sqoop services (Anatoly Nikonorov via tbeerbower)
Date Wed, 30 Apr 2014 17:40:00 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 9ede3dee3 -> 7140d3c36


AMBARI-5637 - Remove Start/Stop Hadoop Cluster Service tasks for Pig and Sqoop services (Anatoly
Nikonorov via tbeerbower)


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

Branch: refs/heads/trunk
Commit: 7140d3c3674c0e2d3ded308c2071eb7a6432945f
Parents: 9ede3de
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Wed Apr 30 13:39:05 2014 -0400
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Wed Apr 30 13:39:33 2014 -0400

----------------------------------------------------------------------
 .../Hadoop_MP/HadoopMp/Classes/ClusterService.mpx | 18 ++++++++++++------
 .../Classes/ClusterSoftwareProjection.mpx         |  2 +-
 .../Scripts/ClusterServicesDiscovery.ps1          |  2 +-
 .../Presentation/ClusterServicesPerformance.mpx   |  2 +-
 .../HadoopMp/Templates/DiscoveryTemplate.mpx      |  2 +-
 .../Widgets/ClusterServicesState.mpx              |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7140d3c3/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
index 1cb8b85..e7610cf 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterService.mpx
@@ -24,17 +24,19 @@
           <Property ID="ServiceName" Type="string" Key="true" />
         </ClassType>
 
-        <ClassType ID="Ambari.SCOM.ClusterService" Accessibility="Public" Base="Ambari.SCOM.AmbariEntity"
Hosted="true" Abstract="true" Singleton="false">
+        <ClassType ID="Ambari.SCOM.ClusterServiceBase" Accessibility="Public" Base="Ambari.SCOM.AmbariEntity"
Hosted="true" Abstract="true" Singleton="false">
           <Property ID="ClusterName" Type="string" Comment="Required to show parent cluster
name on State Widget" />
         </ClassType>
+        <ClassType ID="Ambari.SCOM.ClusterService" Accessibility="Public" Base="Ambari.SCOM.ClusterServiceBase"
Hosted="true" Abstract="true" Singleton="false">
+        </ClassType>
 
         <ClassType ID="Ambari.SCOM.ClusterService.Hdfs" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.MapReduce" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.Hive" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.Templeton" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.Oozie" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
-        <ClassType ID="Ambari.SCOM.ClusterService.Pig" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
-        <ClassType ID="Ambari.SCOM.ClusterService.Sqoop" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.ClusterService.Pig" Accessibility="Public" Base="Ambari.SCOM.ClusterServiceBase"
Hosted="true" Abstract="false" Singleton="false" />
+        <ClassType ID="Ambari.SCOM.ClusterService.Sqoop" Accessibility="Public" Base="Ambari.SCOM.ClusterServiceBase"
Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.MapReduce2" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
         <ClassType ID="Ambari.SCOM.ClusterService.Yarn" Accessibility="Public" Base="Ambari.SCOM.ClusterService"
Hosted="true" Abstract="false" Singleton="false" />
       </ClassTypes>
@@ -43,11 +45,11 @@
         <RelationshipType ID="Ambari.SCOM.PrivateClusterServiceHostsClusterService"
                           Base="System!System.Hosting" Accessibility="Public">
           <Source ID="PrivateService" Type="Ambari.SCOM.ClusterService.Private" />
-          <Target ID="Service" Type="Ambari.SCOM.ClusterService" />
+          <Target ID="Service" Type="Ambari.SCOM.ClusterServiceBase" />
         </RelationshipType>
 
         <RelationshipType ID="Ambari.SCOM.ClusterServiceContainsHostComponent" Base="System!System.Containment"
Abstract="false" Accessibility="Public">
-          <Source ID="Service" Type="Ambari.SCOM.ClusterService" />
+          <Source ID="Service" Type="Ambari.SCOM.ClusterServiceBase" />
           <Target ID="Component" Type="Ambari.SCOM.HostComponent" />
         </RelationshipType>
 
@@ -137,9 +139,13 @@
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.ClusterService">
           <Name>Hadoop Cluster Service</Name>
+          <Description>Base class for all manageble Hadoop Cluster Services.</Description>
+        </DisplayString>
+        <DisplayString ElementID="Ambari.SCOM.ClusterServiceBase">
+          <Name>Hadoop Cluster Service</Name>
           <Description>Base class for all Hadoop Cluster Services.</Description>
         </DisplayString>
-        <DisplayString ElementID="Ambari.SCOM.ClusterService" SubElementID="ClusterName">
+        <DisplayString ElementID="Ambari.SCOM.ClusterServiceBase" SubElementID="ClusterName">
           <Name>Cluster Name</Name>
         </DisplayString>
         <DisplayString ElementID="Ambari.SCOM.PrivateClusterServiceHostsClusterService">

http://git-wip-us.apache.org/repos/asf/ambari/blob/7140d3c3/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterSoftwareProjection.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterSoftwareProjection.mpx
b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterSoftwareProjection.mpx
index fc474ac..8b42f16 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterSoftwareProjection.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Classes/ClusterSoftwareProjection.mpx
@@ -32,7 +32,7 @@
         <RelationshipType ID="Ambari.SCOM.ClusterSoftwareProjectionContainsClusterService"
                             Base="System!System.Containment" Abstract="false" Accessibility="Public">
           <Source ID="Projection" Type="Ambari.SCOM.ClusterSoftwareProjection" />
-          <Target ID="Service" Type="Ambari.SCOM.ClusterService" />
+          <Target ID="Service" Type="Ambari.SCOM.ClusterServiceBase" />
         </RelationshipType>
       </RelationshipTypes>
     </EntityTypes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/7140d3c3/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
index 4cd6498..751b1e4 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Modules/DataSources/Discovery/Scripts/ClusterServicesDiscovery.ps1
@@ -44,7 +44,7 @@ function DiscoverServices($discoveryData, $healthServices) {
         $serviceEntity.AddProperty("$MPElement[Name="Ambari.SCOM.ClusterService.Private"]/TemplateName$",
$TemplateName)
         $serviceEntity.AddProperty("$MPElement[Name="Ambari.SCOM.ClusterService.Private"]/ClusterName$",
$ClusterName)
         $serviceEntity.AddProperty("$MPElement[Name='Ambari.SCOM.ClusterService.Private']/ServiceName$",
$clusterService.ServiceInfo.service_name)
-        $serviceEntity.AddProperty("$MPElement[Name="Ambari.SCOM.ClusterService"]/ClusterName$",
$ClusterName)
+        $serviceEntity.AddProperty("$MPElement[Name="Ambari.SCOM.ClusterServiceBase"]/ClusterName$",
$ClusterName)
         $serviceEntity.AddProperty("$MPElement[Name='System!System.Entity']/DisplayName$",
$serviceName)
         $discoveryData.AddInstance($serviceEntity)
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7140d3c3/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Presentation/ClusterServicesPerformance.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Presentation/ClusterServicesPerformance.mpx
b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Presentation/ClusterServicesPerformance.mpx
index 24f9b06..fc0d153 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Presentation/ClusterServicesPerformance.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/HadoopMp/Presentation/ClusterServicesPerformance.mpx
@@ -20,7 +20,7 @@
     <Views>
       <View ID="Ambari.SCOM.View.ClusterServicesPerformance"
             TypeID="SC!Microsoft.SystemCenter.PerformanceViewType"
-            Target="Ambari.SCOM.ClusterService"
+            Target="Ambari.SCOM.ClusterServiceBase"
             Visible="true" Accessibility="Public">
         <Category>Operations</Category>
         <Criteria>

http://git-wip-us.apache.org/repos/asf/ambari/blob/7140d3c3/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 3142a69..1a17ead 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
@@ -125,7 +125,7 @@
                        Enabled="true" ConfirmDelivery="false" Remotable="true" Priority="Normal">
               <Category>Discovery</Category>
               <DiscoveryTypes>
-                <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterService">
+                <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterServiceBase">
                   <Property TypeID="$Reference/System$System.Entity" PropertyID="DisplayName"
/>
                 </DiscoveryClass>
                 <DiscoveryClass TypeID="$Reference/Self$Ambari.SCOM.ClusterService.Hdfs"
/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/7140d3c3/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Widgets/ClusterServicesState.mpx
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Widgets/ClusterServicesState.mpx
b/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Widgets/ClusterServicesState.mpx
index 6d7685e..66f7f47 100644
--- a/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Widgets/ClusterServicesState.mpx
+++ b/contrib/ambari-scom/management-pack/Hadoop_MP/PresentationMp/Widgets/ClusterServicesState.mpx
@@ -37,7 +37,7 @@
               <ComplexValueCollection Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.OperationalDataTypes/BaseManagementPackType[]">
                 <ComplexValue Type="xsd://Microsoft.SystemCenter.Visualization.Library!Microsoft.SystemCenter.Visualization.OperationalDataTypes/BaseManagementPackType">
                   <Binding PropertyId="FullyQualifiedName">
-                    <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Monitoring!Ambari.SCOM.ClusterService"
/>
+                    <SimpleValue Type="xsd://string" Value="Ambari.SCOM.Monitoring!Ambari.SCOM.ClusterServiceBase"
/>
                   </Binding>
                 </ComplexValue>
               </ComplexValueCollection>


Mime
View raw message