(kylin) 08/35: KYLIN-5710 Remove audit log from the diagnostic package by default

[xxyu]

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

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 220d272532a4b2cd519337a2a83586eac22fdfcf
Author: Yaguang Jia <jiayagu...@foxmail.com>
AuthorDate: Tue Jun 6 16:57:08 2023 +0800

    KYLIN-5710 Remove audit log from the diagnostic package by default
---
 build/bin/diag.sh                                                   | 6 +++---
 src/tool/src/main/java/org/apache/kylin/tool/DiagClientTool.java    | 2 +-
 src/tool/src/main/java/org/apache/kylin/tool/JobDiagInfoTool.java   | 2 +-
 .../main/java/org/apache/kylin/tool/StreamingJobDiagInfoTool.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/bin/diag.sh b/build/bin/diag.sh
index 9f18320ce0..45e0684088 100755
--- a/build/bin/diag.sh
+++ b/build/bin/diag.sh
@@ -117,8 +117,8 @@ if ([[ ${DIAG_OPTS} != *" -project"* ]] && [[ ${DIAG_OPTS} 
!= *" -job"* ]] && [[
 fi
 
 INCLUDE_AUDIT_LOG=`${KYLIN_HOME}/bin/get-properties.sh 
kylin.diag.include-auditlog`
-if [[ ${INCLUDE_AUDIT_LOG} == "false" ]]; then
-    DIAG_OPTS="${DIAG_OPTS} -includeAuditLog false"
+if [[ ${INCLUDE_AUDIT_LOG} == "true" ]]; then
+    DIAG_OPTS="${DIAG_OPTS} -includeAuditLog true"
 fi
 
 if [[ ${DIAG_OPTS} == *" -job"* ]]; then
@@ -129,4 +129,4 @@ elif [[ ${DIAG_OPTS} == *" -query"* ]]; then
     runTool org.apache.kylin.tool.QueryDiagInfoCLI ${DIAG_OPTS}
 else
     runTool org.apache.kylin.tool.DiagClientCLI ${DIAG_OPTS}
-fi
\ No newline at end of file
+fi
diff --git a/src/tool/src/main/java/org/apache/kylin/tool/DiagClientTool.java 
b/src/tool/src/main/java/org/apache/kylin/tool/DiagClientTool.java
index 76ca6cf43a..04e1c4d1bd 100644
--- a/src/tool/src/main/java/org/apache/kylin/tool/DiagClientTool.java
+++ b/src/tool/src/main/java/org/apache/kylin/tool/DiagClientTool.java
@@ -117,7 +117,7 @@ public class DiagClientTool extends 
AbstractInfoExtractorTool {
         final boolean includeLog = getBooleanOption(optionsHelper, OPTION_LOG,
                 getBooleanOption(optionsHelper, OPTION_CATE_BASE, true));
         final boolean includeAuditLog = getBooleanOption(optionsHelper, 
OPTION_AUDIT_LOG,
-                getBooleanOption(optionsHelper, OPTION_CATE_BASE, true));
+                getBooleanOption(optionsHelper, OPTION_CATE_BASE, false));
         final boolean includeBin = true;
 
         final long startTime = getLongOption(optionsHelper, OPTION_START_TIME, 
getDefaultStartTime());
diff --git a/src/tool/src/main/java/org/apache/kylin/tool/JobDiagInfoTool.java 
b/src/tool/src/main/java/org/apache/kylin/tool/JobDiagInfoTool.java
index 7995e489e2..1c9c47489f 100644
--- a/src/tool/src/main/java/org/apache/kylin/tool/JobDiagInfoTool.java
+++ b/src/tool/src/main/java/org/apache/kylin/tool/JobDiagInfoTool.java
@@ -111,7 +111,7 @@ public class JobDiagInfoTool extends 
AbstractInfoExtractorTool {
         final boolean includeConf = getBooleanOption(optionsHelper, 
OPTION_INCLUDE_CONF, true);
         final boolean includeMeta = getBooleanOption(optionsHelper, 
OPTION_META, true);
         final boolean isCloud = getKapConfig().isCloud();
-        final boolean includeAuditLog = getBooleanOption(optionsHelper, 
OPTION_AUDIT_LOG, true);
+        final boolean includeAuditLog = getBooleanOption(optionsHelper, 
OPTION_AUDIT_LOG, false);
         final boolean includeBin = true;
 
         final long start = System.currentTimeMillis();
diff --git 
a/src/tool/src/main/java/org/apache/kylin/tool/StreamingJobDiagInfoTool.java 
b/src/tool/src/main/java/org/apache/kylin/tool/StreamingJobDiagInfoTool.java
index 1bb8d792ac..6d15db1109 100644
--- a/src/tool/src/main/java/org/apache/kylin/tool/StreamingJobDiagInfoTool.java
+++ b/src/tool/src/main/java/org/apache/kylin/tool/StreamingJobDiagInfoTool.java
@@ -104,7 +104,7 @@ public class StreamingJobDiagInfoTool extends 
AbstractInfoExtractorTool {
         final boolean includeClient = getBooleanOption(optionsHelper, 
OPTION_STREAMING_INCLUDE_CLIENT, true);
         final boolean includeConf = getBooleanOption(optionsHelper, 
OPTION_STREAMING_INCLUDE_CONF, true);
         final boolean includeMeta = getBooleanOption(optionsHelper, 
OPTION_STREAMING_META, true);
-        final boolean includeAuditLog = getBooleanOption(optionsHelper, 
OPTION_STREAMING_AUDIT_LOG, true);
+        final boolean includeAuditLog = getBooleanOption(optionsHelper, 
OPTION_STREAMING_AUDIT_LOG, false);
         final boolean includeBin = true;
 
         final long diagStartTime = System.currentTimeMillis();