This is an automated email from the ASF dual-hosted git repository.

anandsubbu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metron.git


The following commit(s) were added to refs/heads/master by this push:
     new 46b4c15  METRON-1962 Make entering JDBC details in REST config to be 
optional (anandsubbu) closes apache/metron#1318
46b4c15 is described below

commit 46b4c15a0c91569cc02ed71fa5bb91f3b6e2a572
Author: anandsubbu <[email protected]>
AuthorDate: Tue Jan 22 01:23:23 2019 +0530

    METRON-1962 Make entering JDBC details in REST config to be optional 
(anandsubbu) closes apache/metron#1318
---
 .../METRON/CURRENT/configuration/metron-rest-env.xml        | 13 +++++++++++++
 metron-interface/metron-rest/README.md                      |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git 
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml
 
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml
index 55b880f..68b1140 100644
--- 
a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml
+++ 
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml
@@ -47,18 +47,27 @@
         <value></value>
         <description>Class name of the JDBC Driver used by Metron</description>
         <display-name>Metron JDBC Driver</display-name>
+        <value-attributes>
+            <empty-value-valid>true</empty-value-valid>
+        </value-attributes>
     </property>
     <property>
         <name>metron_jdbc_url</name>
         <value></value>
         <description>JDBC Connection URL used by Metron</description>
         <display-name>Metron JDBC URL</display-name>
+        <value-attributes>
+            <empty-value-valid>true</empty-value-valid>
+        </value-attributes>
     </property>
     <property>
         <name>metron_jdbc_username</name>
         <value></value>
         <description>Metron JDBC Username</description>
         <display-name>Metron JDBC username</display-name>
+        <value-attributes>
+            <empty-value-valid>true</empty-value-valid>
+        </value-attributes>
     </property>
     <property>
         <name>metron_jdbc_password</name>
@@ -70,6 +79,7 @@
             <type>password</type>
             <overridable>false</overridable>
             <hidden>METRON_CLIENT</hidden>
+            <empty-value-valid>true</empty-value-valid>
         </value-attributes>
         <on-ambari-upgrade add="true"/>
     </property>
@@ -78,6 +88,9 @@
         <value></value>
         <description>Database platform used by Metron.  One of: hsqldb, h2, 
oracle, mysql, postgresql</description>
         <display-name>Metron JDBC platform</display-name>
+        <value-attributes>
+            <empty-value-valid>true</empty-value-valid>
+        </value-attributes>
     </property>
     <property>
         <name>metron_jdbc_client_path</name>
diff --git a/metron-interface/metron-rest/README.md 
b/metron-interface/metron-rest/README.md
index a3cbad7..8aa172b 100644
--- a/metron-interface/metron-rest/README.md
+++ b/metron-interface/metron-rest/README.md
@@ -66,10 +66,6 @@ No optional parameter has a default.
 
 | Environment Variable                  | Description
 | ------------------------------------- | -----------
-| METRON_JDBC_DRIVER                    | JDBC driver class
-| METRON_JDBC_URL                       | JDBC url
-| METRON_JDBC_USERNAME                  | JDBC username
-| METRON_JDBC_PLATFORM                  | JDBC platform (one of h2, mysql, 
postgres, oracle
 | ZOOKEEPER                             | Zookeeper quorum (ex. 
node1:2181,node2:2181)
 | BROKERLIST                            | Kafka Broker list (ex. 
node1:6667,node2:6667)
 | HDFS_URL                              | HDFS url or `fs.defaultFS` Hadoop 
setting (ex. hdfs://node1:8020)
@@ -88,6 +84,10 @@ No optional parameter has a default.
 ### Optional - Blank Defaults
 | Environment Variable                  | Description                          
                             | Required
 | ------------------------------------- | 
----------------------------------------------------------------- | --------
+| METRON_JDBC_DRIVER                    | JDBC driver class                    
                             | Optional
+| METRON_JDBC_URL                       | JDBC url                             
                             | Optional
+| METRON_JDBC_USERNAME                  | JDBC username                        
                             | Optional
+| METRON_JDBC_PLATFORM                  | JDBC platform (one of h2, mysql, 
postgres, oracle)                | Optional
 | METRON_JVMFLAGS                       | JVM flags added to the start command 
                             | Optional
 | METRON_SPRING_PROFILES_ACTIVE         | Active Spring profiles (see 
[below](#spring-profiles))            | Optional
 | METRON_SPRING_OPTIONS                 | Additional Spring input parameters   
                             | Optional

Reply via email to