AMBARI-16206. Use consistent names for Log Search service (oleewere)

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json

@@ -3,8 +3,8 @@
     "LOGSEARCH_SERVER": [
       {
         "name": "logsearch_ui",
-        "label": "LogSearch Web UI",
-        "description": "This host-level alert is triggered if the LogSearch UI is unreachable.",
+        "label": "Log Search Web UI",
+        "description": "This host-level alert is triggered if the Log Search UI is unreachable.",
         "interval": 1,
         "scope": "ANY",
         "source": {
@@ -32,7 +32,7 @@
     "LOGSEARCH_SOLR": [
       {
         "name": "logsearch_solr",
-        "label": "LogSearch Solr Web UI",
+        "label": "Log Search Solr Web UI",
         "description": "This host-level alert is triggered if the Solr Cloud Instance is unreachable.",
         "interval": 1,
         "scope": "ANY",
@@ -59,7 +59,7 @@
       },
       {
         "name": "logsearch_solr_index_size",
-        "label": "LogSearch Solr Index Size",
+        "label": "Log Search Solr Index Size",
         "description": "This host-level alert is triggered if the Solr index size is over a limit.",
         "interval": 1,
         "scope": "ANY",
@@ -99,8 +99,8 @@
       },
       {
         "name": "logsearch_solr_cpu_usage",
-        "label": "LogSearch Solr CPU Utilization",
-        "description": "This host-level alert is triggered if CPU utilization of the LogSearch Solr exceeds certain warning and critical thresholds. It checks the LogSearch Solr JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
+        "label": "Log Search Solr CPU Utilization",
+        "description": "This host-level alert is triggered if CPU utilization of the Log Search Solr exceeds certain warning and critical thresholds. It checks the Log Search Solr JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
         "interval": 5,
         "scope": "ANY",
         "source": {
@@ -139,8 +139,8 @@
       },
       {
         "name": "logsearch_solr_memory",
-        "label": "LogSearch Solr Memory Utilization",
-        "description": "This host-level alert is triggered if CPU utilization of the LogSearch Solr exceeds certain warning and critical thresholds. It checks the LogSearch Solr JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
+        "label": "Log Search Solr Memory Utilization",
+        "description": "This host-level alert is triggered if CPU utilization of the Log Search Solr exceeds certain warning and critical thresholds. It checks the Log Search Solr JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
         "interval": 5,
         "scope": "ANY",
         "source": {

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml

@@ -67,8 +67,8 @@
   <property>
     <name>logfeeder_max_mem</name>
     <value>512m</value>
-    <description>Max memory for LogFeeder</description>
-    <display-name>Logsfeeder max memory</display-name>
+    <description>Max Memory for Logfeeder</description>
+    <display-name>Logfeeder max memory</display-name>
   </property>
 
   <property>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml

@@ -25,7 +25,7 @@
     <name>logsearch_admin_username</name>
     <value>ambari_logsearch_admin</value>
     <display-name>Admin username</display-name>
-    <description>LogSearch admin username</description>
+    <description>Log Search admin username</description>
   </property>
 
   <property require-input="true">
@@ -33,7 +33,7 @@
     <value></value>
     <property-type>PASSWORD</property-type>
     <display-name>Admin password</display-name>
-    <description>LogSearch admin password</description>
+    <description>Log Search admin password</description>
     <value-attributes>
       <overridable>false</overridable>
       <type>password</type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml

@@ -25,15 +25,15 @@
   <property>
     <name>logsearch_ui_port</name>
     <value>61888</value>
-    <description>Default port for LogSearch UI</description>
-    <display-name>Logsearch UI Port</display-name>
+    <description>Default port for Log Search UI</description>
+    <display-name>Log Search UI Port</display-name>
   </property>
 
   <property>
     <name>logsearch_pid_dir</name>
     <value>/var/run/ambari-logsearch-portal</value>
-    <description>Logsearch Process ID Directory</description>
-    <display-name>Logsearch pid dir</display-name>
+    <description>Log Search Process ID Directory</description>
+    <display-name>Log Search pid dir</display-name>
     <value-attributes>
       <type>directory</type>
     </value-attributes>
@@ -42,8 +42,8 @@
   <property>
     <name>logsearch_log_dir</name>
     <value>/var/log/ambari-logsearch-portal</value>
-    <description>Log directory for Logsearch</description>
-    <display-name>Logsearch log dir</display-name>
+    <description>Log directory for Log Search</description>
+    <display-name>Log Search log dir</display-name>
     <value-attributes>
       <type>directory</type>
     </value-attributes>
@@ -53,8 +53,8 @@
     <name>logsearch_user</name>
     <value>logsearch</value>
     <property-type>USER</property-type>
-    <description>Logsearch user</description>
-    <display-name>Logsearch User</display-name>
+    <description>Log Search user</description>
+    <display-name>Log Search User</display-name>
     <value-attributes>
       <type>user</type>
       <overridable>false</overridable>
@@ -65,15 +65,15 @@
     <name>logsearch_group</name>
     <value>logsearch</value>
     <property-type>GROUP</property-type>
-    <description>Logsearch group</description>
-    <display-name>Logsearch Group</display-name>
+    <description>Log Search group</description>
+    <display-name>Log Search Group</display-name>
   </property>
 
   <property>
     <name>logsearch_app_max_memory</name>
     <value>1024</value>
-    <description>Max memory for LogSearch Portal</description>
-    <display-name>Logsearch Max Memory</display-name>
+    <description>Max memory for Log Search Portal</description>
+    <display-name>Log Search Maximum Memory</display-name>
     <value-attributes>
       <type>int</type>
       <minimum>512</minimum>
@@ -97,8 +97,8 @@
   <property>
     <name>logsearch_debug_enabled</name>
     <value>false</value>
-    <display-name>Logsearch Debug Enabled</display-name>
-    <description>Enable debug mode for Logsearch Server</description>
+    <display-name>Log Search Debug Enabled</display-name>
+    <description>Enable debug mode for Log Search Server</description>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
@@ -107,8 +107,8 @@
   <property>
     <name>logsearch_debug_port</name>
     <value>5005</value>
-    <display-name>Logsearch Debug Port</display-name>
-    <description>Debug port for Logsearch Server</description>
+    <display-name>Log Search Debug Port</display-name>
+    <description>Debug port for Log Search Server</description>
   </property>
 
   <property>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml

@@ -24,7 +24,7 @@
   <property>
     <name>logsearch.collection.service.logs.numshards</name>
     <value>5</value>
-    <display-name>Logsearch Solr Service Logs Shards</display-name>
+    <display-name>Log Search Solr Service Logs Shards</display-name>
     <description>Number of shards for Service Logs collection</description>
     <value-attributes>
       <type>int</type>
@@ -38,7 +38,7 @@
   <property>
     <name>logsearch.collection.service.logs.replication.factor</name>
     <value>1</value>
-    <display-name>Logsearch Solr Service Logs Replication Factor</display-name>
+    <display-name>Log Search Solr Service Logs Replication Factor</display-name>
     <description>Replication factor for Service Logs Solr collection</description>
     <value-attributes>
       <type>int</type>
@@ -52,7 +52,7 @@
   <property>
     <name>logsearch.collection.audit.logs.numshards</name>
     <value>5</value>
-    <display-name>Logsearch Solr Audit Logs Shards</display-name>
+    <display-name>Log Search Solr Audit Logs Shards</display-name>
     <description>Number of shards for Audit Logs collection</description>
     <value-attributes>
       <type>int</type>
@@ -66,7 +66,7 @@
   <property>
     <name>logsearch.collection.audit.logs.replication.factor</name>
     <value>1</value>
-    <display-name>Logsearch Solr Audit Logs Replication Factor</display-name>
+    <display-name>Log Search Solr Audit Logs Replication Factor</display-name>
     <description>Replication factor for Audit Logs Solr collection</description>
     <value-attributes>
       <type>int</type>
@@ -80,35 +80,35 @@
   <property>
     <name>logsearch.solr.collection.service.logs</name>
     <value>hadoop_logs</value>
-    <display-name>Logsearch Solr Service Logs Collection</display-name>
+    <display-name>Log Search Solr Service Logs Collection</display-name>
     <description>Name for the service logs collection</description>
   </property>
 
   <property>
     <name>logsearch.solr.collection.audit.logs</name>
     <value>audit_logs</value>
-    <display-name>Logsearch Solr Audit Logs Collection</display-name>
+    <display-name>Log Search Solr Audit Logs Collection</display-name>
     <description>Name for the audit logs collection</description>
   </property>
 
   <property>
     <name>logsearch.service.logs.fields</name>
     <value>logtime,level,event_count,ip,type,seq_num,path,file,line_number,host,log_message,id</value>
-    <display-name>Logsearch Solr Service Logs Fields</display-name>
+    <display-name>Log Search Solr Service Logs Fields</display-name>
     <description>Solr fields for service logs</description>
   </property>
 
   <property>
     <name>logsearch.service.logs.split.interval.mins</name>
     <value>15</value>
-    <display-name>Logsearch Service Logs split interval</display-name>
+    <display-name>Log Search Service Logs split interval</display-name>
     <description>Will create multiple collections and use alias. Valid values are single,hour_week</description>
   </property>
 
   <property>
     <name>logsearch.audit.logs.split.interval.mins</name>
     <value>15</value>
-    <display-name>Logsearch Audit Logs split interval</display-name>
+    <display-name>Log Search Audit Logs split interval</display-name>
     <description>Will switch the shard after the interval specified. Valid values are none and greater than 1
     </description>
   </property>
@@ -116,14 +116,14 @@
   <property>
     <name>logsearch.logfeeder.include.default.level</name>
     <value>fatal,error,warn</value>
-    <description>Include default Logfeeder log levels for Logsearch</description>
+    <description>Include default Logfeeder log levels for Log Search</description>
     <display-name>Logfeeder log levels</display-name>
   </property>
 
   <property>
     <name>logsearch.solr.metrics.collector.hosts</name>
     <value>{metrics_collector_hosts}</value>
-    <description>Metrics collector hosts for pushing metrics by LogSearch Solr</description>
+    <description>Metrics collector hosts for pushing metrics by Log Search Solr</description>
     <display-name>Metrics collector hosts</display-name>
   </property>
 

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml

@@ -26,21 +26,21 @@
     <name>logsearch_solr_port</name>
     <value>8886</value>
     <description>Solr port</description>
-    <display-name>Logsearch Solr port</display-name>
+    <display-name>Log Search Solr port</display-name>
   </property>
 
   <property>
     <name>logsearch_solr_jmx_port</name>
     <value>18886</value>
-    <description>Solr jmx port</description>
-    <display-name>Logsearch Solr jmx port</display-name>
+    <description>Solr JMX port</description>
+    <display-name>Log Search Solr JMX port</display-name>
   </property>
 
   <property>
     <name>logsearch_solr_pid_dir</name>
     <value>/var/run/ambari-logsearch-solr</value>
     <description>Solr Process ID Directory</description>
-    <display-name>Logsearch Solr pid dir</display-name>
+    <display-name>Log Search Solr pid dir</display-name>
     <value-attributes>
       <type>directory</type>
     </value-attributes>
@@ -50,7 +50,7 @@
     <name>logsearch_solr_log_dir</name>
     <value>/var/log/ambari-logsearch-solr</value>
     <description>Directory for Solr logs</description>
-    <display-name>Logsearch Solr log dir</display-name>
+    <display-name>Log Search Solr log dir</display-name>
     <value-attributes>
       <type>directory</type>
     </value-attributes>
@@ -60,7 +60,7 @@
     <name>logsearch_solr_client_log_dir</name>
     <value>/var/log/ambari-logsearch-solr-client</value>
     <description>Directory for Solr client logs</description>
-    <display-name>Logsearch Solr Client log dir</display-name>
+    <display-name>Log Search Solr Client log dir</display-name>
     <value-attributes>
       <type>directory</type>
     </value-attributes>
@@ -71,7 +71,7 @@
     <value>solr</value>
     <property-type>USER</property-type>
     <description>Solr user</description>
-    <display-name>Logsearch Solr User</display-name>
+    <display-name>Log Search Solr User</display-name>
     <value-attributes>
       <type>user</type>
       <overridable>false</overridable>
@@ -83,13 +83,13 @@
     <value>solr</value>
     <property-type>GROUP</property-type>
     <description>Solr group</description>
-    <display-name>Logsearch Solr Group</display-name>
+    <display-name>Log Search Solr Group</display-name>
   </property>
 
   <property>
     <name>logsearch_solr_datadir</name>
     <value>/opt/logsearch_solr/data</value>
-    <display-name>Logsearch Solr data dir</display-name>
+    <display-name>Log Search Solr data dir</display-name>
     <description>Directory for storting Solr index. Make sure you have enough disk space</description>
     <value-attributes>
       <type>directory</type>
@@ -101,7 +101,7 @@
     <name>logsearch_solr_znode</name>
     <value>/ambari-solr</value>
     <description>Zookeeper znode, e.g: /logsearch</description>
-    <display-name>Logsearch Solr ZNode</display-name>
+    <display-name>Log Search Solr ZNode</display-name>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
@@ -110,7 +110,7 @@
   <property>
     <name>logsearch_solr_minmem</name>
     <value>512</value>
-    <display-name>Logsearch Solr minimum heap size</display-name>
+    <display-name>Log Search Solr Minimum Heap Size</display-name>
     <description>Solr minimum heap size e.g.512m</description>
     <value-attributes>
       <type>int</type>
@@ -124,7 +124,7 @@
   <property>
     <name>logsearch_solr_maxmem</name>
     <value>1024</value>
-    <display-name>Logsearch Solr maximum heap size</display-name>
+    <display-name>Log Search Solr Maximum Heap Size</display-name>
     <description>Solr maximum heap size e.g. 512m</description>
     <value-attributes>
       <type>int</type>

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/quicklinks/quicklinks.json

@@ -8,7 +8,7 @@
     "links": [
       {
         "name": "logsearch_ui",
-        "label": "Logsearch UI",
+        "label": "Log Search UI",
         "component_name": "LOGSEARCH_SERVER",
         "url": "%@://%@:%@",
         "requires_user_name": "false",

ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/themes/theme.json

@@ -15,7 +15,7 @@
               "sections": [
                 {
                   "name": "section-logsearch-solr",
-                  "display-name": "LogSearch Solr",
+                  "display-name": "Log Search Solr",
                   "row-index": "0",
                   "column-index": "0",
                   "row-span": "1",
@@ -34,7 +34,7 @@
                 },
                 {
                   "name": "section-logsearch-server",
-                  "display-name": "LogSearch Server",
+                  "display-name": "Log Search Server",
                   "row-index": "0",
                   "column-index": "1",
                   "row-span": "1",

ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py

@@ -2990,7 +2990,7 @@ class TestHDP23StackAdvisor(TestCase):
                 "cardinality": "1",
                 "component_category": "MASTER",
                 "component_name": "LOGSEARCH_SOLR",
-                "display_name": "LogSearch Solr Instance",
+                "display_name": "Log Search Solr Instance",
                 "is_client": "false",
                 "is_master": "true",
                 "hostnames": []

ambari-web/app/models/quick_links.js

@@ -358,7 +358,7 @@ App.QuickLinks.FIXTURES = [
   },
   {
     id:38,
-    label:'Logsearch UI',
+    label:'Log Search UI',
     url:'%@://%@:%@',
     service_id: 'LOGSEARCH',
     template:'%@://%@:%@',