AMBARI-25831: Remove unnecessary suffix for service display name (#3622)

ambari-server/src/main/resources/stack-hooks/before-ANY/scripts/params.py

@@ -198,7 +198,7 @@ hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
 oozie_servers = default("/clusterHostInfo/oozie_server", [])
 falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", [])
 ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
-zeppelin_master_hosts = default("/clusterHostInfo/zeppelin_master_hosts", [])
+zeppelin_server_hosts = default("/clusterHostInfo/zeppelin_server_hosts", [])
 
 # get the correct version to use for checking stack features
 version_for_stack_feature_checks = get_stack_feature_version(config)
@@ -211,7 +211,7 @@ has_hbase_masters = not len(hbase_master_hosts) == 0
 has_oozie_server = not len(oozie_servers) == 0
 has_falcon_server_hosts = not len(falcon_server_hosts) == 0
 has_ranger_admin = not len(ranger_admin_hosts) == 0
-has_zeppelin_master = not len(zeppelin_master_hosts) == 0
+has_zeppelin_server = not len(zeppelin_server_hosts) == 0
 stack_supports_zk_security = check_stack_feature(StackFeature.SECURE_ZOOKEEPER, version_for_stack_feature_checks)
 
 hostname = config['agentLevelParams']['hostname']

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/properties/stack_packages.json

@@ -368,7 +368,7 @@
         }
       },
       "ZEPPELIN": {
-        "ZEPPELIN_MASTER": {
+        "ZEPPELIN_SERVER": {
           "STACK-SELECT-PACKAGE": "zeppelin-server",
           "INSTALL": [
             "zeppelin-server"

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/alerts.json

@@ -1,7 +1,7 @@
 {
     "ZEPPELIN": {
       "service": [],
-      "ZEPPELIN_MASTER": [
+      "ZEPPELIN_SERVER": [
         {
           "name": "zeppelin_server_status",
           "label": "Zeppelin Server Status",

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/kerberos.json

@@ -31,7 +31,7 @@
         ],
         "components": [
           {
-            "name": "ZEPPELIN_MASTER"
+            "name": "ZEPPELIN_SERVER"
           }
         ],
         "configurations": [

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml

@@ -20,7 +20,7 @@ limitations under the License.
   <services>
     <service>
       <name>ZEPPELIN</name>
-      <displayName>Zeppelin Notebook</displayName>
+      <displayName>Zeppelin</displayName>
       <comment>A web-based notebook that enables interactive data analytics. It enables you to
         make beautiful data-driven, interactive and collaborative documents with SQL, Scala
         and more.
@@ -28,13 +28,13 @@ limitations under the License.
       <version>0.10.1-1</version>
       <components>
         <component>
-          <name>ZEPPELIN_MASTER</name>
-          <displayName>Zeppelin Notebook</displayName>
+          <name>ZEPPELIN_SERVER</name>
+          <displayName>Zeppelin Server</displayName>
           <category>MASTER</category>
           <cardinality>1+</cardinality>
           <versionAdvertised>true</versionAdvertised>
           <commandScript>
-            <script>scripts/master.py</script>
+            <script>scripts/zeppelin_server.py</script>
             <scriptType>PYTHON</scriptType>
             <timeout>10000</timeout>
           </commandScript>

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/package/scripts/params.py

@@ -131,7 +131,7 @@ log4j_properties_content = config['configurations']['zeppelin-log4j-properties']
 master_configs = config['clusterHostInfo']
 java64_home = config['ambariLevelParams']['java_home']
 ambari_host = str(config['ambariLevelParams']['ambari_server_host'])
-zeppelin_host = str(master_configs['zeppelin_master_hosts'][0])
+zeppelin_host = str(master_configs['zeppelin_server_hosts'][0])
 
 # detect HS2 details, if installed
 

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/package/scripts/master.py → ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/package/scripts/zeppelin_server.py

@@ -41,7 +41,7 @@ from resource_management.libraries.functions.version import format_stack_version
 from resource_management.libraries.script.script import Script
 
 
-class Master(Script):
+class ZeppelinServer(Script):
   def install(self, env):
     import params
     env.set_params(params)
@@ -671,4 +671,4 @@ class Master(Script):
     return glob.glob(params.zeppelin_home + '/interpreter/spark/dep/zeppelin-spark-dependencies*.jar')
 
 if __name__ == "__main__":
-  Master().execute()
+  ZeppelinServer().execute()

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/quicklinks/quicklinks.json

@@ -19,7 +19,7 @@
           "name": "zeppelin_ui",
           "label": "Zeppelin UI",
           "requires_user_name": "false",
-          "component_name": "ZEPPELIN_MASTER",
+          "component_name": "ZEPPELIN_SERVER",
           "url":"%@://%@:%@/",
           "port":{
             "http_property": "zeppelin.server.port",

ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/role_command_order.json

@@ -1,8 +1,8 @@
 {
     "general_deps" : {
       "_comment" : "dependencies for ZEPPELIN",
-      "ZEPPELIN_MASTER-START" : ["NAMENODE-START"],
-      "ZEPPELIN_SERVICE_CHECK-SERVICE_CHECK" : ["ZEPPELIN_MASTER-START"]
+      "ZEPPELIN_SERVER-START" : ["NAMENODE-START"],
+      "ZEPPELIN_SERVICE_CHECK-SERVICE_CHECK" : ["ZEPPELIN_SERVER-START"]
     }
   }
   

ambari-server/src/test/python/stacks/configs/stack_packages.json

@@ -960,7 +960,7 @@
         }
       },
       "ZEPPELIN": {
-        "ZEPPELIN_MASTER": {
+        "ZEPPELIN_SERVER": {
           "STACK-SELECT-PACKAGE": "zeppelin-server",
           "INSTALL": [
             "zeppelin-server"

ambari-server/src/test/resources/mpacks-v2/upgrade-packs/upgrade-basic.xml

@@ -110,7 +110,7 @@
             <message>Before continuing, please backup Ranger KMS database on the following host(s): {{hosts.all}}.</message>
           </task>
         </execute-stage>
-        <execute-stage service="ZEPPELIN" component="ZEPPELIN_MASTER" title="Pre Upgrade Zeppelin notebooks Backup">
+        <execute-stage service="ZEPPELIN" component="ZEPPELIN_SERVER" title="Pre Upgrade Zeppelin notebooks Backup">
           <task xsi:type="manual">
             <message>Before continuing, please backup Zeppelin notebooks directory on the following host(s): {{hosts.all}}.</message>
           </task>
@@ -287,7 +287,7 @@
         <supports-auto-skip-failure>false</supports-auto-skip-failure>
         <service-check>false</service-check>
         <service name="ZEPPELIN">
-          <component>ZEPPELIN_MASTER</component>
+          <component>ZEPPELIN_SERVER</component>
         </service>
       </group>
   
@@ -924,7 +924,7 @@
     </service>
 
     <service name="ZEPPELIN">
-      <component name="ZEPPELIN_MASTER">
+      <component name="ZEPPELIN_SERVER">
         <upgrade>
           <task xsi:type="restart-task" />
         </upgrade>

ambari-server/src/test/resources/org/apache/ambari/server/upgrade/kerberos_descriptor.json

@@ -2568,7 +2568,7 @@
     {
       "components":[
         {
-          "name":"ZEPPELIN_MASTER"
+          "name":"ZEPPELIN_SERVER"
         }
       ],
       "configurations":[

ambari-server/src/test/resources/upgrade-packs/upgrade-basic.xml

@@ -110,7 +110,7 @@
             <message>Before continuing, please backup Ranger KMS database on the following host(s): {{hosts.all}}.</message>
           </task>
         </execute-stage>
-        <execute-stage service="ZEPPELIN" component="ZEPPELIN_MASTER" title="Pre Upgrade Zeppelin notebooks Backup">
+        <execute-stage service="ZEPPELIN" component="ZEPPELIN_SERVER" title="Pre Upgrade Zeppelin notebooks Backup">
           <task xsi:type="manual">
             <message>Before continuing, please backup Zeppelin notebooks directory on the following host(s): {{hosts.all}}.</message>
           </task>
@@ -287,7 +287,7 @@
         <supports-auto-skip-failure>false</supports-auto-skip-failure>
         <service-check>false</service-check>
         <service name="ZEPPELIN">
-          <component>ZEPPELIN_MASTER</component>
+          <component>ZEPPELIN_SERVER</component>
         </service>
       </group>
   
@@ -924,7 +924,7 @@
     </service>
 
     <service name="ZEPPELIN">
-      <component name="ZEPPELIN_MASTER">
+      <component name="ZEPPELIN_SERVER">
         <upgrade>
           <task xsi:type="restart-task" />
         </upgrade>

ambari-web/app/models/service.js

@@ -22,14 +22,7 @@ require('utils/config');
 
 App.Service = DS.Model.extend({
   serviceName: DS.attr('string', {defaultValue: ''}),
-  displayName: function() {
-    const displayName = App.format.role(this.get('serviceName'), true);
-    if (this.get('hasMasterOrSlaveComponent') || displayName.endsWith('Client')) {
-      return displayName;
-    } else {
-      return displayName + ' Client';
-    }
-  }.property('serviceName'),
+  displayName: Em.computed.formatRole('serviceName', true),
   passiveState: DS.attr('string', {defaultValue: "OFF"}),
   workStatus: DS.attr('string'),
   rand: DS.attr('string'),
@@ -71,7 +64,7 @@ App.Service = DS.Model.extend({
    * @type {bool}
    */
   isInPassive: Em.computed.equal('passiveState', 'ON'),
-  
+
   /**
    * @type {bool}
    */

ambari-web/app/templates/main/service/menu_item.hbs

@@ -33,6 +33,6 @@
     <i {{bindAttr class="view.content.isStarted:started:stopped :icon-circle :status-icon"}}></i>
   {{/unless}}
   <span {{bindAttr class="view.isClientOnlyService:client-only-service :menu-item-name view.content.workStatus view.isMasterDown:master-down" data-original-title="view.content.toolTipContent"}} rel="serviceHealthTooltip">
-      {{view.content.displayName}}
+      {{unbound view.content.displayName}}
   </span>
 </a>

ambari-web/app/views/main/menu.js

@@ -219,14 +219,6 @@ App.SideNavServiceMenuView = Em.CollectionView.extend({
     isClientOnlyService : function(){
       return App.get('services.clientOnly').contains(this.get('content.serviceName'));
     }.property('content.serviceName'),
-    
-    displayName: function() {
-      if (this.get('content.hasMasterOrSlaveComponent') || this.get('content.displayName').endsWith('Client')) {
-        return this.get('content.displayName');
-      } else {
-        return this.get('content.displayName') + ' Client';
-      }
-    }.property('content.displayName', 'content.hasMasterOrSlaveComponent'),
 
     isConfigurable: function () {
       return !App.get('services.noConfigTypes').contains(this.get('content.serviceName'));