AMBARI-18996. Abillity to enable SPNEGO on Log Search Portal UI from Ambari (oleewere)

Change-Id: Ieb7f4327a42de3d506ffc85fd35177ca50fe084f

ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java

@@ -72,7 +72,7 @@ public class LogsearchKRBAuthenticationFilter extends LogsearchKrbFilter {
   private static final String PRINCIPAL = "logsearch.spnego.kerberos.principal";
   private static final String KEYTAB = "logsearch.spnego.kerberos.keytab";
   private static final String HOST_NAME = "logsearch.spnego.kerberos.host";
-  private static final String KERBEROS_ENABLE="logsearch.spnego.kerberos.enable";
+  private static final String KERBEROS_ENABLED = "logsearch.spnego.kerberos.enabled";
 
   private static final String NAME_RULES_PARAM = "kerberos.name.rules";
   private static final String TOKEN_VALID_PARAM = "token.validity";
@@ -230,7 +230,7 @@ public class LogsearchKRBAuthenticationFilter extends LogsearchKrbFilter {
   }
 
   private void isSpnegoEnable() {
-    spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLE, false);
+    spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLED, false);
     if (spnegoEnable) {
       spnegoEnable = false;
       String keytab = PropertiesHelper.getProperty(KEYTAB);

ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties

@@ -57,7 +57,7 @@ logsearch.solr.jaas.file=/usr/lib/ambari-logsearch-portal/logsearch_solr_jaas.co
 
 
 #portal Kerberos 
-logsearch.spnego.kerberos.enable=false
+logsearch.spnego.kerberos.enabled=false
 logsearch.spnego.kerberos.keytab=
 logsearch.spnego.kerberos.principal=
 logsearch.spnego.kerberos.host=

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

@@ -236,4 +236,44 @@
     </value-attributes>
     <on-ambari-upgrade add="true"/>
   </property>
+  <property>
+    <name>logsearch.spnego.kerberos.enabled</name>
+    <value/>
+    <display-name>Http Spnego enabled</display-name>
+    <description>Enable SPNEGO based authentication on the Log Search UI</description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
+  <property>
+    <name>logsearch.spnego.kerberos.principal</name>
+    <value/>
+    <display-name>Http Spnego principal</display-name>
+    <description>Principal for SPNEGO authentication for Http requests</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
+  <property>
+    <name>logsearch.spnego.kerberos.keytab</name>
+    <value/>
+    <display-name>Http Spnego keytab</display-name>
+    <description>Keytab for SPNEGO authentication for Http requests</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
+  <property>
+    <name>logsearch.spnego.kerberos.host</name>
+    <value>localhost</value>
+    <display-name>Http Spnego hostname</display-name>
+    <description>Fully-qualified host name in the Kerberos service principal name (SPN) that is used by SPNEGO</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
 </configuration>

ambari-web/app/data/HDP2/site_properties.js

@@ -2285,6 +2285,34 @@ var hdp2properties = [
     "category": "Advanced logsearch-properties",
     "index": 14
   },
+  {
+    "name": "logsearch.spnego.kerberos.enabled",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 15
+  },
+  {
+    "name": "logsearch.spnego.kerberos.keytab",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 16
+  },
+  {
+    "name": "logsearch.spnego.kerberos.principal",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 17
+  },
+  {
+    "name": "logsearch.spnego.kerberos.host",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 18
+  },
   /*infra-solr-client-log4j*/
   {
     "name": "infra_solr_client_log_dir",