kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhongj...@apache.org
Subject incubator-kylin git commit: KYLIN-792, update config key in kylin.properties for performance monitor moudle
Date Fri, 25 Sep 2015 07:27:49 GMT
Repository: incubator-kylin
Updated Branches:
  refs/heads/1.x-staging 62751df48 -> bad57cb91


KYLIN-792, update config key in kylin.properties for performance monitor moudle


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/bad57cb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/bad57cb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/bad57cb9

Branch: refs/heads/1.x-staging
Commit: bad57cb91124cf5a325e1d785a4f5de73d53c8b3
Parents: 62751df
Author: jiazhong <jiazhong@ebay.com>
Authored: Fri Sep 25 15:27:33 2015 +0800
Committer: jiazhong <jiazhong@ebay.com>
Committed: Fri Sep 25 15:27:33 2015 +0800

----------------------------------------------------------------------
 conf/kylin.properties                                          | 6 +++---
 examples/test_case_data/sandbox/kylin.properties               | 6 +++---
 .../src/main/java/org/apache/kylin/monitor/ConfigUtils.java    | 6 +++---
 .../src/main/java/org/apache/kylin/monitor/DebugClient.java    | 2 +-
 .../src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bad57cb9/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/conf/kylin.properties b/conf/kylin.properties
index 2b8441a..e6f5a68 100644
--- a/conf/kylin.properties
+++ b/conf/kylin.properties
@@ -131,11 +131,11 @@ kylin.sandbox=true
 
 ###########################config info for kylin monitor#######################
 # hive jdbc url
-kylin.hive.jdbc.connection.url=
+kylin.monitor.hive.jdbc.connection.url=
 
 #config where to parse query log,split with comma ,will also read $KYLIN_HOME/tomcat/logs/
by default
-ext.log.base.dir = /tmp/kylin_log1,/tmp/kylin_log2
+kylin.monitor.ext.log.base.dir = /tmp/kylin_log1,/tmp/kylin_log2
 
 #will create external hive table to query result csv file
 #will set to kylin_query_log by default if not config here
-query.log.parse.result.table = kylin_query_log
+kylin.monitor.query.log.parse.result.table = kylin_query_log

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bad57cb9/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index e4b20fe..bcae574 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -123,14 +123,14 @@ kylin.sandbox=true
 
 ###########################config info for kylin monitor#######################
 # hive jdbc url
-kylin.hive.jdbc.connection.url= jdbc:hive2://sandbox:10000
+kylin.monitor.hive.jdbc.connection.url= jdbc:hive2://sandbox:10000
 
 #config where to parse query log,split with comma ,will also read $KYLIN_HOME/tomcat/logs/
by default
-ext.log.base.dir = /tmp/kylin_log1,/tmp/kylin_log2
+kylin.monitor.ext.log.base.dir = /tmp/kylin_log1,/tmp/kylin_log2
 
 #will create external hive table to query result csv file
 #will set to kylin_query_log by default if not config here
-query.log.parse.result.table = kylin_query_log
+kylin.monitor.query.log.parse.result.table = kylin_query_log
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bad57cb9/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java b/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
index 7cff4d7..6d71513 100644
--- a/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
+++ b/monitor/src/main/java/org/apache/kylin/monitor/ConfigUtils.java
@@ -51,7 +51,7 @@ public class ConfigUtils {
     private ConfigUtils() {
     }
 
-    public static final String KYLIN_EXT_LOG_BASE_DIR = "ext.log.base.dir";
+    public static final String KYLIN_EXT_LOG_BASE_DIR = "kylin.monitor.ext.log.base.dir";
     public static final String KYLIN_METADATA_URL = "kylin.metadata.url";
 
     public static final String KYLIN_HOME = "KYLIN_HOME";
@@ -62,7 +62,7 @@ public class ConfigUtils {
     public static final String KYLIN_HDFS_WORKING_DIR = "kylin.hdfs.working.dir";
 
     public static final String KYLIN_MONITOR_CONF_PROP_FILE = "kylin.properties";
-    public static final String QUERY_LOG_PARSE_RESULT_TABLE = "query.log.parse.result.table";
+    public static final String QUERY_LOG_PARSE_RESULT_TABLE = "kylin.monitor.query.log.parse.result.table";
     public static final String DEFAULT_QUERY_LOG_PARSE_RESULT_TABLE = "kylin_query_log";
 
     public static final String HIVE_JDBC_CON_USERNAME = "kylin.hive.jdbc.connection.username";
@@ -72,7 +72,7 @@ public class ConfigUtils {
 
     public static final String DEPLOY_ENV = "deploy.env";
 
-    public static final String HIVE_JDBC_CON_URL = "kylin.hive.jdbc.connection.url";
+    public static final String HIVE_JDBC_CON_URL = "kylin.monitor.hive.jdbc.connection.url";
 
     public void loadMonitorParam() throws IOException {
         Properties props = new Properties();

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bad57cb9/monitor/src/main/java/org/apache/kylin/monitor/DebugClient.java
----------------------------------------------------------------------
diff --git a/monitor/src/main/java/org/apache/kylin/monitor/DebugClient.java b/monitor/src/main/java/org/apache/kylin/monitor/DebugClient.java
index 3a683da..67bd630 100644
--- a/monitor/src/main/java/org/apache/kylin/monitor/DebugClient.java
+++ b/monitor/src/main/java/org/apache/kylin/monitor/DebugClient.java
@@ -39,7 +39,7 @@ public class DebugClient {
         // test_case_data/sandbox/ contains HDP 2.2 site xmls which is dev sandbox
         ConfigUtils.addClasspath(new File("../examples/test_case_data/sandbox").getAbsolutePath());
 
-        //set log base dir ,will also get from $KYLIN_HOME/tomcat/logs and config [ext.log.base.dir]
in kylin.properties
+        //set log base dir ,will also get from $KYLIN_HOME/tomcat/logs and config [kylin.monitor.ext.log.base.dir]
in kylin.properties
         System.setProperty(ConfigUtils.KYLIN_LOG_CONF_HOME, "../server/logs");
 
         //get kylin.properties ,if not exist will get from $KYLIN_HOME/conf/

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bad57cb9/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
----------------------------------------------------------------------
diff --git a/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java b/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
index ffe3cc0..0216abf 100644
--- a/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
+++ b/monitor/src/main/java/org/apache/kylin/monitor/HiveJdbcClient.java
@@ -77,7 +77,7 @@ public class HiveJdbcClient {
             monitorConfig.loadMonitorParam();
             QUERY_LOG_TABLE_NAME = monitorConfig.getQueryLogResultTable();
             if (StringUtils.isEmpty(QUERY_LOG_TABLE_NAME)) {
-                logger.error("table name not defined ,please set param [query.log.parse.result.table]
in kylin.properties");
+                logger.error("table name not defined ,please set param [kylin.monitor.query.log.parse.result.table]
in kylin.properties");
             }
 
         } catch (Exception e) {


Mime
View raw message