RANGER-5520:Audit Server refactoring to segregate audit ingestion and dispatching functionality - Fixed review comment on docker file

Author: Ramesh Mani

audit-server/audit-dispatcher/dispatcher-app/src/main/webapp/WEB-INF/web.xml

@@ -43,6 +43,10 @@
       <param-name>jersey.config.server.provider.packages</param-name>
       <param-value>org.apache.ranger.audit.rest</param-value>
     </init-param>
+    <init-param>
+      <param-name>jersey.config.server.wadl.disableWadl</param-name>
+      <param-value>true</param-value>
+    </init-param>
 
     <load-on-startup>1</load-on-startup>
   </servlet>

audit-server/audit-dispatcher/dispatcher-hdfs/src/main/resources/conf/logback.xml

@@ -63,6 +63,9 @@
         <appender-ref ref="LogToConsole" />
     </logger>
 
+    <!-- WADL generator (suppress noisy output) -->
+    <logger name="com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator" level="OFF" />
+
     <!-- Root Logger -->
     <root level="INFO">
         <appender-ref ref="LogToRollingFile" />

audit-server/audit-dispatcher/dispatcher-solr/src/main/resources/conf/logback.xml

@@ -57,6 +57,9 @@
         <appender-ref ref="LogToConsole" />
     </logger>
 
+    <!-- WADL generator (suppress noisy output) -->
+    <logger name="com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator" level="OFF" />
+
     <!-- Lucene/Solr Logger (reduce verbosity) -->
     <logger name="org.apache.lucene" level="INFO" additivity="false">
         <appender-ref ref="LogToRollingFile" />

audit-server/audit-ingestor/src/main/webapp/WEB-INF/web.xml

@@ -56,6 +56,10 @@
       <param-name>jersey.config.server.provider.packages</param-name>
       <param-value>org.apache.ranger.audit.rest</param-value>
     </init-param>
+    <init-param>
+      <param-name>jersey.config.server.wadl.disableWadl</param-name>
+      <param-value>true</param-value>
+    </init-param>
 
     <load-on-startup>1</load-on-startup>
   </servlet>

dev-support/ranger-docker/Dockerfile.ranger-audit-dispatcher-hdfs

@@ -19,7 +19,7 @@ services:
   ranger-audit-dispatcher-hdfs:
     build:
       context: .
-      dockerfile: Dockerfile.ranger-audit-dispatcher-hdfs
+      dockerfile: Dockerfile.ranger-audit-dispatcher
       args:
         - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
         - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
@@ -28,6 +28,7 @@ services:
     image: ranger-audit-dispatcher-hdfs:latest
     container_name: ranger-audit-dispatcher-hdfs
     hostname: ranger-audit-dispatcher-hdfs.rangernw
+    command: ["hdfs"]
     stdin_open: true
     tty: true
     depends_on:
@@ -45,7 +46,6 @@ services:
       AUDIT_DISPATCHER_CONF_DIR: /opt/ranger/audit-dispatcher/conf
       AUDIT_DISPATCHER_LOG_DIR: /var/log/ranger/audit-dispatcher/hdfs
       AUDIT_DISPATCHER_HEAP: "-Xms512m -Xmx2g"
-      AUDIT_DISPATCHER_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED -Djersey.config.server.wadl.disableWadl=true"
       RANGER_VERSION: ${RANGER_VERSION}
       KERBEROS_ENABLED: ${KERBEROS_ENABLED}
       KAFKA_BOOTSTRAP_SERVERS: ranger-kafka.rangernw:9092

dev-support/ranger-docker/Dockerfile.ranger-audit-dispatcher-solr

@@ -19,7 +19,7 @@ services:
   ranger-audit-dispatcher-solr:
     build:
       context: .
-      dockerfile: Dockerfile.ranger-audit-dispatcher-solr
+      dockerfile: Dockerfile.ranger-audit-dispatcher
       args:
         - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
         - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
@@ -28,6 +28,7 @@ services:
     image: ranger-audit-dispatcher-solr:latest
     container_name: ranger-audit-dispatcher-solr
     hostname: ranger-audit-dispatcher-solr.rangernw
+    command: ["solr"]
     stdin_open: true
     tty: true
     depends_on:
@@ -45,7 +46,6 @@ services:
       AUDIT_DISPATCHER_CONF_DIR: /opt/ranger/audit-dispatcher/conf
       AUDIT_DISPATCHER_LOG_DIR: /var/log/ranger/audit-dispatcher/solr
       AUDIT_DISPATCHER_HEAP: "-Xms512m -Xmx2g"
-      AUDIT_DISPATCHER_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED -Djersey.config.server.wadl.disableWadl=true"
       RANGER_VERSION: ${RANGER_VERSION}
       KERBEROS_ENABLED: ${KERBEROS_ENABLED}
       KAFKA_BOOTSTRAP_SERVERS: ranger-kafka.rangernw:9092

dev-support/ranger-docker/docker-compose.ranger-audit-dispatcher-hdfs.yml

@@ -66,7 +66,7 @@ services:
   ranger-audit-dispatcher-solr:
     build:
       context: .
-      dockerfile: Dockerfile.ranger-audit-dispatcher-solr
+      dockerfile: Dockerfile.ranger-audit-dispatcher
       args:
         - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
         - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
@@ -75,6 +75,7 @@ services:
     image: ranger-audit-dispatcher-solr:latest
     container_name: ranger-audit-dispatcher-solr
     hostname: ranger-audit-dispatcher-solr.rangernw
+    command: ["solr"]
     stdin_open: true
     tty: true
     depends_on:
@@ -94,7 +95,6 @@ services:
       AUDIT_DISPATCHER_CONF_DIR: /opt/ranger/audit-dispatcher/conf
       AUDIT_DISPATCHER_LOG_DIR: /var/log/ranger/audit-dispatcher/solr
       AUDIT_DISPATCHER_HEAP: "-Xms512m -Xmx2g"
-      AUDIT_DISPATCHER_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED -Djersey.config.server.wadl.disableWadl=true"
       RANGER_VERSION: ${RANGER_VERSION}
       KERBEROS_ENABLED: ${KERBEROS_ENABLED}
       KAFKA_BOOTSTRAP_SERVERS: ranger-kafka.rangernw:9092
@@ -116,7 +116,7 @@ services:
   ranger-audit-dispatcher-hdfs:
     build:
       context: .
-      dockerfile: Dockerfile.ranger-audit-dispatcher-hdfs
+      dockerfile: Dockerfile.ranger-audit-dispatcher
       args:
         - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
         - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
@@ -125,6 +125,7 @@ services:
     image: ranger-audit-dispatcher-hdfs:latest
     container_name: ranger-audit-dispatcher-hdfs
     hostname: ranger-audit-dispatcher-hdfs.rangernw
+    command: ["hdfs"]
     stdin_open: true
     tty: true
     depends_on:
@@ -144,7 +145,6 @@ services:
       AUDIT_DISPATCHER_CONF_DIR: /opt/ranger/audit-dispatcher/conf
       AUDIT_DISPATCHER_LOG_DIR: /var/log/ranger/audit-dispatcher/hdfs
       AUDIT_DISPATCHER_HEAP: "-Xms512m -Xmx2g"
-      AUDIT_DISPATCHER_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED -Djersey.config.server.wadl.disableWadl=true"
       RANGER_VERSION: ${RANGER_VERSION}
       KERBEROS_ENABLED: ${KERBEROS_ENABLED}
       KAFKA_BOOTSTRAP_SERVERS: ranger-kafka.rangernw:9092