This is an automated email from the ASF dual-hosted git repository.
mehul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 02b071a RANGER-3559 : RANGER KMS - Metric details for kms are not
getting collected
02b071a is described below
commit 02b071a5c75292b45d429a2c52342cca29ccf1bb
Author: mateenmansoori <ma3naus...@gmail.com>
AuthorDate: Mon Jan 3 12:31:36 2022 +0530
RANGER-3559 : RANGER KMS - Metric details for kms are not getting collected
Signed-off-by: Mehul Parikh <me...@apache.org>
---
kms/config/kms-webapp/kms-log4j.properties | 7 +++++++
kms/scripts/ranger-kms | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/kms/config/kms-webapp/kms-log4j.properties
b/kms/config/kms-webapp/kms-log4j.properties
index 2ebfe2e..886603e 100644
--- a/kms/config/kms-webapp/kms-log4j.properties
+++ b/kms/config/kms-webapp/kms-log4j.properties
@@ -32,6 +32,13 @@
log4j.appender.kms-audit.layout.ConversionPattern=%d{ISO8601} %m%n
log4j.logger.kms-audit=INFO, kms-audit
log4j.additivity.kms-audit=false
+log4j.appender.kms-metric=org.apache.log4j.RollingFileAppender
+log4j.appender.kms-metric.File=${kms.log.dir}/ranger_kms_metric_data_for_${metric.type}.log
+log4j.appender.kms-metric.Append=false
+log4j.appender.kms-metric.layout=org.apache.log4j.PatternLayout
+log4j.appender.kms-metric.layout.ConversionPattern=%m%n
+log4j.logger.org.apache.hadoop.crypto.key.kms.server.KMSMetricUtil=INFO,kms-metric
+
log4j.logger=INFO, kms
log4j.rootLogger=WARN, kms
log4j.logger.org.apache.hadoop.conf=INFO
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index 5eebc77..92ad515 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -25,6 +25,12 @@ fi
action=$1
arg2=$2
arg3=$3
+
+if [ -z "${arg3}" ]
+then
+ arg3="hsmenabled"
+fi
+
action=`echo $action | tr '[:lower:]' '[:upper:]'`
realScriptPath=`readlink -f $0`
realScriptDir=`dirname $realScriptPath`
@@ -107,7 +113,7 @@ fi
KMS_CONF_DIR=${RANGER_KMS_EWS_DIR}/webapp/WEB-INF/classes/conf
SERVER_NAME=rangerkms
-JAVA_OPTS="${JAVA_OPTS} ${DB_SSL_PARAM} -Duser=${USER} -Dhostname=${HOSTNAME}
-Dservername=${SERVER_NAME} -Dcatalina.base=${RANGER_KMS_EWS_DIR}
-Dkms.config.dir=${KMS_CONF_DIR}
-Dlog4j.configuration=file:${KMS_LOG_PROPERTIES_FILE}
-Dkms.log.dir=${TOMCAT_LOG_DIR} -cp
${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH
"
+JAVA_OPTS="${JAVA_OPTS} ${DB_SSL_PARAM} -Dmetric.type=${arg3} -Duser=${USER}
-Dhostname=${HOSTNAME} -Dservername=${SERVER_NAME}
-Dcatalina.base=${RANGER_KMS_EWS_DIR} -Dkms.config.dir=${KMS_CONF_DIR}
-Dlog4j.configuration=file:${KMS_LOG_PROPERTIES_FILE}
-Dkms.log.dir=${TOMCAT_LOG_DIR} -cp
${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH
"
createRangerKMSPid () {
SLEEP_TIME_AFTER_START=5
nohup java -D${PROC_NAME} ${JAVA_OPTS} ${START_CLASS_NAME}
${KMS_CONFIG_FILENAME} > ${TOMCAT_LOG_FILE} 2>&1 &
