knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pzamp...@apache.org
Subject [1/4] knox git commit: KNOX-1193 - LOGSEARCH discovery support
Date Wed, 09 May 2018 20:51:04 GMT
Repository: knox
Updated Branches:
  refs/heads/master 9d385e457 -> a03e9c53b


http://git-wip-us.apache.org/repos/asf/knox/blob/a03e9c53/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-component-config-mapping.properties
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-component-config-mapping.properties
b/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-component-config-mapping.properties
index de3474a..1e2cbc0 100644
--- a/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-component-config-mapping.properties
+++ b/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-component-config-mapping.properties
@@ -33,6 +33,7 @@ HIVE_SERVER=hive-site
 INFRA_SOLR=infra-solr-env
 LIVY_SERVER=livy-conf
 LIVY2_SERVER=livy2-conf
+LOGSEARCH_SERVER=logsearch-properties
 NAMENODE=hdfs-site
 OOZIE_SERVER=oozie-site
 RANGER_ADMIN=ranger-admin-site

http://git-wip-us.apache.org/repos/asf/knox/blob/a03e9c53/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-url-mappings.xml
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-url-mappings.xml
b/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-url-mappings.xml
index 9ba3d62..cfbc091 100644
--- a/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-url-mappings.xml
+++ b/gateway-discovery-ambari/src/main/resources/ambari-service-discovery-url-mappings.xml
@@ -595,4 +595,34 @@
         </properties>
     </service>
 
+    <service name="LOGSEARCH">
+        <url-pattern>{SCHEME}://{HOST}:{PORT}</url-pattern>
+        <properties>
+            <property name="HOST">
+                <component>LOGSEARCH_SERVER</component>
+                <hostname/>
+            </property>
+            <property name="SCHEME">
+                <component>LOGSEARCH_SERVER</component>
+                <config-property>logsearch.protocol</config-property>
+            </property>
+            <property name="HTTP_PORT">
+                <component>LOGSEARCH_SERVER</component>
+                <config-property>logsearch.http.port</config-property>
+            </property>
+            <property name="HTTPS_PORT">
+                <component>LOGSEARCH_SERVER</component>
+                <config-property>logsearch.https.port</config-property>
+            </property>
+            <property name="PORT">
+                <config-property>
+                    <if property="SCHEME" value="https">
+                        <then>HTTPS_PORT</then>
+                        <else>HTTP_PORT</else>
+                    </if>
+                </config-property>
+            </property>
+        </properties>
+    </service>
+
 </service-discovery-url-mappings>


Mime
View raw message