knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pzamp...@apache.org
Subject knox git commit: KNOX-1193 - NiFi service discovery support
Date Wed, 16 May 2018 20:55:09 GMT
Repository: knox
Updated Branches:
  refs/heads/master a1640b99e -> 82e981be8


KNOX-1193 - NiFi service discovery support


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/82e981be
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/82e981be
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/82e981be

Branch: refs/heads/master
Commit: 82e981be87093accf4dfd19fec53df5ee57e9429
Parents: a1640b9
Author: Phil Zampino <pzampino@apache.org>
Authored: Wed May 16 16:32:33 2018 -0400
Committer: Phil Zampino <pzampino@apache.org>
Committed: Wed May 16 16:33:00 2018 -0400

----------------------------------------------------------------------
 ...iscovery-component-config-mapping.properties |  1 +
 .../ambari-service-discovery-url-mappings.xml   | 55 ++++++++++++++++++++
 2 files changed, 56 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/82e981be/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 d96b00d..43e8b44 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
@@ -45,4 +45,5 @@ SPARK_THRIFTSERVER=spark-hive-site-override
 SPARK2_THRIFTSERVER=spark2-hive-site-override
 WEBHCAT_SERVER=webhcat-site
 ZEPPELIN_MASTER=zeppelin-site
+NIFI_MASTER=nifi-properties
 

http://git-wip-us.apache.org/repos/asf/knox/blob/82e981be/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 cfbc091..1ad7fc5 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
@@ -625,4 +625,59 @@
         </properties>
     </service>
 
+    <service name="NIFI">
+        <url-pattern>{SCHEME}://{HOST}:{PORT}</url-pattern>
+        <properties>
+            <property name="COMPONENT_HOST">
+                <component>NIFI_MASTER</component>
+                <hostname/>
+            </property>
+            <property name="HTTP_HOST">
+                <component>NIFI_MASTER</component>
+                <config-property>nifi.web.http.host</config-property>
+            </property>
+            <property name="HTTPS_HOST">
+                <component>NIFI_MASTER</component>
+                <config-property>nifi.web.https.host</config-property>
+            </property>
+            <property name="HTTP_PORT">
+                <component>NIFI_MASTER</component>
+                <config-property>nifi.web.http.port</config-property>
+            </property>
+            <property name="HTTPS_PORT">
+                <component>NIFI_MASTER</component>
+                <config-property>nifi.web.https.port</config-property>
+            </property>
+            <property name="SCHEME">
+                <config-property>
+                    <if property="HTTPS_PORT">
+                        <then>https</then>
+                        <else>http</else>
+                    </if>
+                </config-property>
+            </property>
+            <property name="HOST">
+                <config-property>
+                    <if property="HTTPS_HOST">
+                        <then>HTTPS_HOST</then>
+                        <else>
+                            <if property="HTTP_HOST">
+                                <then>HTTP_HOST</then>
+                                <else>COMPONENT_HOST</else>
+                            </if>
+                        </else>
+                    </if>
+                </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